[jbosscache-commits] JBoss Cache SVN: r6071 - in core/trunk/src/test/java/org/jboss/cache: api and 5 other directories.

Author: manik.surtani(a)jboss.com Date: 2008-06-26 17:43:56 -0400 (Thu, 26 Jun 2008) New Revision: 6071 Added: core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java Removed: core/trunk/src/test/java/org/jboss/cache/optimistic/ComparatorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/NodeMoveOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 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/ChildMapLazyLoadingTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.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/LockParentVersionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.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/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java Log: Refactored optimistic locking tests Copied: core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java (from rev 6055, core/trunk/src/test/java/org/jboss/cache/optimistic/ComparatorTest.java) =================================================================== --- core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java (rev 0) +++ core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -0,0 +1,174 @@ +package org.jboss.cache; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; + +/** + * Tests {@link FqnComparator}. + * + * @author xenephon + */ +@Test(groups = "unit") +public class ComparatorTest +{ + FqnComparator comp = new FqnComparator(); + + public void testSingleCompare() + { + Fqn fqn1 = Fqn.fromString("one"); + Fqn fqn2 = Fqn.fromString("two"); + + assertTrue(comp.compare(fqn1, fqn2) < 0); + assertTrue(comp.compare(fqn2, fqn1) > 0); + assertTrue(comp.compare(fqn1, fqn1) == 0); + assertTrue(comp.compare(fqn2, fqn2) == 0); + } + + public void testNullCompare() + { + Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>()); + Fqn<String> fqn2 = Fqn.fromList(new ArrayList<String>()); + + assertTrue(comp.compare(fqn1, fqn2) == 0); + assertTrue(comp.compare(fqn2, fqn1) == 0); + assertTrue(comp.compare(fqn1, fqn1) == 0); + assertTrue(comp.compare(fqn2, fqn2) == 0); + } + + public void testOneNullCompare() + { + Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>()); + List<String> temp = new ArrayList<String>(); + temp.add("one"); + Fqn<String> fqn2 = Fqn.fromList(temp); + + assertTrue(comp.compare(fqn1, fqn2) < 0); + assertTrue(comp.compare(fqn2, fqn1) > 0); + } + + public void testNotComparableCompare() + { + Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>()); + + List<String> temp = new ArrayList<String>(); + temp.add("one"); + Fqn fqn2 = Fqn.fromList(temp); + + assertTrue(comp.compare(fqn1, fqn2) < 0); + assertTrue(comp.compare(fqn2, fqn1) > 0); + } + + public void testMultiChildCompare() + { + + Fqn fqn1 = Fqn.fromString("/one/two"); + + Fqn fqn2 = Fqn.fromString("/one/two/three"); + + assertTrue(comp.compare(fqn1, fqn2) < 0); + assertTrue(comp.compare(fqn2, fqn1) > 0); + + assertTrue(comp.compare(fqn2, fqn2) == 0); + + assertTrue(comp.compare(fqn1, fqn1) == 0); + } + + public void testMultiNotChildCompare() + { + + Fqn fqn1 = Fqn.fromString("/one/two"); + + Fqn fqn2 = Fqn.fromString("/three/four"); + + assertTrue(comp.compare(fqn1, fqn2) < 0); + assertTrue(comp.compare(fqn2, fqn1) > 0); + + assertTrue(comp.compare(fqn2, fqn2) == 0); + + assertTrue(comp.compare(fqn1, fqn1) == 0); + } + + public void testPartialMultiNotChildCompare() + { + + Fqn fqn1 = Fqn.fromString("/one/two"); + + Fqn fqn2 = Fqn.fromString("/three"); + + assertTrue(comp.compare(fqn1, fqn2) < 0); + assertTrue(comp.compare(fqn2, fqn1) > 0); + + assertTrue(comp.compare(fqn2, fqn2) == 0); + + assertTrue(comp.compare(fqn1, fqn1) == 0); + } + + public void testEqualsMultidCompare() + { + + Fqn fqn1 = Fqn.fromString("/one/two"); + + Fqn fqn2 = Fqn.fromString("/one/two"); + + assertTrue(comp.compare(fqn1, fqn2) == 0); + assertTrue(comp.compare(fqn2, fqn1) == 0); + + assertTrue(comp.compare(fqn2, fqn2) == 0); + + assertTrue(comp.compare(fqn1, fqn1) == 0); + } + + public void testStringIntMultidCompare() + { + Fqn<String> fqn1 = Fqn.fromString("/one/two"); + + List<Object> temp = new ArrayList<Object>(); + temp.add(1234); + Fqn<Object> fqn2 = Fqn.fromList(temp); + + assertTrue(comp.compare(fqn1, fqn2) > 0); + assertTrue(comp.compare(fqn2, fqn1) < 0); + + assertTrue(comp.compare(fqn2, fqn2) == 0); + + assertTrue(comp.compare(fqn1, fqn1) == 0); + } + + public void testOrdinaryObjectCompare() + { + Fqn<Object> fqn1 = Fqn.fromElements(new XYZ(), new ABC()); + Fqn fqn2 = Fqn.fromElements("XYZ", "ABC"); + Fqn<Object> fqn3 = Fqn.fromElements("XYZ", new ABC()); + + Fqn<Object> fqn4 = Fqn.fromElements("XYZ", new XYZ()); + + assertEquals(0, comp.compare(fqn1, fqn2)); + assertEquals(0, comp.compare(fqn1, fqn3)); + assertEquals(0, comp.compare(fqn2, fqn3)); + assertEquals(true, comp.compare(fqn1, fqn4) < 0); + assertEquals(true, comp.compare(fqn4, fqn1) > 0); + } + + private static class XYZ + { + @Override + public String toString() + { + return "XYZ"; + } + } + + private static class ABC + { + @Override + public String toString() + { + return "ABC"; + } + } + +} Property changes on: core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPIOptimisticTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -7,7 +7,7 @@ /** * Optimistically locked version of {@link org.jboss.cache.api.CacheAPITest} */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class CacheAPIOptimisticTest extends CacheAPITest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPIOptimisticTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -9,7 +9,7 @@ /** * An optimistic version of {@link org.jboss.cache.api.NodeAPITest} */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeAPIOptimisticTest extends NodeAPITest { protected NodeLockingScheme getNodeLockingScheme() Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveOptimisticTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveOptimisticTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; - +@Test(groups = {"functional", "optimistic"}) public class NodeMoveOptimisticTest extends NodeMoveAPITest { public NodeMoveOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveOptimisticTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveOptimisticTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "optimistic"}) public class NodeReplicatedMoveOptimisticTest extends NodeReplicatedMoveTest { public NodeReplicatedMoveOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -11,7 +11,7 @@ /** * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups", "optimistic"}) public class BuddyReplicationWithOptimisticLockingTest extends BuddyReplicationFailoverTest { public BuddyReplicationWithOptimisticLockingTest() Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -1,19 +1,19 @@ package org.jboss.cache.invalidation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; import org.jboss.cache.eviction.FIFOConfiguration; import org.jboss.cache.transaction.DummyTransactionManagerLookup; +import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class TombstoneEvictionTest { private CacheSPI c1, c2; Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -1,10 +1,14 @@ package org.jboss.cache.invalidation; -import org.jboss.cache.*; +import org.jboss.cache.Cache; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.Fqn; +import org.jboss.cache.NodeSPI; import org.jboss.cache.config.Configuration; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.optimistic.DefaultDataVersion; import org.jboss.cache.transaction.DummyTransactionManagerLookup; +import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -18,7 +22,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "optimistic"}) public class VersionInconsistencyTest { private Cache cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class CacheListenerOptimisticTest extends CacheListenerTest { public CacheListenerOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -8,7 +8,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class RemoteCacheListenerOptimisticTest extends RemoteCacheListenerTest { public RemoteCacheListenerOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -12,7 +12,12 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.interceptors.*; +import org.jboss.cache.interceptors.CacheMgmtInterceptor; +import org.jboss.cache.interceptors.CallInterceptor; +import org.jboss.cache.interceptors.NotificationInterceptor; +import org.jboss.cache.interceptors.OptimisticLockingInterceptor; +import org.jboss.cache.interceptors.OptimisticNodeInterceptor; +import org.jboss.cache.interceptors.OptimisticValidatorInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.loader.DummyInMemoryCacheLoader; import org.jboss.cache.loader.DummySharedInMemoryCacheLoader; @@ -21,10 +26,10 @@ import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.transaction.GlobalTransaction; import org.jboss.cache.transaction.TransactionSetup; +import org.jboss.cache.util.TestingUtil; import org.jgroups.Address; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import org.jboss.cache.util.TestingUtil; import javax.transaction.SystemException; import javax.transaction.Transaction; @@ -40,7 +45,7 @@ /** * @author manik */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class AbstractOptimisticTestCase { // some test data shared among all the test cases Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -8,8 +8,8 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration; import org.jboss.cache.loader.SamplePojo; +import org.jboss.cache.transaction.TransactionSetup; import org.jboss.cache.util.TestingUtil; -import org.jboss.cache.transaction.TransactionSetup; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -18,7 +18,7 @@ import javax.transaction.Transaction; import javax.transaction.TransactionManager; -@Test(groups = {"functional", "transaction"}) +@Test(groups = {"functional", "transaction", "optimistic"}) public class AsyncCacheTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -21,7 +21,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "transaction"}) +@Test(groups = {"functional", "transaction", "optimistic"}) public class AsyncFullStackInterceptorTest extends AbstractOptimisticTestCase { /** Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -33,7 +33,7 @@ import java.util.concurrent.CountDownLatch; -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class CacheTest extends AbstractOptimisticTestCase { Log log = LogFactory.getLog(CacheTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -22,7 +22,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class ChildMapLazyLoadingTest { private CacheSPI<Object, Object> cache; Deleted: core/trunk/src/test/java/org/jboss/cache/optimistic/ComparatorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ComparatorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ComparatorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -1,176 +0,0 @@ -package org.jboss.cache.optimistic; - -import org.jboss.cache.Fqn; -import org.jboss.cache.FqnComparator; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; -import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; - -/** - * Tests {@link FqnComparator}. - * - * @author xenephon - */ -@Test(groups = {"functional"}) -public class ComparatorTest -{ - FqnComparator comp = new FqnComparator(); - - public void testSingleCompare() - { - Fqn fqn1 = Fqn.fromString("one"); - Fqn fqn2 = Fqn.fromString("two"); - - assertTrue(comp.compare(fqn1, fqn2) < 0); - assertTrue(comp.compare(fqn2, fqn1) > 0); - assertTrue(comp.compare(fqn1, fqn1) == 0); - assertTrue(comp.compare(fqn2, fqn2) == 0); - } - - public void testNullCompare() - { - Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>()); - Fqn<String> fqn2 = Fqn.fromList(new ArrayList<String>()); - - assertTrue(comp.compare(fqn1, fqn2) == 0); - assertTrue(comp.compare(fqn2, fqn1) == 0); - assertTrue(comp.compare(fqn1, fqn1) == 0); - assertTrue(comp.compare(fqn2, fqn2) == 0); - } - - public void testOneNullCompare() - { - Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>()); - List<String> temp = new ArrayList<String>(); - temp.add("one"); - Fqn<String> fqn2 = Fqn.fromList(temp); - - assertTrue(comp.compare(fqn1, fqn2) < 0); - assertTrue(comp.compare(fqn2, fqn1) > 0); - } - - public void testNotComparableCompare() - { - Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>()); - - List<String> temp = new ArrayList<String>(); - temp.add("one"); - Fqn fqn2 = Fqn.fromList(temp); - - assertTrue(comp.compare(fqn1, fqn2) < 0); - assertTrue(comp.compare(fqn2, fqn1) > 0); - } - - public void testMultiChildCompare() - { - - Fqn fqn1 = Fqn.fromString("/one/two"); - - Fqn fqn2 = Fqn.fromString("/one/two/three"); - - assertTrue(comp.compare(fqn1, fqn2) < 0); - assertTrue(comp.compare(fqn2, fqn1) > 0); - - assertTrue(comp.compare(fqn2, fqn2) == 0); - - assertTrue(comp.compare(fqn1, fqn1) == 0); - } - - public void testMultiNotChildCompare() - { - - Fqn fqn1 = Fqn.fromString("/one/two"); - - Fqn fqn2 = Fqn.fromString("/three/four"); - - assertTrue(comp.compare(fqn1, fqn2) < 0); - assertTrue(comp.compare(fqn2, fqn1) > 0); - - assertTrue(comp.compare(fqn2, fqn2) == 0); - - assertTrue(comp.compare(fqn1, fqn1) == 0); - } - - public void testPartialMultiNotChildCompare() - { - - Fqn fqn1 = Fqn.fromString("/one/two"); - - Fqn fqn2 = Fqn.fromString("/three"); - - assertTrue(comp.compare(fqn1, fqn2) < 0); - assertTrue(comp.compare(fqn2, fqn1) > 0); - - assertTrue(comp.compare(fqn2, fqn2) == 0); - - assertTrue(comp.compare(fqn1, fqn1) == 0); - } - - public void testEqualsMultidCompare() - { - - Fqn fqn1 = Fqn.fromString("/one/two"); - - Fqn fqn2 = Fqn.fromString("/one/two"); - - assertTrue(comp.compare(fqn1, fqn2) == 0); - assertTrue(comp.compare(fqn2, fqn1) == 0); - - assertTrue(comp.compare(fqn2, fqn2) == 0); - - assertTrue(comp.compare(fqn1, fqn1) == 0); - } - - public void testStringIntMultidCompare() - { - Fqn<String> fqn1 = Fqn.fromString("/one/two"); - - List<Object> temp = new ArrayList<Object>(); - temp.add(1234); - Fqn<Object> fqn2 = Fqn.fromList(temp); - - assertTrue(comp.compare(fqn1, fqn2) > 0); - assertTrue(comp.compare(fqn2, fqn1) < 0); - - assertTrue(comp.compare(fqn2, fqn2) == 0); - - assertTrue(comp.compare(fqn1, fqn1) == 0); - } - - public void testOrdinaryObjectCompare() - { - Fqn<Object> fqn1 = Fqn.fromElements(new XYZ(), new ABC()); - Fqn fqn2 = Fqn.fromElements("XYZ", "ABC"); - Fqn<Object> fqn3 = Fqn.fromElements("XYZ", new ABC()); - - Fqn<Object> fqn4 = Fqn.fromElements("XYZ", new XYZ()); - - assertEquals(0, comp.compare(fqn1, fqn2)); - assertEquals(0, comp.compare(fqn1, fqn3)); - assertEquals(0, comp.compare(fqn2, fqn3)); - assertEquals(true, comp.compare(fqn1, fqn4) < 0); - assertEquals(true, comp.compare(fqn4, fqn1) > 0); - } - - private static class XYZ - { - @Override - public String toString() - { - return "XYZ"; - } - } - - private static class ABC - { - @Override - public String toString() - { - return "ABC"; - } - } - -} Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class ConcurrentTransactionTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -22,7 +22,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class DataVersionPersistenceTest { private Cache cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -4,9 +4,9 @@ import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; import org.jboss.cache.NodeSPI; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.config.Configuration; import org.jboss.cache.transaction.DummyTransactionManagerLookup; +import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -20,7 +20,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class DataVersionTransferTest { private List<Cache<Object, Object>> caches = new ArrayList<Cache<Object, Object>>(2); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -22,7 +22,7 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class FullStackInterceptorTest extends AbstractOptimisticTestCase { Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -17,7 +17,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class HasChildTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -6,7 +6,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class LockParentVersionTest extends ParentVersionTest { public LockParentVersionTest() Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -23,7 +23,7 @@ /** * @author xenephon */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorGetChildrenNamesTest extends AbstractOptimisticTestCase { TestListener listener; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -21,19 +21,17 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorGetKeyValTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; private TransactionManager mgr; - private TestListener listener; private MockInterceptor dummy; @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -21,10 +21,9 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorGetKeysTest extends AbstractOptimisticTestCase { - private TestListener listener; private CacheSPI<Object, Object> cache; private TransactionManager mgr; private MockInterceptor dummy; @@ -32,8 +31,7 @@ @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -21,19 +21,17 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorKeyValTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; - private TestListener listener; private MockInterceptor dummy; private TransactionManager mgr; @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -24,19 +24,17 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorPutEraseTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; private TransactionManager mgr; - private TestListener listener; private MockInterceptor dummy; @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -24,19 +24,17 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorPutMapTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; private TransactionManager mgr; - private TestListener listener; private MockInterceptor dummy; @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -24,19 +24,17 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorRemoveDataTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; private TransactionManager mgr; - private TestListener listener; private MockInterceptor dummy; @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -30,19 +30,17 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorRemoveKeyValTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; private TransactionManager mgr; - private TestListener listener; private MockInterceptor dummy; @BeforeMethod public void setUp() throws Exception { - listener = new TestListener(); - cache = createCacheWithListener(listener); + cache = createCache(); CommandInterceptor interceptor = TestingUtil.findInterceptor(cache, OptimisticCreateIfNotExistsInterceptor.class); CommandInterceptor nodeInterceptor = TestingUtil.findInterceptor(cache, OptimisticNodeInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -30,7 +30,7 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) @SuppressWarnings("unchecked") public class NodeInterceptorRemoveNodeTest extends AbstractOptimisticTestCase { @@ -46,7 +46,6 @@ cache = createCacheWithListener(listener); dummy = new MockInterceptor(); -// dummy.setCache(cache); cache.addInterceptor(dummy, CallInterceptor.class); cache.removeInterceptor(CallInterceptor.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -7,35 +7,48 @@ package org.jboss.cache.optimistic; import org.jboss.cache.CacheSPI; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor; import org.jboss.cache.interceptors.OptimisticNodeInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; /** * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class NodeInterceptorTransactionTest extends AbstractOptimisticTestCase { - public void testNoTransactionCRUDMethod() throws Exception - { + CacheSPI cache; + MockInterceptor dummy; - TestListener listener = new TestListener(); - final CacheSPI cache = createCacheWithListener(listener); - + @BeforeMethod + public void setUp() throws Exception + { + cache = createCache(); CommandInterceptor interceptor = new OptimisticCreateIfNotExistsInterceptor(); CommandInterceptor nodeInterceptor = new OptimisticNodeInterceptor(); - MockInterceptor dummy = new MockInterceptor(); + dummy = new MockInterceptor(); interceptor.setNext(nodeInterceptor); nodeInterceptor.setNext(dummy); TestingUtil.replaceInterceptorChain(cache, interceptor); + } + @AfterMethod + public void tearDown() + { + TestingUtil.killCaches(cache); + } + + public void testNoTransactionCRUDMethod() throws Exception + { + try { cache.put("/one/two", "key1", new Object()); @@ -47,24 +60,10 @@ assertTrue(true); } assertEquals(null, dummy.getCalledCommand()); - cache.stop(); } public void testNoTransactionGetMethod() throws Exception { - - TestListener listener = new TestListener(); - final CacheSPI cache = createCacheWithListener(listener); - - CommandInterceptor interceptor = new OptimisticCreateIfNotExistsInterceptor(); - CommandInterceptor nodeInterceptor = new OptimisticNodeInterceptor(); - MockInterceptor dummy = new MockInterceptor(); - - interceptor.setNext(nodeInterceptor); - nodeInterceptor.setNext(dummy); - - TestingUtil.replaceInterceptorChain(cache, interceptor); - boolean fail = false; try { @@ -76,7 +75,6 @@ } assertTrue(fail); assertEquals(null, dummy.getCalledCommand()); - cache.stop(); } Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -18,6 +18,8 @@ import org.jboss.cache.transaction.TransactionTable; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import javax.transaction.Transaction; @@ -27,17 +29,41 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class OptimisticCreateIfNotExistsInterceptorTest extends AbstractOptimisticTestCase { - protected TransactionManager txManager; protected Transaction tx; protected GlobalTransaction gtx; protected TransactionTable table; protected OptimisticTransactionContext entry; protected TransactionWorkspace workspace; + CacheSPI cache; + MockInterceptor dummy; + SamplePojo pojo; + @BeforeMethod + public void setUp() throws Exception + { + pojo = new SamplePojo(21, "test"); + cache = createCache(); + CommandInterceptor interceptor = new OptimisticCreateIfNotExistsInterceptor(); + dummy = new MockInterceptor(); + + interceptor.setNext(dummy); + + TestingUtil.replaceInterceptorChain(cache, interceptor); + + setupTransactionsInInvocationCtx(cache); + } + + @AfterMethod + public void tearDown() + { + TestingUtil.killCaches(cache); + } + + protected void setupTransactionsInInvocationCtx(CacheSPI cache) throws Exception { txManager = DummyTransactionManager.getInstance(); @@ -58,20 +84,6 @@ public void testNodeCreation() throws Exception { - - TestListener listener = new TestListener(); - final CacheSPI cache = createCacheWithListener(listener); - - CommandInterceptor interceptor = new OptimisticCreateIfNotExistsInterceptor(); - MockInterceptor dummy = new MockInterceptor(); - - interceptor.setNext(dummy); - - TestingUtil.replaceInterceptorChain(cache, interceptor); - - setupTransactionsInInvocationCtx(cache); - - final SamplePojo pojo = new SamplePojo(21, "test"); cache.put("/one/two", "key1", pojo); assertEquals(3, workspace.getNodes().size()); @@ -83,25 +95,10 @@ assertTrue(!cache.exists("/one/two")); assertEquals(PutKeyValueCommand.class, dummy.getCalledCommandClass()); txManager.commit(); - - cache.stop(); - } public void testInvalidTransaction() throws Exception { - - TestListener listener = new TestListener(); - final CacheSPI cache = createCacheWithListener(listener); - - CommandInterceptor interceptor = new OptimisticCreateIfNotExistsInterceptor(); - MockInterceptor dummy = new MockInterceptor(); - - interceptor.setNext(dummy); - TestingUtil.replaceInterceptorChain(cache, interceptor); - - setupTransactionsInInvocationCtx(cache); - final SamplePojo pojo = new SamplePojo(21, "test"); cache.put("/one/two", "key1", pojo); assertEquals(3, workspace.getNodes().size()); @@ -128,24 +125,10 @@ { assertTrue(true); } - cache.stop(); - } public void testMultiplePut() throws Exception { - - TestListener listener = new TestListener(); - final CacheSPI cache = createCacheWithListener(listener); - - CommandInterceptor interceptor = new OptimisticCreateIfNotExistsInterceptor(); - MockInterceptor dummy = new MockInterceptor(); - interceptor.setNext(dummy); - TestingUtil.replaceInterceptorChain(cache, interceptor); - SamplePojo pojo = new SamplePojo(21, "test"); - - setupTransactionsInInvocationCtx(cache); - cache.put("/one/two", "key1", pojo); cache.put("/one/two", "key2", pojo); @@ -159,10 +142,5 @@ assertEquals(PutKeyValueCommand.class, dummy.getCalledCommandClass()); txManager.commit(); - - cache.stop(); - } - - } Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -27,7 +27,7 @@ * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class OptimisticLockInterceptorTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Deleted: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -1,662 +0,0 @@ -/* - * Created on 17-Feb-2005 - * - * - * - */ -package org.jboss.cache.optimistic; - -import org.jboss.cache.CacheSPI; -import org.jboss.cache.commands.ReversibleCommand; -import org.jboss.cache.commands.tx.CommitCommand; -import org.jboss.cache.commands.tx.OptimisticPrepareCommand; -import org.jboss.cache.commands.tx.RollbackCommand; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.loader.SamplePojo; -import org.jboss.cache.transaction.DummyTransactionManager; -import org.jboss.cache.transaction.GlobalTransaction; -import org.jboss.cache.transaction.OptimisticTransactionContext; -import org.jboss.cache.transaction.TransactionTable; -import org.jboss.cache.util.TestingUtil; -import org.jgroups.Address; -import static org.testng.AssertJUnit.*; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import javax.transaction.RollbackException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.util.ArrayList; -import java.util.List; - -/** - * @author xenephon - */ -@SuppressWarnings("unchecked") -@Test(groups = "functional", enabled = false) -// disabling since this needs to be rewritten to cope with the new OptimisticReplicationInterceptor. This really doesn't test very much right now. -public class OptimisticReplicationInterceptorTest extends AbstractOptimisticTestCase -{ - private CacheSPI cache; - - @BeforeMethod(alwaysRun = true) - public void setUp() throws Exception - { - cache = createCache(); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() - { - TestingUtil.killCaches(cache); - } - - public void testLocalTransaction() throws Exception - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - assertNull(mgr.getTransaction()); - - mgr.begin(); - - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - mgr.commit(); - - assertNull(mgr.getTransaction()); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - //make sure all calls were done in right order - - List calls = dummy.getAllCalledIds(); - - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls.get(0)); - assertEquals(CommitCommand.METHOD_ID, calls.get(1)); - } - - public void testRollbackTransaction() throws Exception - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - assertNull(mgr.getTransaction()); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - SamplePojo pojo = new SamplePojo(21, "test"); - mgr.begin(); - cache.put("/one/two", "key1", pojo); - mgr.rollback(); - assertNull(mgr.getTransaction()); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - //make sure all calls were done in right order - - List calls = dummy.getAllCalledIds(); - - assertEquals(1, calls.size()); - assertEquals(RollbackCommand.METHOD_ID, calls.get(0)); - } - - public void testRemotePrepareTransaction() throws Exception - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); - TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); - assertNotNull(mgr.getTransaction()); - mgr.commit(); - - - GlobalTransaction remoteGtx = new GlobalTransaction(); - - remoteGtx.setAddress(new TestAddress()); - //hack the method call to make it have the remote globalTransaction - ReversibleCommand command = (ReversibleCommand) entry.getModifications().get(0); - command.setGlobalTransaction(remoteGtx); - - //call our remote method - OptimisticPrepareCommand optimisticPrepareCommand = new OptimisticPrepareCommand(remoteGtx, null, (Address) remoteGtx.getAddress(), false); - try - { - TestingUtil.replicateCommand(cache, optimisticPrepareCommand); //getInvocationDelegate(cache)._replicate(prepareMethod); - } - catch (Throwable t) - { - fail(); - } - - //our thread should be null - assertNull(mgr.getTransaction()); - - // there should be a registration for the remote globalTransaction - assertNotNull(table.get(remoteGtx)); - assertNotNull(table.getLocalTransaction(remoteGtx)); - //assert that this is populated - assertEquals(1, table.get(remoteGtx).getModifications().size()); - - //assert that the remote prepare has populated the local workspace - assertEquals(3, entry.getTransactionWorkSpace().getNodes().size()); - assertEquals(1, entry.getModifications().size()); - List calls = dummy.getAllCalledIds(); - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls.get(2)); - - - assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(1, cache.getTransactionTable().getNumLocalTransactions()); - - } - - - public void testRemoteRollbackTransaction() throws Exception - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); - TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); - assertNotNull(mgr.getTransaction()); - mgr.commit(); - - - GlobalTransaction remoteGtx = new GlobalTransaction(); - - remoteGtx.setAddress(new TestAddress()); - //hack the method call to make it have the remote globalTransaction - ReversibleCommand command = entry.getModifications().get(0); - command.setGlobalTransaction(remoteGtx); - //call our remote method - OptimisticPrepareCommand prepareCommand = new OptimisticPrepareCommand(remoteGtx, null, (Address) remoteGtx.getAddress(), false); - try - { - TestingUtil.replicateCommand(cache, prepareCommand); - } - catch (Throwable t) - { - fail(); - } - - //our thread should be null - assertNull(mgr.getTransaction()); - - // there should be a registration for the remote globalTransaction - assertNotNull(table.get(remoteGtx)); - assertNotNull(table.getLocalTransaction(remoteGtx)); - //assert that this is populated - assertEquals(1, table.get(remoteGtx).getModifications().size()); - - assertEquals(3, entry.getTransactionWorkSpace().getNodes().size()); - assertEquals(1, entry.getModifications().size()); - List calls = dummy.getAllCalledIds(); - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls.get(2)); - - - assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(1, cache.getTransactionTable().getNumLocalTransactions()); - - // call our remote method - RollbackCommand cacheCommand = new RollbackCommand(null); - try - { - TestingUtil.replicateCommand(cache, cacheCommand); - } - catch (Throwable t) - { - fail(); - } - //we should have the commit as well now - assertNull(mgr.getTransaction()); - assertEquals(RollbackCommand.METHOD_ID, calls.get(3)); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - } - - - public void testRemoteCommitNoPrepareTransaction() throws Exception - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); - TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); - assertNotNull(mgr.getTransaction()); - mgr.commit(); - - - GlobalTransaction remoteGtx = new GlobalTransaction(); - - remoteGtx.setAddress(new TestAddress()); - //hack the method call to make it have the remote globalTransaction - ReversibleCommand command = entry.getModifications().get(0); - command.setGlobalTransaction(remoteGtx); - - List calls = dummy.getAllCalledIds(); - assertEquals(2, calls.size()); - - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - // call our remote method - CommitCommand cacheCommand = new CommitCommand(gtx); - - try - { - TestingUtil.replicateCommand(cache, cacheCommand); - fail(); - } - catch (Throwable t) - { - assertTrue(t instanceof RuntimeException); - //t.printStackTrace(); - } - //we should have the commit as well now - assertNull(mgr.getTransaction()); - assertEquals(2, calls.size()); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - } - - - public void testRemoteRollbackNoPrepareTransaction() throws Throwable - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); - TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); - assertNotNull(mgr.getTransaction()); - mgr.commit(); - - - GlobalTransaction remoteGtx = new GlobalTransaction(); - - remoteGtx.setAddress(new TestAddress()); - //hack the method call to make it have the remote globalTransaction - ReversibleCommand command = entry.getModifications().get(0); - - command.setGlobalTransaction(remoteGtx); - - List calls = dummy.getAllCalledIds(); - assertEquals(2, calls.size()); - - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - // call our remote method - RollbackCommand cacheCommand = new RollbackCommand(remoteGtx); - - TestingUtil.replicateCommand(cache, cacheCommand); - assertTrue("Should be handled on the remote end without barfing, in the event of a rollback without a prepare", true); - - //we should have the commit as well now - assertNull(mgr.getTransaction()); - assertEquals(2, calls.size()); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - } - - - public void testRemoteCommitTransaction() throws Exception - { - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - GlobalTransaction gtx = cache.getCurrentTransaction(tx, true); - TransactionTable table = cache.getTransactionTable(); - OptimisticTransactionContext entry = (OptimisticTransactionContext) table.get(gtx); - assertNotNull(mgr.getTransaction()); - mgr.commit(); - - - GlobalTransaction remoteGtx = new GlobalTransaction(); - - remoteGtx.setAddress(new TestAddress()); - //hack the method call to make it have the remote globalTransaction - ReversibleCommand command = entry.getModifications().get(0); - command.setGlobalTransaction(remoteGtx); - OptimisticPrepareCommand prepareCommand = new OptimisticPrepareCommand(remoteGtx, null, (Address) remoteGtx.getAddress(), false); - try - { - TestingUtil.replicateCommand(cache, prepareCommand); - } - catch (Throwable t) - { - fail(); - } - - //our thread should be null - assertNull(mgr.getTransaction()); - - // there should be a registration for the remote globalTransaction - assertNotNull(table.get(remoteGtx)); - assertNotNull(table.getLocalTransaction(remoteGtx)); - //assert that this is populated - assertEquals(1, table.get(remoteGtx).getModifications().size()); - - //assert that the remote prepare has populated the local workspace - assertEquals(3, entry.getTransactionWorkSpace().getNodes().size()); - assertEquals(1, entry.getModifications().size()); - List calls = dummy.getAllCalledIds(); - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls.get(2)); - - - assertEquals(1, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(1, cache.getTransactionTable().getNumLocalTransactions()); - - // call our remote method - CommitCommand commitCommand = new CommitCommand(remoteGtx); - try - { - TestingUtil.replicateCommand(cache, commitCommand); - } - catch (Throwable t) - { - fail(); - } - //we should have the commit as well now - assertNull(mgr.getTransaction()); - assertEquals(CommitCommand.METHOD_ID, calls.get(3)); - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - } - - - public void testTwoWayRemoteCacheBroadcast() throws Exception - { - destroyCache(cache); - cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC); - - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - CacheSPI cache2 = createReplicatedCache(Configuration.CacheMode.REPL_SYNC); - MockInterceptor dummy2 = new MockInterceptor(); - setAlteredInterceptorChain(dummy2, cache2); - - - TransactionManager mgr = cache.getTransactionManager(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - assertNotNull(mgr.getTransaction()); - mgr.commit(); - - assertNull(mgr.getTransaction()); - - //assert that the local cache is in the right state - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - - assertEquals(0, cache2.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache2.getTransactionTable().getNumLocalTransactions()); - - - List calls = dummy.getAllCalledIds(); - - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls.get(0)); - assertEquals(CommitCommand.METHOD_ID, calls.get(1)); - - List calls2 = dummy2.getAllCalledIds(); - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls2.get(0)); - assertEquals(CommitCommand.METHOD_ID, calls2.get(1)); - - destroyCache(cache2); - } - - - public void testFailurePrepareRemoteCacheBroadcast() throws Exception - { - destroyCache(cache); - cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC); - - MockInterceptor dummy = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - CacheSPI cache2 = createReplicatedCache(Configuration.CacheMode.REPL_SYNC); - MockFailureInterceptor dummy2 = new MockFailureInterceptor(); - List failures = new ArrayList(); - failures.add(OptimisticPrepareCommand.class); - dummy2.setFailurelist(failures); - setAlteredInterceptorChain(dummy2, cache2); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - assertNotNull(mgr.getTransaction()); - try - { - mgr.commit(); - } - catch (Exception e) - { - assertTrue(e instanceof RollbackException); - } - - - assertNull(mgr.getTransaction()); - - //assert that the local cache is in the right state - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - - assertEquals(0, cache2.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache2.getTransactionTable().getNumLocalTransactions()); - - - List calls = dummy.getAllCalledIds(); - assertEquals(OptimisticPrepareCommand.METHOD_ID, calls.get(0)); - assertEquals(RollbackCommand.METHOD_ID, calls.get(1)); - - //we have no prepare - as it failed - but we have a commit - List calls2 = dummy2.getAllCalledIds(); - assertEquals(RollbackCommand.METHOD_ID, calls2.get(0)); - - destroyCache(cache2); - } - - - public void testFailurePrepareLocalCacheBroadcast() throws Exception - { - - destroyCache(cache); - cache = createReplicatedCache(Configuration.CacheMode.REPL_SYNC); - - MockFailureInterceptor dummy = new MockFailureInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - CacheSPI cache2 = createReplicatedCache(Configuration.CacheMode.REPL_SYNC); - MockInterceptor dummy2 = new MockInterceptor(); - setAlteredInterceptorChain(dummy, cache); - - List failures = new ArrayList(); - failures.add(OptimisticPrepareCommand.class); - dummy.setFailurelist(failures); - - DummyTransactionManager mgr = DummyTransactionManager.getInstance(); - - //start local transaction - mgr.begin(); - Transaction tx = mgr.getTransaction(); - - //this sets - cache.getCurrentTransaction(tx, true); - - SamplePojo pojo = new SamplePojo(21, "test"); - - cache.put("/one/two", "key1", pojo); - - assertNotNull(mgr.getTransaction()); - try - { - mgr.commit(); - } - catch (Exception e) - { - assertTrue(e instanceof RollbackException); - } - - - assertNull(mgr.getTransaction()); - - //assert that the local cache is in the right state - assertEquals(0, cache.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache.getTransactionTable().getNumLocalTransactions()); - - - assertEquals(0, cache2.getTransactionTable().getNumGlobalTransactions()); - assertEquals(0, cache2.getTransactionTable().getNumLocalTransactions()); - - - List calls = dummy.getAllCalledIds(); - assertEquals(RollbackCommand.METHOD_ID, calls.get(0)); - - //we have no prepare - as it failed - but we have a commit - List calls2 = dummy2.getAllCalledIds(); - assertEquals(0, calls2.size()); - - destroyCache(cache2); - } - - static class TestAddress implements Address - { - private static final long serialVersionUID = -8525272532201600656L; - - public boolean isMulticastAddress() - { - return false; - } - - public void readExternal(ObjectInput arg0) - { - } - - public int size() - { - return 0; - } - - public void writeExternal(ObjectOutput arg0) - { - } - - public void writeTo(DataOutputStream arg0) - { - } - - public void readFrom(DataInputStream arg0) - { - } - - public int compareTo(Object arg0) - { - return 0; - } - } - -} Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -12,7 +12,6 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.Node; -import org.jboss.cache.NodeSPI; import org.jboss.cache.config.Configuration; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; @@ -30,7 +29,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ @SuppressWarnings("unchecked") -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class OptimisticVersioningTest extends AbstractOptimisticTestCase { private static final Log log = LogFactory.getLog(OptimisticVersioningTest.class); @@ -61,8 +60,8 @@ cache1.put(fqn, key, "value"); - DataVersion v1 = ((NodeSPI) cache1.getNode(fqn)).getVersion(); - DataVersion v2 = ((NodeSPI) cache2.getNode(fqn)).getVersion(); + DataVersion v1 = cache1.getNode(fqn).getVersion(); + DataVersion v2 = cache2.getNode(fqn).getVersion(); assertEquals("value", cache1.get(fqn, key)); assertEquals("value", cache2.get(fqn, key)); @@ -124,8 +123,8 @@ } // data versions should be in sync. - v1 = ((NodeSPI) cache1.getNode(fqn)).getVersion(); - v2 = ((NodeSPI) cache2.getNode(fqn)).getVersion(); + v1 = cache1.getNode(fqn).getVersion(); + v2 = cache2.getNode(fqn).getVersion(); assertEquals("Version info should have propagated", v1, v2); } Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -20,7 +20,7 @@ * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) */ -@Test(groups = {"functional", "transaction"}) +@Test(groups = {"functional", "transaction", "optimistic"}) public class OptimisticWithCacheLoaderTest extends AbstractOptimisticTestCase { Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -8,22 +8,19 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.config.parsing.XmlConfigurationParser2x; +import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.transaction.DummyTransactionManager; -import org.jboss.cache.config.parsing.XmlConfigHelper; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.*; import org.testng.annotations.Test; -import org.w3c.dom.Element; /** * Tests optimistic locking with pasivation * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class OptimisticWithPassivationTest extends AbstractOptimisticTestCase { protected CacheLoaderConfig getCacheLoaderConfig() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -16,7 +16,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class ParentVersionTest extends AbstractOptimisticTestCase { private Cache<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -3,8 +3,8 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.NodeSPI; +import org.jboss.cache.config.Configuration; import org.jboss.cache.util.TestingUtil; -import org.jboss.cache.config.Configuration; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; import org.testng.annotations.AfterMethod; @@ -16,7 +16,7 @@ /** * Tests removal of a node before the node is even created. */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class RemoveBeforeCreateTest extends AbstractOptimisticTestCase { CacheSPI<Object, Object>[] c = null; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -19,7 +19,7 @@ * * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class ThreadedCacheAccessTest extends AbstractOptimisticTestCase { private static final Log log = LogFactory.getLog(ThreadedCacheAccessTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -24,7 +24,7 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class ThreadedOptimisticCreateIfNotExistsInterceptorTest extends AbstractOptimisticTestCase { protected synchronized void setTransactionsInInvocationCtx(TransactionManager mgr, CacheSPI cache) throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -25,7 +25,7 @@ import javax.transaction.TransactionManager; import java.util.List; -@Test(groups = {"functional", "transaction"}) +@Test(groups = {"functional", "transaction", "optimistic"}) public class TxInterceptorTest extends AbstractOptimisticTestCase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -19,7 +19,7 @@ * * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class ValidationFailureTest extends AbstractOptimisticTestCase { public void testValidationFailureLockRelease() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -40,7 +40,7 @@ /** * @author xenephon */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class ValidatorInterceptorTest extends AbstractOptimisticTestCase { private CacheSPI<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 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -14,7 +14,7 @@ /** * @author <a href="mailto:manik@jboss.org">Manik Surtani</a> */ -@Test(groups = "functional") +@Test(groups = {"functional", "optimistic"}) public class VersioningOnReadTest extends AbstractOptimisticTestCase { CacheSPI cache; Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -5,9 +5,9 @@ import org.jboss.cache.Fqn; import org.jboss.cache.NodeSPI; import org.jboss.cache.config.Configuration; -import org.jboss.cache.util.TestingUtil; import org.jboss.cache.optimistic.DataVersion; import org.jboss.cache.optimistic.DefaultDataVersion; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -21,7 +21,7 @@ * * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) @SuppressWarnings("unchecked") public class ExplicitVersionsReplTest { Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2008-06-26 21:42:58 UTC (rev 6070) +++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2008-06-26 21:43:56 UTC (rev 6071) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)&lt;/a&gt; */ -@Test(groups = {"functional"}) +@Test(groups = {"functional", "optimistic"}) public class ExplicitVersionsTest { private CacheSPI<String, String> cache;