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

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-05-28 10:51:30 -0400 (Thu, 28 May 2009)
New Revision: 356

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

Modified: trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java	2009-05-28 13:03:19 UTC (rev 355)
+++ trunk/core/src/test/java/org/infinispan/replication/AsyncAPISyncReplTest.java	2009-05-28 14:51:30 UTC (rev 356)
@@ -2,7 +2,10 @@
 
 import org.infinispan.Cache;
 import org.infinispan.commands.write.PutKeyValueCommand;
+import org.infinispan.commands.write.RemoveCommand;
+import org.infinispan.commands.write.ReplaceCommand;
 import org.infinispan.commands.write.WriteCommand;
+import org.infinispan.commands.write.PutMapCommand;
 import org.infinispan.config.Configuration;
 import org.infinispan.test.MultipleCacheManagersTest;
 import org.infinispan.test.TestingUtil;
@@ -203,7 +206,7 @@
       assert c2.get(key) == null;
       assert f.get() == null;
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, PutKeyValueCommand.class);
       assertOnAllCaches(key, v);
 
       tm.begin();
@@ -214,7 +217,7 @@
       assert !f.isCancelled();
       assert f.get().equals(v);
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, PutKeyValueCommand.class);
       assertOnAllCaches(key, v2);
 
       // putAll
@@ -226,7 +229,7 @@
       assert !f2.isCancelled();
       assert f2.get() == null;
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, PutMapCommand.class);
       assertOnAllCaches(key, v3);
 
       // putIfAbsent
@@ -249,7 +252,7 @@
       assert !f.isCancelled();
       assert f.get().equals(v3);
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, RemoveCommand.class);
       assertOnAllCaches(key, null);
 
       // putIfAbsent again
@@ -261,7 +264,7 @@
       assert !f.isCancelled();
       assert f.get() == null;
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, PutKeyValueCommand.class);
       assertOnAllCaches(key, v4);
 
       // removecond
@@ -282,7 +285,7 @@
       assert !f3.isCancelled();
       assert f3.get().equals(true);
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, RemoveCommand.class);
       assertOnAllCaches(key, null);
 
       // replace
@@ -296,7 +299,7 @@
       assertOnAllCaches(key, null);
 
       c1.put(key, v);
-      asyncWait(false);
+      asyncWait(false, PutKeyValueCommand.class);
 
       tm.begin();
       f = c1.replaceAsync(key, v5);
@@ -306,7 +309,7 @@
       assert !f.isCancelled();
       assert f.get().equals(v);
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, ReplaceCommand.class);
       assertOnAllCaches(key, v5);
 
       //replace2
@@ -327,7 +330,7 @@
       assert !f3.isCancelled();
       assert f3.get().equals(true);
       tm.commit();
-      asyncWait(true);
+      asyncWait(true, ReplaceCommand.class);
       assertOnAllCaches(key, v6);
    }
 }