[jbosscache-commits] JBoss Cache SVN: r7501 - in core/trunk/src/test/java/org/jboss/cache: transaction/pessimistic and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Sun Jan 18 12:46:06 EST 2009
Author: mircea.markus
Date: 2009-01-18 12:46:06 -0500 (Sun, 18 Jan 2009)
New Revision: 7501
Modified:
core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java
Log:
more strict replication control
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -125,13 +125,8 @@
return cache;
}
- protected void destroyCache(Cache<Object, Object> c)
- {
- TestingUtil.killCaches(c);
- }
-
- protected CacheSPI createPessimisticCache() throws Exception
+ protected CacheSPI createPessimisticCache() throws Exception
{
Configuration c = new Configuration();
c.setClusterName("name");
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -6,6 +6,7 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Cache;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.loader.SamplePojo;
import org.jboss.cache.transaction.TransactionSetup;
@@ -34,9 +35,9 @@
public void tearDown()
{
super.tearDown();
- destroyCache(cache);
- destroyCache(cache2);
- cache = null;
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
+ cache = null;
cache2 = null;
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -2,9 +2,9 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Cache;
import org.jboss.cache.commands.write.RemoveNodeCommand;
import org.jboss.cache.commands.write.PutKeyValueCommand;
-import org.jboss.cache.commands.tx.CommitCommand;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.loader.SamplePojo;
import org.jboss.cache.lock.LockManager;
@@ -54,7 +54,7 @@
assertEquals(false, cache.exists(Fqn.fromString("/one/two")));
assertNull(cache.getNode("/one"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
public void testSingleInstanceDuplicateCommit() throws Exception
@@ -102,7 +102,7 @@
assertNotNull(cache.getNode("/one/two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -167,7 +167,7 @@
assertNotNull(cache.getNode("/one").getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
public void test2InstanceCommit() throws Exception
@@ -228,8 +228,8 @@
assertNotNull(cache2.getNode("/one").getChild("two"));
assertNotNull(cache2.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
public void test2InstanceRemove() throws Exception
@@ -299,8 +299,8 @@
assertEquals(null, cache.get("/one/two", "key1"));
assertEquals(false, cache2.exists("/one/two"));
assertEquals(null, cache2.get("/one/two", "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
public void testValidationFailCommit2Instances() throws Exception
@@ -375,8 +375,8 @@
assertNotNull(cache.getNode("/one").getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -6,10 +6,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.NodeSPI;
-import org.jboss.cache.VersionedNode;
+import org.jboss.cache.*;
import org.jboss.cache.commands.WriteCommand;
import org.jboss.cache.commands.tx.CommitCommand;
import org.jboss.cache.commands.tx.OptimisticPrepareCommand;
@@ -51,7 +48,7 @@
{
super.tearDown();
if (c != null)
- destroyCache(c);
+ TestingUtil.killCaches((Cache<Object, Object>) c);
c = null;
}
@@ -163,8 +160,8 @@
public void testRollbackTransaction() throws Exception
{
- destroyCache(c);
- c = createCacheWithListener();
+ TestingUtil.killCaches((Cache<Object, Object>) c);
+ c = createCacheWithListener();
MockInterceptor dummy = new MockInterceptor();
setAlteredInterceptorChain(dummy, c);
@@ -192,8 +189,8 @@
public void testRemotePrepareTransaction() throws Throwable
{
- destroyCache(c);
- c = createCacheWithListener();
+ TestingUtil.killCaches((Cache<Object, Object>) c);
+ c = createCacheWithListener();
MockInterceptor dummy = new MockInterceptor();
setAlteredInterceptorChain(dummy, c);
@@ -249,9 +246,9 @@
public void testRemoteCacheBroadcast() throws Exception
{
- destroyCache(c);
+ TestingUtil.killCaches((Cache<Object, Object>) c);
- CacheSPI<Object, Object> cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC);
+ CacheSPI<Object, Object> cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC);
CacheSPI<Object, Object> cache2 = createReplicatedCache(Configuration.CacheMode.REPL_SYNC);
assertEquals(2, cache.getMembers().size());
assertEquals(2, cache2.getMembers().size());
@@ -285,15 +282,15 @@
assertTrue(cache2.exists(Fqn.fromString("/one")));
assertEquals("value", cache2.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
public void testTwoWayRemoteCacheBroadcast() throws Exception
{
- destroyCache(c);
- CacheSPI<Object, Object> cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC);
+ TestingUtil.killCaches((Cache<Object, Object>) c);
+ CacheSPI<Object, Object> cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC);
CacheSPI<Object, Object> cache2 = createReplicatedCache(Configuration.CacheMode.REPL_SYNC);
assertEquals(2, cache.getMembers().size());
assertEquals(2, cache2.getMembers().size());
@@ -330,8 +327,8 @@
assertEquals("value", cache2.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
@@ -428,7 +425,7 @@
c.removeNode(Fqn.fromString("/a/b"));
tm.commit();
- destroyCache(c);
+ TestingUtil.killCaches((Cache<Object, Object>) c);
}
public void testAddChildAfterRemoveParent() throws Exception
@@ -441,6 +438,6 @@
c.put(Fqn.fromString("/a/b"), "k", "v");
tm.commit();
- destroyCache(c);
+ TestingUtil.killCaches((Cache<Object, Object>) c);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -4,6 +4,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Cache;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.loader.SamplePojo;
import org.jboss.cache.lock.LockManager;
@@ -58,7 +59,7 @@
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
// flesh this out a bit more
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -94,7 +95,7 @@
assertEquals(2, listener.getNodesAdded());
assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions());
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -133,7 +134,7 @@
assertEquals(false, lockManager.isLocked(cache.getNode("/one/two")));
assertNotNull(cache.getNode("/one").getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -163,7 +164,7 @@
assertEquals(false, cache.exists(Fqn.fromString("/one/two")));
assertNull(cache.getRoot().getChild("one"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -212,7 +213,7 @@
assertNotNull(cache.getNode("/one").getChild("two"));
assertNotNull(cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -278,7 +279,7 @@
assertNotNull(cache.getNode("/one").getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -337,8 +338,8 @@
assertNotNull(cache2.getNode("/one").getChild("two"));
assertNotNull(cache2.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
public void test2InstanceRemove() throws Exception
@@ -403,8 +404,8 @@
assertEquals(null, cache.get("/one/two", "key1"));
assertEquals(null, cache2.get("/one/two", "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
public void testValidationFailCommit2Instances() throws Exception
@@ -479,8 +480,8 @@
assertNotNull(cache.getNode("/one").getChild("two"));
assertEquals(pojo2, cache.get(Fqn.fromString("/one/two"), "key1"));
- destroyCache(cache);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
@@ -526,7 +527,7 @@
// assert we can't see the change from tx2 as we already touched the node
assertEquals(null, cache.get("/one/two", "key2"));
mgr.commit();
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
public void testGetKeysIsolationTransaction() throws Exception
@@ -569,7 +570,7 @@
// assert we can't see thge change from tx2 as we already touched the node
assertEquals(1, cache.getNode("/one/two").getKeys().size());
mgr.commit();
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
@@ -627,7 +628,7 @@
keys = cache.getNode("/one/two").getKeys();
assertEquals(2, keys.size());// key1 and key2
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
protected CacheSPI<Object, Object> createSyncReplicatedCache() throws Exception
@@ -754,8 +755,8 @@
//cache2.get(Fqn.fromString("/profiler/node" + i));
}
- destroyCache(cache1);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache1);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
catch (Exception e)
{
@@ -798,7 +799,7 @@
assertEquals("Known issue JBCACHE-1201: Correct node2 value", VALUE1, cache2.get(fqn, KEY));
assertEquals("Correct node1 value", VALUE1, cache1.get(fqn, KEY));
- destroyCache(cache1);
- destroyCache(cache2);
+ TestingUtil.killCaches((Cache<Object, Object>) cache1);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -2,6 +2,8 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Cache;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
import org.testng.annotations.AfterMethod;
@@ -35,8 +37,8 @@
public void tearDown()
{
super.tearDown();
- destroyCache(cache);
- cache = null;
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ cache = null;
}
public void testExists() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -12,6 +12,8 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import org.jboss.cache.Cache;
+import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.config.Configuration;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
@@ -47,9 +49,9 @@
public void tearDown()
{
super.tearDown();
- destroyCache(cache1);
- destroyCache(cache2);
- cache1 = null;
+ TestingUtil.killCaches((Cache<Object, Object>) cache1);
+ TestingUtil.killCaches((Cache<Object, Object>) cache2);
+ cache1 = null;
cache2 = null;
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -5,6 +5,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -45,8 +46,8 @@
@AfterMethod(alwaysRun = true)
public void tearDown()
{
- destroyCache(cache);
- cache = null;
+ TestingUtil.killCaches(cache);
+ cache = null;
}
private long getVersion(Node n)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -3,8 +3,11 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.Cache;
+import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import org.testng.annotations.AfterMethod;
@@ -16,20 +19,24 @@
/**
* Tests removal of a node before the node is even created.
*/
- at Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.RemoveBeforeCreateTest")
+ at Test(groups = {"functional", "optimistic"}, testName = "optimistic.RemoveBeforeCreateTest")
public class RemoveBeforeCreateTest extends AbstractOptimisticTestCase
{
CacheSPI<Object, Object>[] c = null;
+ ReplicationListener[] replListeners;
TransactionManager t;
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
c = new CacheSPI[2];
+ replListeners = new ReplicationListener[2];
c[0] = createReplicatedCache(Configuration.CacheMode.REPL_ASYNC);
c[1] = createReplicatedCache(Configuration.CacheMode.REPL_ASYNC);
- TestingUtil.blockUntilViewsReceived(c, 20000);
+ TestingUtil.blockUntilViewsReceived(c, 20000);
+ replListeners[0] = ReplicationListener.getReplicationListener(c[0]);
+ replListeners[1] = ReplicationListener.getReplicationListener(c[1]);
t = c[0].getTransactionManager();
}
@@ -39,19 +46,20 @@
{
if (c != null)
{
- destroyCache(c[0]);
- destroyCache(c[1]);
- c = null;
+ TestingUtil.killCaches((Cache<Object, Object>) c[0]);
+ TestingUtil.killCaches((Cache<Object, Object>) c[1]);
+ c = null;
}
}
@SuppressWarnings("unchecked")
public void testControl() throws Exception
{
+ replListeners[1].expectWithTx(PutKeyValueCommand.class);
t.begin();
c[0].put("/control", "key", "value");
t.commit();
- TestingUtil.sleepThread(200);
+ replListeners[1].waitForReplicationToOccur();
assertEquals("value", c[0].get("/control", "key"));
assertEquals("value", c[1].get("/control", "key"));
@@ -72,12 +80,13 @@
assertNull(c[0].getNode(f));
assertNull(c[1].getNode(f));
+ replListeners[1].expectWithTx(PutKeyValueCommand.class);
t.begin();
c[0].removeNode(f);
// should NOT barf!!!
t.commit();
- TestingUtil.sleepThread(200);
+ replListeners[1].waitForReplicationToOccur();
assertNull(c[0].getNode(f));
assertNull(c[1].getNode(f));
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -9,6 +9,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Cache;
+import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -40,8 +42,8 @@
public void tearDown()
{
super.tearDown();
- destroyCache(cache);
- cache = null;
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ cache = null;
threads = null;
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -7,6 +7,8 @@
package org.jboss.cache.optimistic;
import org.jboss.cache.CacheSPI;
+import org.jboss.cache.Cache;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import org.testng.annotations.Test;
@@ -58,6 +60,6 @@
// nothing should have been locked.
assertEquals(0, cache.getNumberOfLocksHeld());
- destroyCache(cache);
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -2,6 +2,8 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.Cache;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.fail;
import org.testng.annotations.AfterMethod;
@@ -32,8 +34,8 @@
public void tearDown()
{
super.tearDown();
- destroyCache(cache);
- cache = null;
+ TestingUtil.killCaches((Cache<Object, Object>) cache);
+ cache = null;
}
public void testUpdateOnWrite() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2009-01-18 17:16:23 UTC (rev 7500)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2009-01-18 17:46:06 UTC (rev 7501)
@@ -126,7 +126,6 @@
doTest(false, true);
}
- @Test (invocationCount = 1000)
public void testCommitCreationInDifferentTxWriteLock() throws Throwable
{
doTest(true, true);
More information about the jbosscache-commits
mailing list