diff options
48 files changed, 83 insertions, 118 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF index 120a5c5d5e..92eaeb2f50 100644 --- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resoluti org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)", + org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)" Import-Package: org.h2.jdbcx;version="[1.1.0,1.2.0)" diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java index e17d04b3cb..ce86d24472 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ImportXML.java +++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/ImportXML.java @@ -8,8 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests; +package org.eclipse.emf.cdo.examples; +import org.eclipse.emf.cdo.examples.company.Category; +import org.eclipse.emf.cdo.examples.company.CompanyFactory; +import org.eclipse.emf.cdo.examples.company.Product; import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration; import org.eclipse.emf.cdo.server.CDOServerUtil; @@ -18,10 +21,6 @@ import org.eclipse.emf.cdo.server.IStore; import org.eclipse.emf.cdo.server.mem.MEMStoreUtil; import org.eclipse.emf.cdo.server.net4j.CDONet4jServerUtil; import org.eclipse.emf.cdo.session.CDOSession; -import org.eclipse.emf.cdo.tests.model1.Category; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; -import org.eclipse.emf.cdo.tests.model1.Model1Package; -import org.eclipse.emf.cdo.tests.model1.Product1; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; @@ -40,6 +39,7 @@ import java.util.Map; /** * @author Eike Stepper + * @since 4.0 */ public class ImportXML { @@ -65,7 +65,6 @@ public class ImportXML // Establish a communications connection and open a session with the repository IConnector connector = JVMUtil.getConnector(container, "default"); // Open a JVM connection CDOSession session = openSession(connector);// Open a CDO session - session.getPackageRegistry().putEPackage(Model1Package.eINSTANCE);// Not needed after first commit!!! CDOTransaction transaction = session.openTransaction();// Open a CDO transaction Resource resource = transaction.createResource("/my/big/resource");// Create a new EMF resource @@ -92,18 +91,18 @@ public class ImportXML private static EObject getInputModel() { - Category cat1 = Model1Factory.eINSTANCE.createCategory(); + Category cat1 = CompanyFactory.eINSTANCE.createCategory(); cat1.setName("CAT1"); - Category cat2 = Model1Factory.eINSTANCE.createCategory(); + Category cat2 = CompanyFactory.eINSTANCE.createCategory(); cat2.setName("CAT2"); cat1.getCategories().add(cat2); - Product1 p1 = Model1Factory.eINSTANCE.createProduct1(); + Product p1 = CompanyFactory.eINSTANCE.createProduct(); p1.setName("P1"); cat1.getProducts().add(p1); - Product1 p2 = Model1Factory.eINSTANCE.createProduct1(); + Product p2 = CompanyFactory.eINSTANCE.createProduct(); p2.setName("P2"); cat1.getProducts().add(p2); - Product1 p3 = Model1Factory.eINSTANCE.createProduct1(); + Product p3 = CompanyFactory.eINSTANCE.createProduct(); p3.setName("P3"); cat2.getProducts().add(p3); return cat1; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_TransactionMonitoringTest.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java index 914f60945b..556815babd 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/_TransactionMonitoringTest.java +++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/TransactionMonitoring.java @@ -8,13 +8,13 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests; +package org.eclipse.emf.cdo.examples; +import org.eclipse.emf.cdo.examples.company.CompanyFactory; +import org.eclipse.emf.cdo.examples.company.CompanyPackage; import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration; import org.eclipse.emf.cdo.session.CDOSession; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; -import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; @@ -30,8 +30,9 @@ import org.eclipse.emf.ecore.resource.Resource; /** * @author Eike Stepper + * @since 4.0 */ -public class _TransactionMonitoringTest +public class TransactionMonitoring { public static void main(String[] args) throws CommitException { @@ -50,11 +51,11 @@ public class _TransactionMonitoringTest configuration.setRepositoryName("repo1"); CDOSession session = configuration.openSession(); - session.getPackageRegistry().putEPackage(Model1Package.eINSTANCE); + session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE); CDOTransaction transaction = session.openTransaction(); Resource resource = transaction.createResource("/my/big/resource"); - resource.getContents().add(Model1Factory.eINSTANCE.createCompany()); + resource.getContents().add(CompanyFactory.eINSTANCE.createCompany()); transaction.commit(); System.out.println(); diff --git a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java index 3294346106..7680567ea1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java @@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java index 99a357a868..6a213e258e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.BranchingTestSameSession; +import org.eclipse.emf.cdo.tests.BranchingSameSessionTest; import org.eclipse.emf.cdo.tests.MergingTest; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; @@ -74,7 +74,7 @@ public class AllTestsDBH2Branching extends DBConfigs { // add branching tests for this testsuite testClasses.add(BranchingTest.class); - testClasses.add(BranchingTestSameSession.class); + testClasses.add(BranchingSameSessionTest.class); testClasses.add(MergingTest.class); super.initTestClasses(testClasses); diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java index 2d158bca13..a15155e083 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java @@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; @@ -74,7 +74,7 @@ public class AllTestsDBH2NonAudit extends DBConfigs // non-audit mode - remove audit tests testClasses.remove(AuditTest.class); - testClasses.remove(AuditTestSameSession.class); + testClasses.remove(AuditSameSessionTest.class); testClasses.remove(Bugzilla_252214_Test.class); } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java index 7475a3569c..cccdc53c65 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java @@ -15,7 +15,7 @@ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; import org.eclipse.emf.cdo.tests.db.bundle.OM; @@ -80,7 +80,7 @@ public class AllTestsDBPsql extends DBConfigs // non-audit mode - remove audit tests testClasses.remove(AuditTest.class); - testClasses.remove(AuditTestSameSession.class); + testClasses.remove(AuditSameSessionTest.class); testClasses.remove(Bugzilla_252214_Test.class); } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java index 027d1b8b94..bfed5e101d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java @@ -14,9 +14,9 @@ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.tests.AllConfigs; import org.eclipse.emf.cdo.tests.AttributeTest; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.BranchingTestSameSession; +import org.eclipse.emf.cdo.tests.BranchingSameSessionTest; import org.eclipse.emf.cdo.tests.ExternalReferenceTest; import org.eclipse.emf.cdo.tests.FeatureMapTest; import org.eclipse.emf.cdo.tests.MEMStoreQueryTest; @@ -52,7 +52,7 @@ public abstract class DBConfigs extends AllConfigs if (!hasBranchingSupport()) { testClasses.remove(BranchingTest.class); - testClasses.remove(BranchingTestSameSession.class); + testClasses.remove(BranchingSameSessionTest.class); testClasses.remove(MergingTest.class); testClasses.remove(Bugzilla_303807_Test.class); } @@ -61,7 +61,7 @@ public abstract class DBConfigs extends AllConfigs { // non-audit mode - remove audit tests testClasses.remove(AuditTest.class); - testClasses.remove(AuditTestSameSession.class); + testClasses.remove(AuditSameSessionTest.class); testClasses.remove(Bugzilla_252214_Test.class); } diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java index a6c29f0a80..3b063b6383 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java @@ -12,9 +12,9 @@ package org.eclipse.emf.cdo.tests.hibernate; import org.eclipse.emf.cdo.tests.AllConfigs; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.BranchingTestSameSession; +import org.eclipse.emf.cdo.tests.BranchingSameSessionTest; import org.eclipse.emf.cdo.tests.CommitInfoTest; import org.eclipse.emf.cdo.tests.ComplexTest; import org.eclipse.emf.cdo.tests.ContainmentTest; @@ -125,7 +125,7 @@ public class AllTestsHibernate extends AllConfigs // Branching not supported testClasses.remove(BranchingTest.class); testClasses.remove(MergingTest.class); - testClasses.remove(BranchingTestSameSession.class); + testClasses.remove(BranchingSameSessionTest.class); // Commit info not supported testClasses.remove(CommitInfoTest.class); @@ -140,7 +140,7 @@ public class AllTestsHibernate extends AllConfigs // audit support to do // bug 244141 testClasses.remove(AuditTest.class); - testClasses.remove(AuditTestSameSession.class); + testClasses.remove(AuditSameSessionTest.class); testClasses.remove(Bugzilla_252214_Test.class); // replace a test with our local implementation: diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java index 7586fb60c0..17d8d5444b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java @@ -44,7 +44,7 @@ public class AllTestsObjyBranching extends ObjyDBConfigs // // add branching tests for this testsuite // testClasses.add(BranchingTest.class); - // testClasses.add(BranchingTestSameSession.class); + // testClasses.add(BranchingSameSessionTest.class); // testClasses.add(MergingTest.class); } diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java index 6a3b63b253..c117ee8518 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.tests.objectivity; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; @@ -48,11 +48,11 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs // non-audit mode - remove audit tests testClasses.remove(AuditTest.class); - testClasses.remove(AuditTestSameSession.class); + testClasses.remove(AuditSameSessionTest.class); testClasses.remove(Bugzilla_252214_Test.class); // non-branching mode - remove branch tests. // testClasses.remove(BranchingTest.class); - // testClasses.remove(BranchingTestSameSession.class); + // testClasses.remove(BranchingSameSessionTest.class); // Objy has a deadlock issue which prevent this test from completing. // testClasses.remove(ExternalReferenceTest.class); diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java index 9d5095a8e9..a42a12f281 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java @@ -12,9 +12,9 @@ package org.eclipse.emf.cdo.tests.objectivity; import org.eclipse.emf.cdo.tests.AllConfigs; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.BranchingTestSameSession; +import org.eclipse.emf.cdo.tests.BranchingSameSessionTest; import org.eclipse.emf.cdo.tests.MergingTest; import org.eclipse.emf.cdo.tests.XATransactionTest; import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test; @@ -38,7 +38,7 @@ public abstract class ObjyDBConfigs extends AllConfigs if (!hasBranchingSupport()) { testClasses.remove(BranchingTest.class); - testClasses.remove(BranchingTestSameSession.class); + testClasses.remove(BranchingSameSessionTest.class); testClasses.remove(MergingTest.class); testClasses.remove(Bugzilla_303807_Test.class); } @@ -47,7 +47,7 @@ public abstract class ObjyDBConfigs extends AllConfigs { // non-audit mode - remove audit tests testClasses.remove(AuditTest.class); - testClasses.remove(AuditTestSameSession.class); + testClasses.remove(AuditSameSessionTest.class); testClasses.remove(Bugzilla_252214_Test.class); } diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java index 02c610c4d1..df2a34e308 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java @@ -12,9 +12,9 @@ package org.eclipse.emf.cdo.tests.objectivity; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.tests.AuditTest; -import org.eclipse.emf.cdo.tests.AuditTestSameSession; +import org.eclipse.emf.cdo.tests.AuditSameSessionTest; import org.eclipse.emf.cdo.tests.BranchingTest; -import org.eclipse.emf.cdo.tests.BranchingTestSameSession; +import org.eclipse.emf.cdo.tests.BranchingSameSessionTest; import org.eclipse.emf.cdo.tests.ChunkingTest; import org.eclipse.emf.cdo.tests.ChunkingWithMEMTest; import org.eclipse.emf.cdo.tests.CommitInfoTest; @@ -78,12 +78,12 @@ public class SampleTestsObjy extends ObjyDBConfigs // testClasses.add(AttributeTest.class); testClasses.add(UnsetTest.class); testClasses.add(BranchingTest.class); - testClasses.add(BranchingTestSameSession.class); + testClasses.add(BranchingSameSessionTest.class); testClasses.add(MergingTest.class); testClasses.add(PushTransactionTest.class); testClasses.add(CommitInfoTest.class); testClasses.add(AuditTest.class); - testClasses.add(AuditTestSameSession.class); + testClasses.add(AuditSameSessionTest.class); testClasses.add(ResourceTest.class); testClasses.add(InvalidationTest.class); testClasses.add(ChunkingTest.class); diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF index b047dd05fb..dded5115ff 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF @@ -50,6 +50,7 @@ Export-Package: base;version="4.0.0", org.eclipse.emf.cdo.tests.config.impl;version="4.0.0", org.eclipse.emf.cdo.tests.defs;version="4.0.0", org.eclipse.emf.cdo.tests.revisioncache;version="4.0.0", + org.eclipse.emf.cdo.tests.util;version="4.0.0", reference;version="4.0.0", reference.impl;version="4.0.0", reference.util;version="4.0.0" 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 d63f4dc8e7..e6338d7521 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 @@ -26,6 +26,7 @@ import org.eclipse.emf.cdo.spi.server.InternalStore; import org.eclipse.emf.cdo.spi.server.InternalSynchronizableRepository; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.OfflineConfig; +import org.eclipse.emf.cdo.tests.util.TestListener; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Activator.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Activator.java deleted file mode 100644 index ecf406feb5..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/Activator.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests; - -import org.eclipse.core.runtime.Plugin; - -import org.osgi.framework.BundleContext; - -/** - * @author Eike Stepper - */ -public class Activator extends Plugin -{ - public static final String PLUGIN_ID = "org.eclipse.emf.cdo.tests"; - - private static Activator plugin; - - public Activator() - { - } - - @Override - public void start(BundleContext context) throws Exception - { - super.start(context); - plugin = this; - } - - @Override - public void stop(BundleContext context) throws Exception - { - plugin = null; - super.stop(context); - } - - public static Activator getDefault() - { - return plugin; - } -} diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java index 8f88adecf4..acd707b64f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java @@ -14,6 +14,7 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java index 3c78e08acf..3d5d3ac483 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java @@ -36,17 +36,17 @@ public abstract class AllConfigs extends ConfigTestSuite testClasses.add(SessionTest.class); // TODO Fix testClasses.add(RemoteSessionManagerTest.class); testClasses.add(RevisionManagerTest.class); - testClasses.add(RevisionManagerTestClientSide.class); + testClasses.add(RevisionManagerClientSideTest.class); testClasses.add(BranchingTest.class); - testClasses.add(BranchingTestSameSession.class); - testClasses.add(BranchingTestWithCacheClear.class); + testClasses.add(BranchingSameSessionTest.class); + testClasses.add(BranchingWithCacheClearTest.class); testClasses.add(MergingTest.class); testClasses.add(ViewTest.class); testClasses.add(TransactionTest.class); testClasses.add(PushTransactionTest.class); testClasses.add(CommitInfoTest.class); testClasses.add(AuditTest.class); - testClasses.add(AuditTestSameSession.class); + testClasses.add(AuditSameSessionTest.class); testClasses.add(ResourceTest.class); testClasses.add(ContainmentTest.class); testClasses.add(InvalidationTest.class); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTestSameSession.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditSameSessionTest.java index 8da37265b5..d12a05d40d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTestSameSession.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditSameSessionTest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.session.CDOSession; /** * @author Eike Stepper */ -public class AuditTestSameSession extends AuditTest +public class AuditSameSessionTest extends AuditTest { public void testRepositoryCreationTime() throws Exception { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTestSameSession.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingSameSessionTest.java index 85ef977842..8cc55ecabe 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTestSameSession.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingSameSessionTest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.session.CDOSession; /** * @author Eike Stepper */ -public class BranchingTestSameSession extends BranchingTest +public class BranchingSameSessionTest extends BranchingTest { @Override protected void closeSession1() diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTestWithCacheClear.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingWithCacheClearTest.java index 4d96ce676b..f995ba4f84 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTestWithCacheClear.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingWithCacheClearTest.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.tests; /** * @author Eike Stepper */ -public class BranchingTestWithCacheClear extends BranchingTest +public class BranchingWithCacheClearTest extends BranchingTest { @Override protected void closeSession1() diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java index 7a356669e2..fd7ee76e31 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java @@ -21,6 +21,7 @@ import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java index 3a64196bbf..cb4c05ef9f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java @@ -10,6 +10,8 @@ */ package org.eclipse.emf.cdo.tests; +import org.eclipse.emf.cdo.tests.util.TestEMFUtil; + import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.net4j.util.tests.AbstractOMTest; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FailoverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FailoverTest.java index 6d4209931f..88d7ef830d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FailoverTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FailoverTest.java @@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestListener; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.net4j.acceptor.IAcceptor; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java index 8b7ef0d6f6..8053be00ab 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.util.TestEMFUtil; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java index e01767e213..16783d45bb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java @@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.Customer; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.InvalidObjectException; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineDelayedTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineDelayedTest.java index 24dfa33e62..261dccc660 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineDelayedTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineDelayedTest.java @@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestListener; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.net4j.util.event.IEvent; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineRawTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineRawTest.java index b8279279ec..f7fc8796f1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineRawTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineRawTest.java @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.emf.cdo.spi.server.InternalSynchronizableRepository; +import org.eclipse.emf.cdo.tests.util.TestListener; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineTest.java index f269245a57..189f52bea1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OfflineTest.java @@ -19,6 +19,7 @@ import org.eclipse.emf.cdo.internal.server.syncing.OfflineClone; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestListener; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.net4j.util.event.IEvent; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java index d30e7c9e22..afbfd1d3aa 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java @@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTestClientSide.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerClientSideTest.java index bc0f06ff38..0f8f1bcad5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTestClientSide.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerClientSideTest.java @@ -19,7 +19,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession; /** * @author Eike Stepper */ -public class RevisionManagerTestClientSide extends RevisionManagerTest +public class RevisionManagerClientSideTest extends RevisionManagerTest { @Override protected InternalCDORevisionManager getRevisionManager(InternalRepository repository, InternalCDOSession session) diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java index cf6fc8752b..84a9e8cc6e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java @@ -14,9 +14,9 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained; import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java index 5f96fbdf15..47660db760 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java @@ -15,8 +15,8 @@ import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java index b97a4dcfdf..7d3836c4e2 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java @@ -16,8 +16,8 @@ import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java index 945c9b5e90..3e791391fb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java @@ -14,9 +14,9 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java index 0322672c2b..bc6738dec7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java @@ -14,9 +14,9 @@ import org.eclipse.emf.cdo.CDODeltaNotification; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model1.OrderAddress; import org.eclipse.emf.cdo.tests.model1.OrderDetail; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java index bf7da7fbda..e4fea2579a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java @@ -13,8 +13,8 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model1.Company; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java index 87ef758944..737c140464 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java @@ -13,10 +13,10 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestEMFUtil; import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; +import org.eclipse.emf.cdo.tests.util.TestEMFUtil; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java index 60606d8185..39b7d5370d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java @@ -14,8 +14,8 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model4.RefSingleContained; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java index 53b1e0618f..753d59b95a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java @@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model2.Task; import org.eclipse.emf.cdo.tests.model2.TaskContainer; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; import org.eclipse.emf.cdo.view.CDOView; 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 f8ac972ccb..1b145b3fb4 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 @@ -14,8 +14,8 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model2.TaskContainer; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; import org.eclipse.emf.cdo.view.CDOView; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java index 4d060071cc..004fbc6e52 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java @@ -20,9 +20,9 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta.WithIndex; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model2.Task; import org.eclipse.emf.cdo.tests.model2.TaskContainer; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.internal.cdo.view.CDOStateMachine; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java index 51e7903eb8..e91eb7fcbc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java @@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.TestAdapter; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; +import org.eclipse.emf.cdo.tests.util.TestAdapter; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java index cb31a6c888..ccce136812 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java @@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.common.branch.CDOBranch; import org.eclipse.emf.cdo.common.commit.CDOChangeSetData; -import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; import org.eclipse.emf.cdo.common.revision.CDOIDAndVersion; import org.eclipse.emf.cdo.common.revision.CDORevisionKey; import org.eclipse.emf.cdo.eresource.CDOResource; @@ -90,7 +89,7 @@ public class Bugzilla_326518_Test extends AbstractCDOTest // add a new element on main at index0. container.getElements().add(0, getModel4Factory().createContainedElementNoOpposite()); - CDOCommitInfo commitInfo = transaction1.commit(); + transaction1.commit(); assertEquals(false, transaction1.isDirty()); // merge the other branch to main. diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestAdapter.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java index 5ff46bb8c3..31276766fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestAdapter.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestAdapter.java @@ -1,4 +1,4 @@ -package org.eclipse.emf.cdo.tests; +package org.eclipse.emf.cdo.tests.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestEMFUtil.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestEMFUtil.java index aaaae67088..7763357f0b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestEMFUtil.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestEMFUtil.java @@ -9,7 +9,7 @@ * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance */ -package org.eclipse.emf.cdo.tests; +package org.eclipse.emf.cdo.tests.util; import org.eclipse.net4j.util.io.IORuntimeException; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestListener.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener.java index 87985b1ccd..ec37bebdfc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestListener.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestListener.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests; +package org.eclipse.emf.cdo.tests.util; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestRevision.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestRevision.java index bc69048307..0a76f7f766 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TestRevision.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/util/TestRevision.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests; +package org.eclipse.emf.cdo.tests.util; import org.eclipse.emf.cdo.common.branch.CDOBranch; import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; |