[249937] Add a method to the test framework to purge the server caches

https://bugs.eclipse.org/bugs/show_bug.cgi?id=249937

7 files changed, 18 insertions, 28 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java
index 78f0873e42..b25cfa5a7f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.tests;
 import org.eclipse.emf.cdo.CDOSession;
 import org.eclipse.emf.cdo.CDOTransaction;
 import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.tests.model1.SalesOrder;
 import org.eclipse.emf.cdo.util.CDOUtil;
@@ -52,7 +51,7 @@ public class ChunkingTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
 
     // ************************************************************* //
 
@@ -97,7 +96,7 @@ public class ChunkingTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
 
     // ************************************************************* //
 
@@ -136,7 +135,7 @@ public class ChunkingTest extends AbstractCDOTest
 
       transaction.commit();
     }
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
 
     // ************************************************************* //
 
@@ -176,7 +175,7 @@ public class ChunkingTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
     // ************************************************************* //
 
     CDOSession session = openModel1Session();
@@ -218,8 +217,7 @@ public class ChunkingTest extends AbstractCDOTest
 
       transaction.commit();
     }
-
-    ((CDORevisionResolverImpl)getRepository().getRevisionManager()).clearCache();
+    clearCache(getRepository().getRevisionManager());
     // ************************************************************* //
 
     CDOSession session = openModel1Session();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
index 893329f01f..4e0d4d7233 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.tests;
 import org.eclipse.emf.cdo.CDOSession;
 import org.eclipse.emf.cdo.CDOTransaction;
 import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl;
 import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
 import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
 import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
@@ -117,7 +116,7 @@ public class ComplexTest extends AbstractCDOTest
     transaction.close();
     session.close();
 
-    ((CDORevisionResolverImpl)getRepository().getRevisionManager()).clearCache();
+    clearCache(getRepository().getRevisionManager());
 
     session = openSession();
     session.getPackageRegistry().putEPackage(model4interfacesPackage.eINSTANCE);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
index 9019d89699..fa940126b5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
@@ -187,7 +187,7 @@ public class ContainmentTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
 
     msg("Opening transaction");
     CDOTransaction transaction = session.openTransaction();
@@ -258,7 +258,7 @@ public class ContainmentTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
 
     msg("Opening session");
     CDOSession session = openModel1Session();
@@ -380,7 +380,7 @@ public class ContainmentTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
     EPackage packageObject = createDynamicEPackage();
 
     ResourceSet resourceSet = new ResourceSetImpl();
@@ -435,7 +435,7 @@ public class ContainmentTest extends AbstractCDOTest
       transaction.commit();
     }
 
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
 
     ResourceSet resourceSet = new ResourceSetImpl();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
index 4f77c4a6aa..bcf89f2753 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
@@ -92,7 +92,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
       resA.getContents().add(objectFromResA);
       transactionA1.commit();
     }
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
     {
       CDOSession sessionA = openSession();
 
@@ -124,7 +124,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
       resA.getContents().add(objectFromResA);
       transactionA1.commit();
     }
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
     {
       CDOSession sessionA = openSession();
 
@@ -203,7 +203,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
       resD.save(outputStream, null);
       dataOfresD = outputStream.toByteArray();
     }
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
     {
       ResourceSet resourceSet = new ResourceSetImpl();
       CDOSession session = openSession();
@@ -275,7 +275,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
 
       transactionA1.commit();
     }
-    removeAllRevisions(getRepository().getRevisionManager());
+    clearCache(getRepository().getRevisionManager());
     {
       ResourceSet resourceSet = new ResourceSetImpl();
       CDOSession sessionA = openSession();
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 145872e5da..3af85ce5d0 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
@@ -915,7 +915,7 @@ public class InvalidationTest extends AbstractCDOTest
 
     if (isRemoveRevision)
     {
-      removeAllRevisions(getRepository().getRevisionManager());
+      clearCache(getRepository().getRevisionManager());
       ((RevisionManager)getRepository().getRevisionManager()).removeCachedRevision(resourceA.cdoID(), 1);
       ((RevisionManager)getRepository().getRevisionManager()).removeCachedRevision(resourceA.cdoID(), 2);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index 308e635d8a..89aa28413b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl;
 import org.eclipse.emf.cdo.tests.model1.Order;
 import org.eclipse.emf.cdo.tests.model1.Product1;
 import org.eclipse.emf.cdo.tests.model1.VAT;
@@ -442,7 +441,7 @@ public class ResourceTest extends AbstractCDOTest
       session.close();
     }
 
-    ((CDORevisionResolverImpl)getRepository().getRevisionManager()).clearCache();
+    clearCache(getRepository().getRevisionManager());
 
     CDOSession session = openSession();
     CDOTransaction transaction = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ConfigTest.java
index 9932ab45b3..f29e6938ed 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ConfigTest.java
@@ -11,8 +11,6 @@
 package org.eclipse.emf.cdo.tests.config;
 
 import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
 import org.eclipse.emf.cdo.internal.server.RevisionManager;
 import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.server.IRevisionManager;
@@ -486,13 +484,9 @@ public abstract class ConfigTest extends AbstractOMTest implements ConfigConstan
         && modelConfig != config);
   }
 
-  protected void removeAllRevisions(IRevisionManager revisionManager)
+  protected void clearCache(IRevisionManager revisionManager)
   {
-    CDORevisionCache cache = ((RevisionManager)revisionManager).getCache();
-    for (CDORevision revision : cache.getRevisions())
-    {
-      cache.removeRevision(revision.getID(), revision.getVersion());
-    }
+    ((RevisionManager)revisionManager).getCache().clear();
   }
 
   public void restartConfigs() throws Exception