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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-04-24 09:03:08 -0400 (Fri, 24 Apr 2009)
New Revision: 166

Modified:
   trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
Log:
Better cleanup after each test

Modified: trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java	2009-04-24 13:02:44 UTC (rev 165)
+++ trunk/core/src/test/java/org/infinispan/invalidation/BaseInvalidationTest.java	2009-04-24 13:03:08 UTC (rev 166)
@@ -3,6 +3,7 @@
 import static org.easymock.EasyMock.*;
 import org.infinispan.AdvancedCache;
 import org.infinispan.Cache;
+import org.infinispan.api.mvcc.LockAssert;
 import org.infinispan.commands.remote.CacheRpcCommand;
 import org.infinispan.commands.write.ClearCommand;
 import org.infinispan.commands.write.InvalidateCommand;
@@ -31,9 +32,14 @@
    protected AdvancedCache cache1, cache2;
    protected boolean isSync;
 
+   protected BaseInvalidationTest() {
+      cleanup = CleanupPhase.AFTER_METHOD;
+   }
+
    protected void createCacheManagers() throws Throwable {
       Configuration c = getDefaultClusteredConfig(isSync ? Configuration.CacheMode.INVALIDATION_SYNC : Configuration.CacheMode.INVALIDATION_ASYNC);
       c.setStateRetrievalTimeout(1000);
+      c.setLockAcquisitionTimeout(500);
       c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
       List<Cache<Object, Object>> caches = createClusteredCaches(2, "invalidation", c);
       cache1 = caches.get(0).getAdvancedCache();
@@ -162,6 +168,9 @@
       catch (RollbackException roll) {
          fail("Ought to have succeeded!");
       }
+
+      LockAssert.assertNoLocks(cache1);
+      LockAssert.assertNoLocks(cache2);
    }
 
    public void testCacheMode() throws Exception {