[jbosscache-commits] JBoss Cache SVN: r7469 - in core/trunk/src/test/java/org/jboss/cache: api/pfer and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-14 10:38:24 -0500 (Wed, 14 Jan 2009)
New Revision: 7469

Modified:
   core/trunk/src/test/java/org/jboss/cache/AbstractCacheTest.java
   core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java
   core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java
Log:
fix test for jdk6

Modified: core/trunk/src/test/java/org/jboss/cache/AbstractCacheTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/AbstractCacheTest.java	2009-01-14 15:17:34 UTC (rev 7468)
+++ core/trunk/src/test/java/org/jboss/cache/AbstractCacheTest.java	2009-01-14 15:38:24 UTC (rev 7469)
@@ -1,5 +1,7 @@
 package org.jboss.cache;
 
+import org.jboss.cache.loader.CacheLoaderManager;
+
 /**
  * @author Mircea.Markus at jboss.com
  */
@@ -13,20 +15,37 @@
    {
       clearRunningTx(cache);
       if (!cache.getCacheStatus().allowInvocations()) return;
-      if (cache.getRoot() != null)
+      removeInMemoryData(cache);
+      clearCacheLoader(cache);
+      //impoortant!!! keep invocation ctxt cleanup as the last line in the cleanup process, prev calls modify
+      // OptionOverrides
+      cache.getInvocationContext().reset();
+   }
+
+   private void clearCacheLoader(CacheSPI<K, V> cache)
+   {
+      CacheLoaderManager cacheLoaderManager = cache.getCacheLoaderManager();
+      if (cacheLoaderManager != null && cacheLoaderManager.getCacheLoader() != null)
       {
-         cache.getRoot().clearDataDirect();
-         //this will also remove from CL if necesarely
-         for (Object obj : cache.getRoot().getChildrenNames())
+         try
          {
-            cache.getRoot().removeChild(obj);
+            cacheLoaderManager.getCacheLoader().remove(Fqn.ROOT);
+         } catch (Exception e)
+         {
+            throw new RuntimeException(e);
          }
       }
-      //impoortant!!! keep invocation ctxt cleanup as the last line in the cleanup process, prev calls modify
-      // OptionOverrides
-      cache.getInvocationContext().reset();
    }
 
+   private void removeInMemoryData(CacheSPI<K, V> cache)
+   {
+      if (cache.getRoot() != null)
+      {
+         cache.getRoot().clearDataDirect();
+         cache.getRoot().removeChildrenDirect();
+      }
+   }
+
    private void clearRunningTx(CacheSPI<K, V> cache)
    {
       if (cache != null && cache.getTransactionManager() != null)

Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java	2009-01-14 15:17:34 UTC (rev 7468)
+++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java	2009-01-14 15:38:24 UTC (rev 7469)
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Vector;
 
- at Test(groups = {"functional", "jgroups", "transaction"})
 public abstract class PutForExternalReadTestBase extends AbstractMultipleCachesTest
 {
    protected Configuration.CacheMode cacheMode;
@@ -43,6 +42,7 @@
    protected TransactionManager tm1, tm2;
 
    protected boolean useTx;
+   private RPCManager rpcManager1;
 
    protected void createCaches()
    {
@@ -66,6 +66,8 @@
       replListener1 = ReplicationListener.getReplicationListener(cache1);
       replListener2 = ReplicationListener.getReplicationListener(cache2);
 
+      rpcManager1 = cache1.getRPCManager();
+
       TestingUtil.blockUntilViewsReceived(10000, cache1, cache2);
       registerCaches(cache1, cache2);
    }
@@ -114,8 +116,8 @@
    public void testAsyncForce() throws Exception
    {
       RPCManager rpcManager = EasyMock.createNiceMock(RPCManager.class);
-      RPCManager originalRpcManager = cache1.getConfiguration().getRuntimeConfig().getRPCManager();
-      List<Address> memberList = originalRpcManager.getMembers();
+
+      List<Address> memberList = rpcManager1.getMembers();
       expect(rpcManager.getMembers()).andReturn(memberList).anyTimes();
       // inject a mock RPC manager so that we can test whether calls made are sync or async.
       ComponentRegistry cr = TestingUtil.extractComponentRegistry(cache1);
@@ -137,7 +139,7 @@
       verify(rpcManager);
 
       // cleanup
-      TestingUtil.extractComponentRegistry(cache1).registerComponent(originalRpcManager, RPCManager.class);
+      TestingUtil.extractComponentRegistry(cache1).registerComponent(rpcManager1, RPCManager.class);
       TestingUtil.extractComponentRegistry(cache1).rewire();
 
       replListener2.expect(RemoveNodeCommand.class);
@@ -229,7 +231,7 @@
       }
       finally
       {
-         TestingUtil.extractComponentRegistry(cache1).registerComponent(originalRpcManager, RPCManager.class);
+         TestingUtil.extractComponentRegistry(cache1).registerComponent(rpcManager1, RPCManager.class);
          TestingUtil.extractComponentRegistry(cache1).rewire();
       }
    }

Modified: core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java	2009-01-14 15:17:34 UTC (rev 7468)
+++ core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java	2009-01-14 15:38:24 UTC (rev 7469)
@@ -21,7 +21,7 @@
 import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
 
- at Test(groups = "functional", sequential = true, testName = "cluster.ReplicationQueueTest")
+ at Test(groups = "functional", testName = "cluster.ReplicationQueueTest")
 public class ReplicationQueueTest extends AbstractMultipleCachesTest
 {
    private static final int COUNT = 10;
@@ -63,6 +63,7 @@
    public void testQueueHoldAndFlush() throws Exception
    {
       assert replQ != null;
+      assert replQ.elements.size() == 0 : "expected 0, recieved " + replQ.elements.size();
 
       // mock the RPCManager used in the cache
       RPCManager mockRpcManager = EasyMock.createStrictMock(RPCManager.class);