Author: mircea.markus Date: 2009-01-20 10:21:32 -0500 (Tue, 20 Jan 2009) New Revision: 7531 Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java Log: more strict replication controll Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-20 14:38:10 UTC (rev 7530) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-20 15:21:32 UTC (rev 7531) @@ -8,6 +8,7 @@ import org.jboss.cache.notifications.annotation.CacheUnblocked; import org.jboss.cache.notifications.event.Event; import org.jboss.cache.commands.remote.DataGravitationCleanupCommand; +import org.jboss.cache.commands.write.PutKeyValueCommand; import org.jboss.cache.util.CachePrinter; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener; @@ -418,28 +419,23 @@ "testSubtreeRetrieval"}) public void testCompleteStateSurvival() throws Exception { - CacheBlockListener blockListener = new CacheBlockListener(); - - caches.get(0).addCacheListener(blockListener); - caches.get(1).addCacheListener(blockListener); - caches.get(2).addCacheListener(blockListener); - + replicationListener1.expect(PutKeyValueCommand.class); caches.get(0).put("/0", "key", "value"); + replicationListener1.waitForReplicationToOccur(); + + replicationListener2.expect(PutKeyValueCommand.class); caches.get(1).put("/1", "key", "value"); + replicationListener2.waitForReplicationToOccur(); + + replicationListener0.expect(PutKeyValueCommand.class); caches.get(2).put("/2", "key", "value"); + replicationListener0.waitForReplicationToOccur(); -// TestingUtil.sleepThread(getSleepTimeout()); - //TestingUtil.sleepThread(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3); - blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3); - caches.get(2).stop(); + TestingUtil.blockUntilViewsReceived(60000, true, caches.get(0), caches.get(1)); - blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5); - assertEquals("value", caches.get(0).get("/2", "key")); - blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5); - caches.get(1).stop(); // cache[0] is all thats left!! @@ -463,6 +459,9 @@ caches.get(0).stop(); caches = createCaches(3, false, true); + replicationListener0 = ReplicationListener.getReplicationListener(caches.get(0)); + replicationListener1 = ReplicationListener.getReplicationListener(caches.get(1)); + replicationListener2 = ReplicationListener.getReplicationListener(caches.get(2)); waitForSingleBuddy(caches); }