Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-10-07 17:12:34 +0000
committerEike Stepper2012-10-07 17:12:34 +0000
commit6838d577f33854698a75cb4c3e1e05b3e0bc26fb (patch)
tree0bd05e3fdbc93a5d2ec35d3e0f7c7b581906fa9b
parent3bb09a62061111591e1fabd48973cc4372b73a4d (diff)
downloadcdo-6838d577f33854698a75cb4c3e1e05b3e0bc26fb.tar.gz
cdo-6838d577f33854698a75cb4c3e1e05b3e0bc26fb.tar.xz
cdo-6838d577f33854698a75cb4c3e1e05b3e0bc26fb.zip
Use DEFAULT_TIMEOUT in tests
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java
index 6750f47bac..5e9e4d5db1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java
@@ -114,21 +114,21 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest
masterCompany.setName("Company3");
masterTransaction.commit();
- cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), 1000);
+ cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
cloneCompany.setName("Company4");
cloneTransaction.commit();
cloneCompany.setName("Company5");
cloneTransaction.commit();
- masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), 1000);
+ masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
masterCompany.setName("Company6");
masterTransaction.commit();
masterCompany.setName("Company7");
masterTransaction.commit();
- cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), 1000);
+ cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
// check.
assertEquals(masterCompany.getName(), cloneCompany.getName());
@@ -159,21 +159,21 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest
cloneCompany.setName("Company3");
cloneTransaction.commit();
- masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), 1000);
+ masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
masterCompany.setName("Company4");
masterTransaction.commit();
masterCompany.setName("Company5");
masterTransaction.commit();
- cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), 1000);
+ cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
cloneCompany.setName("Company6");
cloneTransaction.commit();
cloneCompany.setName("Company7");
cloneTransaction.commit();
- masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), 1000);
+ masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
// check.
assertEquals(cloneCompany.getName(), masterCompany.getName());
@@ -213,7 +213,7 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest
getOfflineConfig().startMasterTransport();
waitForOnline(clone);
- cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), 1000);
+ cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
cloneCompany.getName();
msg(CDOUtil.getCDOObject(cloneCompany).cdoRevision().getVersion());
@@ -223,14 +223,14 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest
cloneCompany.setName("Company5");
cloneTransaction.commit();
- masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), 1000);
+ masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
masterCompany.setName("Company6");
masterTransaction.commit();
masterCompany.setName("Company7");
masterTransaction.commit();
- cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), 1000);
+ cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
// check.
assertEquals(masterCompany.getName(), cloneCompany.getName());
@@ -261,7 +261,7 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest
cloneCompany.setName("Company3");
cloneTransaction.commit();
- masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), 1000);
+ masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
// go offline.
getOfflineConfig().stopMasterTransport();
@@ -276,14 +276,14 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest
getOfflineConfig().startMasterTransport();
waitForOnline(clone);
- cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), 1000);
+ cloneTransaction.waitForUpdate(masterTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
cloneCompany.setName("Company6");
cloneTransaction.commit();
cloneCompany.setName("Company7");
cloneTransaction.commit();
- masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), 1000);
+ masterTransaction.waitForUpdate(cloneTransaction.getLastCommitTime(), DEFAULT_TIMEOUT);
// check.
assertEquals(cloneCompany.getName(), masterCompany.getName());

Back to the top