[jbosscache-commits] JBoss Cache SVN: r7145 - in core/trunk/src/test/java/org/jboss/cache: buddyreplication and 6 other directories.

Author: mircea.markus Date: 2008-11-17 05:43:05 -0500 (Mon, 17 Nov 2008) New Revision: 7145 Modified: core/trunk/src/test/java/org/jboss/cache/CallbackTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java Log: fix tests Modified: core/trunk/src/test/java/org/jboss/cache/CallbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -6,6 +6,7 @@ import org.jboss.cache.notifications.annotation.NodeCreated; import org.jboss.cache.notifications.event.Event; import org.jboss.cache.util.CachePrinter; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -30,12 +31,7 @@ @AfterMethod(alwaysRun = true) public void tearDown() throws Exception { - if (cache != null) - { - cache.stop(); - cache.destroy(); - cache = null; - } + TestingUtil.killCaches(cache); } public void testLocalPutCallbackWithoutTransaction() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -35,11 +35,11 @@ cachesTL.set(caches); System.out.println("*** Testing cache 0:"); - assertIsBuddy(caches.get(0), caches.get(1), true); + waitForBuddy(caches.get(0), caches.get(1), true); System.out.println("*** Testing cache 1:"); - assertIsBuddy(caches.get(1), caches.get(2), true); + waitForBuddy(caches.get(1), caches.get(2), true); System.out.println("*** Testing cache 2:"); - assertIsBuddy(caches.get(2), caches.get(0), true); + waitForBuddy(caches.get(2), caches.get(0), true); System.out.println("Cache 0 = " + CachePrinter.printCacheLockingInfo(caches.get(0))); System.out.println("Cache 1 = " + CachePrinter.printCacheLockingInfo(caches.get(1))); @@ -56,14 +56,14 @@ // TestingUtil.sleepThread(2000); System.out.println("*** Testing cache 0"); - assertIsBuddy(caches.get(0), caches.get(1), false); - assertIsBuddy(caches.get(0), caches.get(2), false); + waitForBuddy(caches.get(0), caches.get(1), false); + waitForBuddy(caches.get(0), caches.get(2), false); System.out.println("*** Testing cache 1"); - assertIsBuddy(caches.get(1), caches.get(2), false); - assertIsBuddy(caches.get(1), caches.get(0), false); + waitForBuddy(caches.get(1), caches.get(2), false); + waitForBuddy(caches.get(1), caches.get(0), false); System.out.println("*** Testing cache 2"); - assertIsBuddy(caches.get(2), caches.get(1), false); - assertIsBuddy(caches.get(2), caches.get(0), false); + waitForBuddy(caches.get(2), caches.get(1), false); + waitForBuddy(caches.get(2), caches.get(0), false); } public void testRemovalFromClusterSingleBuddy() throws Exception @@ -73,11 +73,11 @@ cachesTL.set(caches); System.out.println("*** Testing cache 0"); - assertIsBuddy(caches.get(0), caches.get(1), true); + waitForBuddy(caches.get(0), caches.get(1), true); System.out.println("*** Testing cache 1"); - assertIsBuddy(caches.get(1), caches.get(2), true); + waitForBuddy(caches.get(1), caches.get(2), true); System.out.println("*** Testing cache 2"); - assertIsBuddy(caches.get(2), caches.get(0), true); + waitForBuddy(caches.get(2), caches.get(0), true); // now remove a cache from the cluster caches.get(1).stop(); @@ -87,9 +87,9 @@ // now test new buddy groups System.out.println("*** Testing cache 0"); - assertIsBuddy(caches.get(0), caches.get(2), true); + waitForBuddy(caches.get(0), caches.get(2), true); System.out.println("*** Testing cache 2"); - assertIsBuddy(caches.get(2), caches.get(0), true); + waitForBuddy(caches.get(2), caches.get(0), true); System.out.println("*** Completed successfully ***"); assertNoLocks(caches); } @@ -102,17 +102,17 @@ assertNoLocks(caches); System.out.println("*** Testing cache 0"); - assertIsBuddy(caches.get(0), caches.get(1), false); - assertIsBuddy(caches.get(0), caches.get(2), false); + waitForBuddy(caches.get(0), caches.get(1), false); + waitForBuddy(caches.get(0), caches.get(2), false); System.out.println("*** Testing cache 1"); - assertIsBuddy(caches.get(1), caches.get(2), false); - assertIsBuddy(caches.get(1), caches.get(3), false); + waitForBuddy(caches.get(1), caches.get(2), false); + waitForBuddy(caches.get(1), caches.get(3), false); System.out.println("*** Testing cache 2"); - assertIsBuddy(caches.get(2), caches.get(3), false); - assertIsBuddy(caches.get(2), caches.get(0), false); + waitForBuddy(caches.get(2), caches.get(3), false); + waitForBuddy(caches.get(2), caches.get(0), false); System.out.println("*** Testing cache 3"); - assertIsBuddy(caches.get(3), caches.get(0), false); - assertIsBuddy(caches.get(3), caches.get(1), false); + waitForBuddy(caches.get(3), caches.get(0), false); + waitForBuddy(caches.get(3), caches.get(1), false); // now remove a cache from the cluster caches.get(1).stop(); @@ -122,14 +122,14 @@ // now test new buddy groups System.out.println("*** Testing cache 0"); - assertIsBuddy(caches.get(0), caches.get(2), false); - assertIsBuddy(caches.get(0), caches.get(3), false); + waitForBuddy(caches.get(0), caches.get(2), false); + waitForBuddy(caches.get(0), caches.get(3), false); System.out.println("*** Testing cache 2"); - assertIsBuddy(caches.get(2), caches.get(3), false); - assertIsBuddy(caches.get(2), caches.get(0), false); + waitForBuddy(caches.get(2), caches.get(3), false); + waitForBuddy(caches.get(2), caches.get(0), false); System.out.println("*** Testing cache 3"); - assertIsBuddy(caches.get(3), caches.get(0), false); - assertIsBuddy(caches.get(3), caches.get(2), false); + waitForBuddy(caches.get(3), caches.get(0), false); + waitForBuddy(caches.get(3), caches.get(2), false); assertNoLocks(caches); } @@ -145,9 +145,9 @@ caches.get(1).put("/cache1", "k", "v"); System.out.println("*** Testing cache 0:"); - assertIsBuddy(caches.get(0), caches.get(1), true); + waitForBuddy(caches.get(0), caches.get(1), true); System.out.println("*** Testing cache 1:"); - assertIsBuddy(caches.get(1), caches.get(0), true); + waitForBuddy(caches.get(1), caches.get(0), true); assert caches.get(0).peek(fqnTransformer.getBackupRoot(caches.get(0).getLocalAddress()), false) == null : "Should not have backup region for self"; assert caches.get(0).peek(fqnTransformer.getBackupRoot(caches.get(1).getLocalAddress()), false) != null : "Should have backup region for buddy"; @@ -160,11 +160,11 @@ TestingUtil.blockUntilViewsReceived(60000, caches); System.out.println("*** Testing cache 0:"); - assertIsBuddy(caches.get(0), caches.get(1), true); + waitForBuddy(caches.get(0), caches.get(1), true); System.out.println("*** Testing cache 1:"); - assertIsBuddy(caches.get(1), caches.get(2), true); + waitForBuddy(caches.get(1), caches.get(2), true); System.out.println("*** Testing cache 2:"); - assertIsBuddy(caches.get(2), caches.get(0), true); + waitForBuddy(caches.get(2), caches.get(0), true); System.out.println("0 Lock info: " + CachePrinter.printCacheLockingInfo(caches.get(0))); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -22,7 +22,7 @@ * <p/> * Change the LATE_START_BUDDY_CACHE flag to trigger different startup behavior at the initial * object creation. It does not seem to have an impact on the outcome though. - * + * * @author Fredrik Johansson, Cubeia Ltd */ @Test(groups = "functional", testName = "buddyreplication.BuddyReplicationTestsBase") @@ -59,8 +59,9 @@ } @AfterMethod - public void tearDown() + public void tearDown() throws Exception { + super.tearDown(); TestingUtil.killCaches(cache1, cache2); cache1 = null; cache2 = null; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -33,13 +33,13 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true, testName = "eviction.ConcurrentEvictionTest") +@Test(groups = {"functional"}, testName = "eviction.ConcurrentEvictionTest") public class ConcurrentEvictionTest { private Cache<Integer, String> cache; private long wakeupIntervalMillis = 0; private String tmpDir = System.getProperty("java.io.tmpdir", "/tmp"); - private String cacheLoaderDir = "/JBossCacheFileCacheLoader"; + private String cacheLoaderDir = "JBossCacheFileCacheLoader"; @BeforeMethod(alwaysRun = true) public void setUp() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -2,6 +2,7 @@ import org.jboss.cache.Cache; import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.util.TestingUtil; import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; @@ -16,8 +17,7 @@ { Cache c = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC)); c.put("/a", "b", "c"); - c.stop(); - c.destroy(); + TestingUtil.killCaches(c); } // ComponentRegistry cr; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -95,18 +95,7 @@ CacheSPI<Object, Object> cache1 = srtl.cache1; CacheSPI<Object, Object> cache2 = srtl.cache2; cache1.removeNode(Fqn.ROOT); - if (cache1 != null) - { - log("stopping cache1"); - cache1.stop(); - } - - if (cache2 != null) - { - log("stopping cache2"); - cache2.stop(); - } - + TestingUtil.killCaches(cache1, cache2); super.tearDown(); threadLocal.set(null); } Modified: core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -54,9 +54,10 @@ } @AfterMethod - public void tearDown() + public void tearDown() throws Exception { System.out.println("***** BuddyGroupChangeNotificationTest.tearDown"); + super.tearDown(); TestingUtil.killCaches(c1, c2, c3); c1 = null; c2 = null; Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -73,6 +73,7 @@ c.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); c.setNodeLockingScheme(nodeLockingScheme); c.setCacheMode(cacheMode); + c.setSerializationExecutorPoolSize(0); cache1 = (CacheSPI<String, String>) instance.createCache(c, false); cache1.start(); @@ -83,6 +84,7 @@ c.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); c.setNodeLockingScheme(nodeLockingScheme); c.setCacheMode(cacheMode); + c.setSerializationExecutorPoolSize(0); cache2 = (CacheSPI<String, String>) instance.createCache(c, false); cache2.start(); 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 2008-11-17 06:35:24 UTC (rev 7144) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2008-11-17 10:43:05 UTC (rev 7145) @@ -37,6 +37,7 @@ Configuration c = new Configuration(); c.setTransactionManagerLookupClass("org.jboss.cache.transaction.AsyncRollbackTransactionManagerLookup"); c.setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); + c.setSerializationExecutorPoolSize(0); CacheFactory<String, String> instance = new UnitTestCacheFactory<String, String>(); cache = (CacheSPI<String, String>) instance.createCache(c); tm = cache.getConfiguration().getRuntimeConfig().getTransactionManager();