[jbosscache-commits] JBoss Cache SVN: r7544 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 2 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-20 13:51:26 -0500 (Tue, 20 Jan 2009)
New Revision: 7544

Modified:
   core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
   core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
Log:
more strict replication control

Modified: core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java	2009-01-20 17:33:24 UTC (rev 7543)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java	2009-01-20 18:51:26 UTC (rev 7544)
@@ -416,6 +416,7 @@
          if (lockManager.isLocked(n))
          {
             num++;
+            if (trace) log.trace(n.getFqn() + " locked");
          }
          for (Object cn : n.getChildrenDirect(true))
          {

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java	2009-01-20 17:33:24 UTC (rev 7543)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java	2009-01-20 18:51:26 UTC (rev 7544)
@@ -200,17 +200,23 @@
 
    protected List<CacheSPI<Object, Object>> createCaches(int numCaches, boolean useBuddyPool) throws Exception
    {
-      return createCaches(1, numCaches, useBuddyPool, false);
+      List<CacheSPI<Object, Object>> spiList = createCaches(1, numCaches, useBuddyPool, false);
+      waitForSingleBuddy(spiList);
+      return spiList;
    }
 
    protected List<CacheSPI<Object, Object>> createCaches(int numCaches, boolean useBuddyPool, boolean useDataGravitation, boolean optimisticLocks) throws Exception
    {
-      return createCaches(1, numCaches, useBuddyPool, useDataGravitation, optimisticLocks);
+      List<CacheSPI<Object, Object>> spiList = createCaches(1, numCaches, useBuddyPool, useDataGravitation, optimisticLocks);
+      waitForSingleBuddy(spiList);
+      return spiList;
    }
 
    protected List<CacheSPI<Object, Object>> createCaches(int numCaches, boolean useBuddyPool, boolean useDataGravitation) throws Exception
    {
-      return createCaches(1, numCaches, useBuddyPool, useDataGravitation);
+      List<CacheSPI<Object, Object>> spiList = createCaches(1, numCaches, useBuddyPool, useDataGravitation);
+      waitForSingleBuddy(spiList);
+      return spiList;
    }
 
    protected List<CacheSPI<Object, Object>> createCachesWithCacheLoader(int numCaches, boolean useDataGravitation, boolean removeOnFind, boolean passivation) throws Exception
@@ -381,7 +387,7 @@
    {
       for (Cache cache : caches)
       {
-         if (cache != null) assertEquals(0, ((CacheSPI) cache).getNumberOfLocksHeld());
+         if (cache != null) assertEquals(cache.getLocalAddress() + " still holds locks",0, ((CacheSPI) cache).getNumberOfLocksHeld());
       }
    }
 

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-20 17:33:24 UTC (rev 7543)
+++ core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java	2009-01-20 18:51:26 UTC (rev 7544)
@@ -99,6 +99,20 @@
       verify(mockRpcManager);
    }
 
+   public void testFailure() throws InterruptedException
+   {
+      for (int i = 0; i < COUNT; i++)
+      {
+         cache.put("/a/b/c" + i, "key", "value");
+         assertNotNull(cache.get("/a/b/c" + i, "key"));
+         replicationListener.expect(PutKeyValueCommand.class);
+      }
+      replicationListener.waitForReplicationToOccur();
+
+      for (int i = 0; i < COUNT; i++) assertNotNull("on get i = " + i, cache2.get("/a/b/c" + i, "key"));
+   }
+
+   @Test(dependsOnMethods = "testFailure") //if this method will run first then PutKeyValues might still be on wire and influence the other method
    public void testFlushConcurrency() throws Exception
    {
       // will create multiple threads to constantly perform a cache update, and measure the number of expected invocations on the RPC manager.
@@ -159,17 +173,4 @@
 
       assert replQ.elements.size() == 0;
    }
-
-   public void testFailure() throws InterruptedException
-   {
-      for (int i = 0; i < COUNT; i++)
-      {
-         cache.put("/a/b/c" + i, "key", "value");
-         assertNotNull(cache.get("/a/b/c" + i, "key"));
-         replicationListener.expect(PutKeyValueCommand.class);
-      }
-      replicationListener.waitForReplicationToOccur();
-
-      for (int i = 0; i < COUNT; i++) assertNotNull("on get i = " + i, cache2.get("/a/b/c" + i, "key"));
-   }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java	2009-01-20 17:33:24 UTC (rev 7543)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java	2009-01-20 18:51:26 UTC (rev 7544)
@@ -133,6 +133,7 @@
       }
    }
 
+   @Test (invocationCount = 5, successPercentage = 80)
    public void testMaxNodes() throws Exception
    {
       log.info("set max nodes to 2, expire soonest to expire first");