removed sleep() from test case

2 files changed, 6 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
index 535bf4837e..3d9b8c1df3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
@@ -45,10 +45,10 @@ public class ConflictResolverTest extends AbstractCDOTest
 
     address.setName("NAME1");
 
-    transaction.commit();
+    long committed = transaction.commit().getTimeStamp();
 
     // Resolver should be triggered. Should we always use a timer ?
-    sleep(1000);
+    transaction2.waitForUpdate(committed, DEFAULT_TIMEOUT);
 
     assertEquals(false, CDOUtil.getCDOObject(address2).cdoConflict());
     assertEquals(false, transaction2.hasConflict());
@@ -83,7 +83,7 @@ public class ConflictResolverTest extends AbstractCDOTest
 
     address.setCity("NAME1");
 
-    transaction.commit();
+    long committed = transaction.commit().getTimeStamp();
 
     new PollingTimeOuter()
     {
@@ -94,7 +94,7 @@ public class ConflictResolverTest extends AbstractCDOTest
       }
     }.assertNoTimeOut();
 
-    sleep(1000);
+    transaction2.getSession().waitForUpdate(committed, DEFAULT_TIMEOUT);
     assertEquals(true, transaction2.hasConflict());
     assertEquals("OTTAWA", address2.getCity());
   }
@@ -118,7 +118,6 @@ public class ConflictResolverTest extends AbstractCDOTest
     long committed = transaction.commit().getTimeStamp();
 
     // Resolver should be triggered. Should we always use a timer ?
-    // sleep(1000);
     transaction2.waitForUpdate(committed, DEFAULT_TIMEOUT);
 
     assertEquals(false, CDOUtil.getCDOObject(address2).cdoConflict());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
index 66e6840b2a..c3e1df1e4e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
@@ -63,10 +63,10 @@ public class Bugzilla_314264_Test extends AbstractCDOTest
     container.getTasks().remove(0);
 
     tr1.commit();
-    long commitTime = tr2.commit().getTimeStamp();
+    long committed = tr2.commit().getTimeStamp();
 
     // sleep to have the merger see the changes.
-    tr1.getSession().waitForUpdate(commitTime, DEFAULT_TIMEOUT);
+    tr1.getSession().waitForUpdate(committed, DEFAULT_TIMEOUT);
 
     // merge the other branch to main.
     tr1.merge(tr2.getBranch().getHead(), new DefaultCDOMerger.PerFeature.ManyValued());