[jbosscache-commits] JBoss Cache SVN: r4971 - core/trunk/src/test/java/org/jboss/cache/loader/deadlock.

Author: manik.surtani(a)jboss.com Date: 2008-01-03 20:58:33 -0500 (Thu, 03 Jan 2008) New Revision: 4971 Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java Log: re-added test Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2008-01-04 01:07:18 UTC (rev 4970) +++ core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2008-01-04 01:58:33 UTC (rev 4971) @@ -7,6 +7,7 @@ import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; import org.jboss.cache.loader.AbstractCacheLoaderTestBase; +import org.jboss.cache.loader.DummyInMemoryCacheLoader; import org.jboss.cache.transaction.DummyTransactionManager; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -62,7 +63,7 @@ * CacheLoader/StoreInterceptor's...</li> * </ul> */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = true) // Disabling since this has issues with ReadWriteWithUpgradeLock. See JBCACHE-461 public class ConcurrentCreationDeadlockTest extends AbstractCacheLoaderTestBase { @@ -161,47 +162,8 @@ cache.start(); } - /** - * Test for a local cache without cache loader and single modification per - * transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestLocalNoCacheLoader1Modification() throws Exception - { - startCache(Configuration.CacheMode.LOCAL, null); - performTest(1); - } /** - * Test for a local cache without cache loader and two modifications per - * transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestLocalNoCacheLoader2Modifications() - throws Exception - { - startCache(Configuration.CacheMode.LOCAL, null); - performTest(2); - } - - /** - * Test for a local cache with cache loader and single modification per - * transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestLocalCacheLoader1Modification() throws Exception - { - startCache(Configuration.CacheMode.LOCAL, "org.jboss.cache.loader.DummyCacheLoader"); - performTest(1); - } - - /** * Test for a local cache with cache loader and two modifications per * transaction.<br> * This test does very often fail with a TimeoutException. @@ -210,109 +172,11 @@ */ public void testLocalCacheLoader2Modifications() throws Exception { - startCache(Configuration.CacheMode.LOCAL, "org.jboss.cache.loader.DummyCacheLoader"); + startCache(Configuration.CacheMode.LOCAL, DummyInMemoryCacheLoader.class.getName()); performTest(2); } /** - * Test for an asynchronously replicated cache without cache loader and - * single modification per transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplAsyncNoCacheLoader1Modification() - throws Exception - { - startCache(Configuration.CacheMode.REPL_ASYNC, null); - performTest(1); - } - - /** - * Test for an asynchronously replicated cache without cache loader and two - * modifications per transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplAsyncNoCacheLoader2Modifications() - throws Exception - { - startCache(Configuration.CacheMode.REPL_ASYNC, null); - performTest(2); - } - - /** - * Test for an asynchronously replicated cache with cache loader and single - * modification per transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplAsyncCacheLoader1Modification() - throws Exception - { - startCache(Configuration.CacheMode.REPL_ASYNC, "org.jboss.cache.loader.DummyCacheLoader"); - performTest(1); - } - - /** - * Test for an asynchronously replicated cache with cache loader and two - * modification per transaction.<br> - * This test mysteriously never fails, although it should as the LOCAL - * and REPL_SYNC do. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplAsyncCacheLoader2Modifications() - throws Exception - { - startCache(Configuration.CacheMode.REPL_ASYNC, "org.jboss.cache.loader.DummyCacheLoader"); - performTest(2); - } - - /** - * Test for a synchronously replicated cache without cache loader and single - * modification per transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplSyncNoCacheLoader1Modification() - throws Exception - { - startCache(Configuration.CacheMode.REPL_SYNC, null); - performTest(1); - } - - /** - * Test for a synchronously replicated cache without cache loader and two - * modification per transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplSyncNoCacheLoader2Modifications() - throws Exception - { - startCache(Configuration.CacheMode.REPL_SYNC, null); - performTest(2); - } - - /** - * Test for a synchronously replicated cache with cache loader and single - * modification per transaction.<br> - * This test has never failed up to now. - * - * @throws Exception Any exception if thrown by the cache. - */ - public void disabledtestReplSyncCacheLoader1Modification() throws Exception - { - startCache(Configuration.CacheMode.REPL_SYNC, "org.jboss.cache.loader.DummyCacheLoader"); - performTest(1); - } - - /** * Test for a synchronously replicated cache with cache loader and two * modifications per transaction.<br> * This test fails very often with a TimeoutException. @@ -322,7 +186,7 @@ public void testReplSyncCacheLoader2Modifications() throws Exception { - startCache(Configuration.CacheMode.REPL_SYNC, "org.jboss.cache.loader.DummyCacheLoader"); + startCache(Configuration.CacheMode.REPL_SYNC, DummyInMemoryCacheLoader.class.getName()); performTest(2); }