Author: mircea.markus
Date: 2009-01-08 16:28:50 -0500 (Thu, 08 Jan 2009)
New Revision: 7417
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
Log:
more strict replication control
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2009-01-08
21:15:28 UTC (rev 7416)
+++
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2009-01-08
21:28:50 UTC (rev 7417)
@@ -8,6 +8,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
@@ -16,6 +17,7 @@
import org.jboss.cache.transaction.NotifyingTransactionManager.Notification;
import org.jboss.cache.transaction.TransactionContext;
import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener;
import org.jgroups.JChannel;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
@@ -31,7 +33,7 @@
/**
* @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik
AT jboss DOT org)</a>
*/
-@Test(groups = {"functional"}, sequential = true, testName =
"transaction.pessimistic.AbortionTest")
+@Test(groups = {"functional"}, testName =
"transaction.pessimistic.AbortionTest")
public class AbortionTest
{
private CacheSPI cache1, cache2, cache3;
@@ -131,7 +133,14 @@
assertTrue(mgr1 instanceof DummyTransactionManager);
assertTrue(mgr2 instanceof DummyTransactionManager);
+ ReplicationListener cacheLister2 =
ReplicationListener.getReplicationListener(cache2);
+ ReplicationListener cacheLister3 =
ReplicationListener.getReplicationListener(cache3);
+
+ cacheLister2.expect(PutKeyValueCommand.class);
+ cacheLister3.expect(PutKeyValueCommand.class);
cache1.put("/test", "key", "value");
+ cacheLister2.waitForReplicationToOccur();
+ cacheLister3.waitForReplicationToOccur();
assertEquals("value", cache1.get("/test", "key"));
assertEquals("value", cache2.get("/test", "key"));
@@ -139,12 +148,14 @@
mgr3.setNotification(new TestNotification(abortBeforeCompletion));
+ cacheLister2.expectWithTx(PutKeyValueCommand.class);
+ cacheLister3.expectWithTx(PutKeyValueCommand.class);
mgr1.begin();
cache1.put("/test", "key", "value2");
mgr1.commit();
+ cacheLister2.waitForReplicationToOccur();
+ cacheLister3.waitForReplicationToOccur();
- TestingUtil.sleepThread(5000);
-
// only test cache1 and cache2. Assume cache3 has crashed out.
assertEquals(0, cache1.getNumberOfLocksHeld());
assertEquals(0, cache2.getNumberOfLocksHeld());
Show replies by date