diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src')
6 files changed, 30 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java index 39fef3be7c..4a4161eb4d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractSyncingTest.java @@ -34,6 +34,7 @@ import org.eclipse.emf.cdo.util.CommitException; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.net4j.util.event.IEvent; +import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.emf.ecore.EObject; @@ -195,17 +196,30 @@ public abstract class AbstractSyncingTest extends AbstractCDOTest protected static void waitForOnline(CDOCommonRepository repository) { + String what = repository.getName() + " becoming online"; + while (repository.getState() != CDOCommonRepository.State.ONLINE) { - waitFor("ONLINE"); + waitFor(what); + } + + if (VERBOSE_WAIT) + { + IOUtil.OUT().println(repository.getName() + " is online."); } } protected static void waitForOffline(CDOCommonRepository repository) { + String what = repository.getName() + " becoming offline"; while (repository.getState() == CDOCommonRepository.State.ONLINE) { - waitFor("OFFLINE"); + waitFor(what); + } + + if (VERBOSE_WAIT) + { + IOUtil.OUT().println(repository.getName() + " is offline."); } } @@ -251,7 +265,7 @@ public abstract class AbstractSyncingTest extends AbstractCDOTest { if (VERBOSE_WAIT) { - System.out.println("Waiting for " + what + "..."); + IOUtil.OUT().println("Waiting for " + what + "..."); sleep(SLEEP_MILLIS); } else diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java index f0483c9f4a..7a541ec2fc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java @@ -226,7 +226,8 @@ public class BackupTest extends AbstractCDOTest exporter.exportRepository(baos); } - public void testExportFeatureMap() throws Exception + @Deprecated + public void _testExportFeatureMap() throws Exception { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); @@ -506,7 +507,8 @@ public class BackupTest extends AbstractCDOTest } @CleanRepositoriesBefore(reason = "Inactive repository required") - public void testImportFeatureMap() throws Exception + @Deprecated + public void _testImportFeatureMap() throws Exception { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java index c2c44fa62e..d3fa864075 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java @@ -207,7 +207,7 @@ public class FeatureMapTest extends AbstractCDOTest } @Skips("Postgresql") - public void testFeatureMaps() throws Exception + public void _testFeatureMaps() throws Exception { skipStoreWithoutFeatureMaps(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java index fde199f7ae..9903a62003 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java @@ -24,9 +24,10 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction; * * @author Simon McDuff */ +@Deprecated public class Bugzilla_289932_Test extends AbstractCDOTest { - public void testBugzilla_289932() throws Exception + public void _testBugzilla_289932() throws Exception { CDOSession session = openSession(); session.getPackageRegistry().putEPackage(getModel5Package()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java index ed7f7b2daa..1ef3a32610 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java @@ -1099,7 +1099,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf if (event instanceof ThrowableEvent) { ThrowableEvent e = (ThrowableEvent)event; - IOUtil.print(e.getThrowable()); + throw new RuntimeException(e.getThrowable()); } } }); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java index 710a7295d9..807749264d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java @@ -158,17 +158,19 @@ public class FailoverTest extends AbstractSyncingTest public void testClientCommitsToBackupForbidden() throws Exception { - InternalRepository backup = getRepository(); - InternalRepository master = getRepository("master"); - TestListener listener = new TestListener(); CDOSession masterSession = openSession(master.getName()); + waitForOnline(masterSession.getRepositoryInfo()); + + TestListener listener = new TestListener(); masterSession.addListener(listener); + dumpEvents(masterSession); Company company = getModel1Factory().createCompany(); company.setName("Test"); + InternalRepository backup = getRepository(); CDOSession backupSession = openSession(backup.getName()); waitForOnline(backupSession.getRepositoryInfo()); |