fixed test timing

2 files changed, 18 insertions, 35 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 57d18a96b3..153e4f17d3 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
@@ -48,10 +48,8 @@ public class ConflictResolverTest extends AbstractCDOTest
 
     address.setName("NAME1");
 
-    long committed = transaction.commit().getTimeStamp();
-
     // Resolver should be triggered.
-    transaction2.waitForUpdate(committed, DEFAULT_TIMEOUT);
+    commitAndSync(transaction, transaction2);
 
     assertEquals(false, CDOUtil.getCDOObject(address2).cdoConflict());
     assertEquals(false, transaction2.hasConflict());
@@ -82,24 +80,24 @@ public class ConflictResolverTest extends AbstractCDOTest
     contents2.add(getModel1Factory().createAddress());
 
     // Resolver should be triggered.
-    transaction2.waitForUpdate(transaction1.commit().getTimeStamp(), DEFAULT_TIMEOUT);
-    transaction2.commit();
+    commitAndSync(transaction1, transaction2);
+    commitAndSync(transaction2, transaction1);
 
     // ----------------------------
     contents1.add(getModel1Factory().createAddress());
     contents2.add(getModel1Factory().createAddress());
 
     // Resolver should be triggered.
-    transaction2.waitForUpdate(transaction1.commit().getTimeStamp(), DEFAULT_TIMEOUT);
-    transaction2.commit();
+    commitAndSync(transaction1, transaction2);
+    commitAndSync(transaction2, transaction1);
 
     // ----------------------------
     contents1.add(getModel1Factory().createAddress());
     contents2.add(getModel1Factory().createAddress());
 
     // Resolver should be triggered.
-    transaction2.waitForUpdate(transaction1.commit().getTimeStamp(), DEFAULT_TIMEOUT);
-    transaction2.commit();
+    commitAndSync(transaction1, transaction2);
+    commitAndSync(transaction2, transaction1);
   }
 
   public void testMergeLocalChangesPerFeature_Bug2() throws Exception
@@ -122,15 +120,15 @@ public class ConflictResolverTest extends AbstractCDOTest
     contents2.add(getModel1Factory().createAddress());
 
     // Resolver should be triggered.
-    transaction2.waitForUpdate(transaction1.commit().getTimeStamp(), DEFAULT_TIMEOUT);
-    transaction2.commit();
+    commitAndSync(transaction1, transaction2);
+    commitAndSync(transaction2, transaction1);
 
     contents1.add(getModel1Factory().createAddress());
     contents2.add(getModel1Factory().createAddress());
 
     // Resolver should be triggered.
-    transaction1.waitForUpdate(transaction2.commit().getTimeStamp(), DEFAULT_TIMEOUT);
-    transaction1.commit();
+    commitAndSync(transaction2, transaction1);
+    commitAndSync(transaction1, transaction2);
   }
 
   @SuppressWarnings("deprecation")
@@ -158,18 +156,8 @@ public class ConflictResolverTest extends AbstractCDOTest
     address2.setCity("OTTAWA");
 
     address.setCity("NAME1");
-    long committed = transaction.commit().getTimeStamp();
-
-    // new PollingTimeOuter()
-    // {
-    // @Override
-    // protected boolean successful()
-    // {
-    // return CDOUtil.getCDOObject(address2).cdoConflict();
-    // }
-    // }.assertNoTimeOut();
-
-    transaction2.waitForUpdate(committed, DEFAULT_TIMEOUT);
+    commitAndSync(transaction, transaction2);
+
     assertEquals(true, transaction2.hasConflict());
     assertEquals(true, CDOUtil.getCDOObject(address2).cdoConflict());
     assertEquals("OTTAWA", address2.getCity());
@@ -194,10 +182,9 @@ public class ConflictResolverTest extends AbstractCDOTest
     address2.setCity("OTTAWA");
 
     address.setName("NAME1");
-    long committed = transaction.commit().getTimeStamp();
 
     // Resolver should be triggered.
-    transaction2.waitForUpdate(committed, DEFAULT_TIMEOUT);
+    commitAndSync(transaction, transaction2);
 
     assertEquals(false, CDOUtil.getCDOObject(address2).cdoConflict());
     assertEquals(false, transaction2.hasConflict());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index 70cdd070d4..663f4aa926 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -975,10 +975,9 @@ public class ResourceTest extends AbstractCDOTest
     assertEquals(resource.getURI(), view.getResource("/resource1").getURI());
 
     resource.delete(null);
-    transaction.commit();
+    commitAndSync(transaction, view);
     transaction.close();
 
-    view.waitForUpdate(transaction.getLastCommitTime(), DEFAULT_TIMEOUT);
     assertEquals(false, view.hasResource("/resource1"));
 
     try
@@ -1039,11 +1038,10 @@ public class ResourceTest extends AbstractCDOTest
     assertEquals(resource.getURI(), view.getResource("/resource1").getURI());
 
     resource.delete(null);
-    transaction.commit();
+    commitAndSync(transaction, view);
     transaction.close();
 
     clearCache(getRepository().getRevisionManager());
-    view.waitForUpdate(transaction.getLastCommitTime(), DEFAULT_TIMEOUT);
     assertEquals(false, view.hasResource("/resource1"));
 
     try
@@ -1285,10 +1283,9 @@ public class ResourceTest extends AbstractCDOTest
     CDOID objectID = object.cdoID();
 
     folder.delete(null);
-    transaction.commit();
+    commitAndSync(transaction, view);
     transaction.close();
 
-    view.waitForUpdate(transaction.getLastCommitTime(), DEFAULT_TIMEOUT);
     assertEquals(false, view.hasResource("/folder/resource1"));
 
     try
@@ -1369,11 +1366,10 @@ public class ResourceTest extends AbstractCDOTest
     CDOID objectID = object.cdoID();
 
     folder.delete(null);
-    transaction.commit();
+    commitAndSync(transaction, view);
     transaction.close();
 
     clearCache(getRepository().getRevisionManager());
-    view.waitForUpdate(transaction.getLastCommitTime(), DEFAULT_TIMEOUT);
     assertEquals(false, view.hasResource("/folder/resource1"));
 
     try