[jbosscache-commits] JBoss Cache SVN: r7503 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-18 14:32:36 -0500 (Sun, 18 Jan 2009)
New Revision: 7503

Modified:
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java
Log:
more strict replication control

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java	2009-01-18 18:42:24 UTC (rev 7502)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolNoDataGravitationTest.java	2009-01-18 19:32:36 UTC (rev 7503)
@@ -2,7 +2,10 @@
 
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.Cache;
 import org.jboss.cache.commands.remote.DataGravitationCleanupCommand;
+import org.jboss.cache.commands.write.PutKeyValueCommand;
+import org.jboss.cache.commands.write.PutDataMapCommand;
 import org.jboss.cache.util.CachePrinter;
 import org.jboss.cache.util.TestingUtil;
 import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener;
@@ -13,6 +16,7 @@
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.List;
+import java.util.ArrayList;
 
 /**
  * @author Mircea.Markus at jboss.com
@@ -20,10 +24,18 @@
 @Test(groups = "functional", testName = "buddyreplication.Buddy3NodesNoPoolNoDataGravitationTest")
 public class Buddy3NodesNoPoolNoDataGravitationTest extends AbstractNodeBasedBuddyTest
 {
+
+   List<ReplicationListener> replListener = new ArrayList<ReplicationListener>();
+
    @BeforeClass
    public void createCaches() throws Exception
    {
       caches = createCaches(3, false, false);
+      for (Cache c : caches)
+      {
+        ReplicationListener listener = ReplicationListener.getReplicationListener(c);
+        replListener.add(listener);
+      }
    }
 
    public void testSingleBuddy() throws Exception
@@ -128,7 +140,10 @@
    {
       Fqn fqn = Fqn.fromString("/test");
       Fqn backupFqn = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), fqn);
+
+      replListener.get(1).expect(PutKeyValueCommand.class);
       caches.get(0).put(fqn, key, value);
+      replListener.get(1).waitForReplicationToOccur();
 
       TestingUtil.dumpCacheContents(caches);
 
@@ -142,12 +157,16 @@
       assertNoLocks(caches);
 
       backupFqn = fqnTransformer.getBackupFqn(caches.get(1).getLocalAddress(), fqn);
-      ReplicationListener replicationListener0 = ReplicationListener.getReplicationListener(caches.get(0));
-      replicationListener0.expect(DataGravitationCleanupCommand.class);
+      replListener.get(0).expect(DataGravitationCleanupCommand.class);
+      replListener.get(2).expect(DataGravitationCleanupCommand.class);
+      replListener.get(2).expect(PutDataMapCommand.class);
 
+
       caches.get(1).getInvocationContext().getOptionOverrides().setForceDataGravitation(true);
+      log.info("Before gravitation call...");
       assertEquals("value", caches.get(1).get(fqn, key));
-      replicationListener0.waitForReplicationToOccur(); // cleanup commands are async
+      replListener.get(0).waitForReplicationToOccur(); // cleanup commands are async
+      replListener.get(2).waitForReplicationToOccur(); // cleanup commands are async
 
       TestingUtil.dumpCacheContents(caches);