Adding a number of @CleanRepositoriesBefore to DB tests

4 files changed, 32 insertions, 27 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
index 0611a000e2..65e503d556 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
@@ -50,6 +50,7 @@ public class SQLQueryTest extends AbstractCDOTest
 
   private static final int NUM_OF_SALES_ORDERS = 5;
 
+  @CleanRepositoriesBefore
   public void testSimpleQueries() throws Exception
   {
     msg("Opening session");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
index e8edf69da6..e5860fd515 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
@@ -101,18 +101,20 @@ public class AttributeTest extends AbstractCDOTest
 
   // XXX disabled because of Bug 289445
   @Skips("Postgresql")
+  @CleanRepositoriesBefore
   public void testByteArray() throws Exception
   {
     byte saveByteArray[] = new byte[] { 0, 1, 2, 3, 0, 1, 0, 100 };
 
     {
-      EPackage packageBytes = createDynamicEPackageWithByte();
+      EPackage packageWithBytes = createDynamicEPackageWithByte();
       CDOSession session = openSession();
-      session.getPackageRegistry().putEPackage(packageBytes);
+      session.getPackageRegistry().putEPackage(packageWithBytes);
+
       CDOTransaction transaction = session.openTransaction();
 
-      EClass eClass = (EClass)packageBytes.getEClassifier("GenOfByteArray");
-      EObject genOfByteArray = packageBytes.getEFactoryInstance().create(eClass);
+      EClass eClass = (EClass)packageWithBytes.getEClassifier("GenOfByteArray");
+      EObject genOfByteArray = packageWithBytes.getEFactoryInstance().create(eClass);
       genOfByteArray.eSet(genOfByteArray.eClass().getEStructuralFeature("bytes"), saveByteArray);
 
       CDOResource resource = transaction.createResource(getResourcePath("/my/resource"));
@@ -143,18 +145,19 @@ public class AttributeTest extends AbstractCDOTest
 
   // XXX disabled because of Bug 289445
   @Skips("Postgresql")
+  @CleanRepositoriesBefore
   public void testByteArrayEmpty() throws Exception
   {
     byte saveByteArray[] = new byte[0];
 
     {
-      EPackage packageBytes = createDynamicEPackageWithByte();
+      EPackage packageWithBytes = createDynamicEPackageWithByte();
       CDOSession session = openSession();
-      session.getPackageRegistry().putEPackage(packageBytes);
+      session.getPackageRegistry().putEPackage(packageWithBytes);
       CDOTransaction transaction = session.openTransaction();
 
-      EClass eClass = (EClass)packageBytes.getEClassifier("GenOfByteArray");
-      EObject genOfByteArray = packageBytes.getEFactoryInstance().create(eClass);
+      EClass eClass = (EClass)packageWithBytes.getEClassifier("GenOfByteArray");
+      EObject genOfByteArray = packageWithBytes.getEFactoryInstance().create(eClass);
       genOfByteArray.eSet(genOfByteArray.eClass().getEStructuralFeature("bytes"), saveByteArray);
 
       CDOResource resource = transaction.createResource(getResourcePath("/my/resource"));
@@ -180,18 +183,19 @@ public class AttributeTest extends AbstractCDOTest
 
   // XXX disabled because of Bug 289445
   @Skips("Postgresql")
+  @CleanRepositoriesBefore
   public void testByteArrayNull() throws Exception
   {
     byte saveByteArray[] = null;
 
     {
-      EPackage packageBytes = createDynamicEPackageWithByte();
+      EPackage packageWithBytes = createDynamicEPackageWithByte();
       CDOSession session = openSession();
-      session.getPackageRegistry().putEPackage(packageBytes);
+      session.getPackageRegistry().putEPackage(packageWithBytes);
       CDOTransaction transaction = session.openTransaction();
 
-      EClass eClass = (EClass)packageBytes.getEClassifier("GenOfByteArray");
-      EObject genOfByteArray = packageBytes.getEFactoryInstance().create(eClass);
+      EClass eClass = (EClass)packageWithBytes.getEClassifier("GenOfByteArray");
+      EObject genOfByteArray = packageWithBytes.getEFactoryInstance().create(eClass);
       genOfByteArray.eSet(genOfByteArray.eClass().getEStructuralFeature("bytes"), saveByteArray);
 
       CDOResource resource = transaction.createResource(getResourcePath("/my/resource"));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
index 0673e7d2fe..fd7486930d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
@@ -43,7 +43,7 @@ import java.util.List;
  */
 public class CommitInfoTest extends AbstractCDOTest
 {
-  private static final String REPO_NAME = "authrepo";
+  private static final String REPO_NAME = "commitinforepo";
 
   private static final String USER_ID = "stepper";
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
index 6c6fc486d0..3b9df2ccd8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
@@ -254,12 +254,12 @@ public class SessionTest extends AbstractCDOTest
 
   public void testNoAuthentication() throws Exception
   {
-    IRepository repository = getRepository("authrepo");
+    IRepository repository = getRepository("authrepo1");
 
     getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
         new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD1)));
 
-    CDOSession session = openSession("authrepo");
+    CDOSession session = openSession("authrepo1");
     assertEquals(null, session.getUserID());
     assertEquals(null, repository.getSessionManager().getSessions()[0].getUserID());
     session.close();
@@ -273,12 +273,12 @@ public class SessionTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD1);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_USER_MANAGER, userManager);
-    IRepository repository = getRepository("authrepo");
+    IRepository repository = getRepository("authrepo2");
 
     getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
         new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD1)));
 
-    CDOSession session = openSession("authrepo");
+    CDOSession session = openSession("authrepo2");
     assertEquals(USER_ID, session.getUserID());
     assertEquals(USER_ID, repository.getSessionManager().getSessions()[0].getUserID());
     session.close();
@@ -291,11 +291,11 @@ public class SessionTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD1);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_USER_MANAGER, userManager);
-    getRepository("authrepo");
+    getRepository("authrepo3");
 
     try
     {
-      openSession("authrepo");
+      openSession("authrepo3");
       fail("RemoteException expected");
     }
     catch (RemoteException success)
@@ -311,13 +311,13 @@ public class SessionTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD1);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_USER_MANAGER, userManager);
-    getRepository("authrepo");
+    getRepository("authrepo4");
 
     getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER, new PasswordCredentialsProvider(null));
 
     try
     {
-      openSession("authrepo");
+      openSession("authrepo4");
       fail("RemoteException expected");
     }
     catch (RemoteException success)
@@ -333,14 +333,14 @@ public class SessionTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD1);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_USER_MANAGER, userManager);
-    getRepository("authrepo");
+    getRepository("authrepo5");
 
     getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
         new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, PASSWORD2)));
 
     try
     {
-      openSession("authrepo");
+      openSession("authrepo5");
       fail("RemoteException expected");
     }
     catch (RemoteException success)
@@ -356,14 +356,14 @@ public class SessionTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD1);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_USER_MANAGER, userManager);
-    getRepository("authrepo");
+    getRepository("authrepo6");
 
     getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
         new PasswordCredentialsProvider(new PasswordCredentials(null, PASSWORD2)));
 
     try
     {
-      openSession("authrepo");
+      openSession("authrepo6");
       fail("RemoteException expected");
     }
     catch (RemoteException success)
@@ -379,14 +379,14 @@ public class SessionTest extends AbstractCDOTest
     userManager.addUser(USER_ID, PASSWORD1);
 
     getTestProperties().put(RepositoryConfig.PROP_TEST_USER_MANAGER, userManager);
-    getRepository("authrepo");
+    getRepository("authrepo7");
 
     getTestProperties().put(SessionConfig.PROP_TEST_CREDENTIALS_PROVIDER,
         new PasswordCredentialsProvider(new PasswordCredentials(USER_ID, null)));
 
     try
     {
-      openSession("authrepo");
+      openSession("authrepo7");
       fail("RemoteException expected");
     }
     catch (RemoteException success)