renamed tests, separated utils and examples

4 files changed, 12 insertions, 12 deletions

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);