[infinispan-commits] Infinispan SVN: r658 - trunk/core/src/test/java/org/infinispan/replication.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-08-12 08:53:36 -0400 (Wed, 12 Aug 2009)
New Revision: 658

Modified:
   trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
Log:
more strict replication controll

Modified: trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java	2009-08-12 11:58:14 UTC (rev 657)
+++ trunk/core/src/test/java/org/infinispan/replication/AsyncReplTest.java	2009-08-12 12:53:36 UTC (rev 658)
@@ -9,6 +9,7 @@
 package org.infinispan.replication;
 
 import org.infinispan.Cache;
+import org.infinispan.commands.write.PutKeyValueCommand;
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
@@ -18,7 +19,6 @@
 
 import javax.transaction.TransactionManager;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @Test(groups = "functional", testName = "replication.AsyncReplTest")
 public class AsyncReplTest extends MultipleCacheManagersTest {
@@ -37,18 +37,18 @@
 
       String key = "key";
 
-      replListener(cache2).expectAny();
+      replListener(cache2).expect(PutKeyValueCommand.class);
       cache1.put(key, "value1");
       // allow for replication
-      replListener(cache2).waitForRpc(60, TimeUnit.SECONDS);
+      replListener(cache2).waitForRpc();
       assertEquals("value1", cache1.get(key));
       assertEquals("value1", cache2.get(key));
 
-      replListener(cache2).expectAny();
+      replListener(cache2).expect(PutKeyValueCommand.class);
       cache1.put(key, "value2");
       assertEquals("value2", cache1.get(key));
 
-      replListener(cache2).waitForRpc(60, TimeUnit.SECONDS);
+      replListener(cache2).waitForRpc();
 
       assertEquals("value2", cache1.get(key));
       assertEquals("value2", cache2.get(key));
@@ -56,7 +56,7 @@
 
    public void testWithTx() throws Exception {
       String key = "key";
-      replListener(cache2).expectAny();
+      replListener(cache2).expect(PutKeyValueCommand.class);
       cache1.put(key, "value1");
       // allow for replication
       replListener(cache2).waitForRpc();
@@ -67,12 +67,12 @@
 
       TransactionManager mgr = TestingUtil.getTransactionManager(cache1);
       mgr.begin();
-      replListener(cache2).expectAnyWithTx();
+      replListener(cache2).expectWithTx(PutKeyValueCommand.class);
       cache1.put(key, "value2");
       assertEquals("value2", cache1.get(key));
       assertEquals("value1", cache2.get(key));
       mgr.commit();
-      replListener(cache2).waitForRpc(60, TimeUnit.SECONDS);
+      replListener(cache2).waitForRpc();
       assertNotLocked(cache1, key);
 
       assertEquals("value2", cache1.get(key));