[jbosscache-commits] JBoss Cache SVN: r7942 - in pojo/trunk/src/test/java/org/jboss/cache/pojo: annotation and 8 other directories.

Author: manik.surtani(a)jboss.com Date: 2009-03-25 10:59:23 -0400 (Wed, 25 Mar 2009) New Revision: 7942 Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/NetworkManagementTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java Log: Updated tests Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ArrayTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -8,14 +8,10 @@ package org.jboss.cache.pojo; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Queue; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.notifications.annotation.CacheListener; import org.jboss.cache.notifications.annotation.NodeActivated; import org.jboss.cache.notifications.annotation.NodeCreated; @@ -36,6 +32,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Queue; + /** * Basic PojoCache test case. * @@ -51,11 +51,11 @@ protected void setUp() throws Exception { log.info("setUp() ...."); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); //cache1.getCache().addCacheListener(new MyCacheListener(false)); cache1.start(); - cache2 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); + cache2 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false); //cache2.getCache().addCacheListener(new MyCacheListener(false)); cache2.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/BuddyReplicationTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -35,7 +35,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.test.Person; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -58,11 +58,11 @@ { log.info("setUp() ...."); boolean toStart = false; - Configuration cfg1 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration cfg1 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); addBuddyReplication(cfg1); cache = PojoCacheFactory.createCache(cfg1, toStart); - Configuration cfg2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration cfg2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); addBuddyReplication(cfg2); cache1 = PojoCacheFactory.createCache(cfg2, toStart); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/EnumTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.annotation.Replicable; import org.jboss.cache.pojo.test.EnumPlanet; import org.testng.annotations.AfterMethod; @@ -78,8 +78,8 @@ { log.info("setUp() ...."); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.getCache().getConfiguration().setSyncCommitPhase(true); cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -13,7 +13,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.pojo.test.SpecialSerializedAddress; @@ -44,8 +44,8 @@ Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory"); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.start(); cache1_.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; @@ -60,8 +60,8 @@ Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory"); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.start(); cache1_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NoZeroArgConstructorTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -3,7 +3,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.annotation.Replicable; import org.testng.AssertJUnit; import org.testng.annotations.AfterClass; @@ -26,10 +26,10 @@ { log.info("setUp() ...."); boolean toStart = false; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/PojoCacheThreadContextTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -49,10 +49,10 @@ { log.info("setUp() ...."); boolean toStart = false; - Configuration cfg1 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); + Configuration cfg1 = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL); cache = PojoCacheFactory.createCache(cfg1, toStart); cache.start(); - Configuration cfg2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); + Configuration cfg2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL); cache1 = PojoCacheFactory.createCache(cfg2, toStart); cache1.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedByteTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.test.Resource; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -51,10 +51,10 @@ { log.info("setUp() ...."); boolean toStart = false; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -18,7 +18,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.test.Link; import org.jboss.cache.pojo.test.NodeManager; @@ -60,7 +60,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache tree = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); tree.getCache().getConfiguration().setSyncCommitPhase(true); tree.start(); return tree; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedNonSerializableTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -7,18 +7,17 @@ package org.jboss.cache.pojo; -import java.util.Properties; - -import javax.naming.Context; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import javax.naming.Context; +import java.util.Properties; + /** * New NewReplicatedAopTest that doesn't use TreeCacheAopTester. * @@ -39,8 +38,8 @@ Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory"); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.start(); cache1_.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -6,7 +6,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; @@ -47,7 +47,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache tree = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache tree = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); tree.getCache().getConfiguration().setSyncCommitPhase(true); tree.start(); return tree; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedPutWithBulkRemoveTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.testng.annotations.AfterMethod; @@ -45,8 +45,8 @@ Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory"); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.getCache().getConfiguration().setSyncCommitPhase(true); cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedSerializableTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.test.CacheObject; import org.jboss.cache.pojo.test.Student; import org.testng.annotations.AfterMethod; @@ -45,8 +45,8 @@ Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory"); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.getCache().getConfiguration().setSyncCommitPhase(true); cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -11,7 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.pojo.test.Student; import org.testng.annotations.AfterMethod; @@ -34,8 +34,8 @@ { log.info("setUp() ...."); boolean toStart = false; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache1.getCache().getConfiguration().setSyncCommitPhase(true); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; @@ -46,10 +46,10 @@ { log.info("setUp() ...."); boolean toStart = false; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/annotation/ReplicatedAnnotationTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.Gadget; @@ -51,9 +51,9 @@ Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory"); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.getCache().getConfiguration().setSyncCommitPhase(true); cache1_.getCache().getConfiguration().setSyncCommitPhase(true); cache_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedListImplTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -1,21 +1,19 @@ package org.jboss.cache.pojo.collection; -import static org.testng.AssertJUnit.fail; - -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.util.ArrayList; +import java.util.List; + /** * List implementation testing. * @@ -33,9 +31,9 @@ { log.info("setUp() ...."); boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.getCache().getConfiguration().setFetchInMemoryState(false); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1_.getCache().getConfiguration().setFetchInMemoryState(false); cache_.start(); cache1_.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/CachedMapImplTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.testng.annotations.AfterMethod; @@ -55,9 +55,9 @@ { log.info("setUp() ...."); boolean toStart = true; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); } @AfterMethod(alwaysRun = true) Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -13,7 +13,7 @@ import org.jboss.aop.proxy.ClassProxy; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheAlreadyDetachedException; import org.jboss.cache.pojo.PojoCacheFactory; @@ -56,7 +56,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncMapTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -17,7 +17,7 @@ import org.jboss.aop.proxy.ClassProxy; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheException; import org.jboss.cache.pojo.PojoCacheFactory; @@ -61,7 +61,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncSetTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -13,7 +13,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.Address; @@ -55,7 +55,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/NetworkManagementTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/NetworkManagementTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/NetworkManagementTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -9,7 +9,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.NetworkAdmin; @@ -56,7 +56,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/PropagationManagerlTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -2,7 +2,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.propagation.PropagationManager; @@ -33,7 +33,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.start(); return cache; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedNetworkManagementTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -9,7 +9,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.NetworkAdmin; @@ -59,7 +59,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/integrated/ReplicatedPropagationManagerlTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -4,7 +4,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.propagation.PropagationManager; @@ -38,7 +38,7 @@ private PojoCache createCache(String name) throws Exception { boolean toStart = false; - PojoCache cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + PojoCache cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); return cache; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -18,7 +18,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; @@ -45,9 +45,9 @@ protected void setUp() throws Exception { boolean toStart = false; - cache_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache_.start(); - cache1_ = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1_ = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1_.start(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedListTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -27,7 +27,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.notification.event.Event; @@ -50,10 +50,10 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); config.setSyncCommitPhase(true); - Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedMapTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -27,7 +27,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.notification.event.Event; @@ -50,10 +50,10 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); config.setSyncCommitPhase(true); - Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedObjectTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -27,7 +27,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.notification.event.Event; @@ -50,10 +50,10 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); config.setSyncCommitPhase(true); - Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/notification/ReplicatedSetTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -27,7 +27,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.notification.event.Event; @@ -50,10 +50,10 @@ @BeforeMethod(alwaysRun = true) protected void setUp() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setFetchInMemoryState(false); config.setSyncCommitPhase(true); - Configuration config2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config2.setFetchInMemoryState(false); config2.setSyncCommitPhase(true); cache = PojoCacheFactory.createCache(config, false); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -22,23 +22,14 @@ package org.jboss.cache.pojo.optimistic; -import java.io.File; -import java.util.LinkedList; -import java.util.List; -import java.util.Random; - -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; - import org.jboss.cache.Fqn; import org.jboss.cache.commands.VersionedDataCommand; import org.jboss.cache.commands.legacy.ReversibleCommand; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.config.parsing.XmlConfigurationParser; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.loader.DummyInMemoryCacheLoader; -import org.jboss.cache.loader.DummySharedInMemoryCacheLoader; +import org.jboss.cache.factories.UnitTestConfigurationFactory; +import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; +import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.marshall.MethodCall; import org.jboss.cache.optimistic.DefaultDataVersion; @@ -48,8 +39,14 @@ import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; -import org.w3c.dom.Element; +import javax.transaction.SystemException; +import javax.transaction.TransactionManager; +import java.io.File; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; + /** * Base test for optimistic locking. Copied from Cache counterpart. */ @@ -124,7 +121,7 @@ protected CacheLoaderConfig getCacheLoaderConfig(boolean shared, boolean passivation) throws Exception { String cacheLoaderClass = shared ? DummySharedInMemoryCacheLoader.class.getName() : DummyInMemoryCacheLoader.class.getName(); - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, "", false, (!shared), shared, false, false); + return UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, "", false, (!shared), shared, false, false); } protected PojoCache createCacheWithLoader(boolean passivationEnabled) throws Exception Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.Person; @@ -43,10 +43,10 @@ { log.info("setUp() ...."); boolean toStart = false; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); cache.getCache().getRegion(Fqn.fromString("SESSION"), true); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; @@ -55,10 +55,10 @@ { log.info("setUp() ...."); boolean toStart = false; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache.getCache().getConfiguration().setSyncCommitPhase(true); cache.start(); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.getCache().getConfiguration().setSyncCommitPhase(true); cache1.start(); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java 2009-03-25 14:52:29 UTC (rev 7941) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java 2009-03-25 14:59:23 UTC (rev 7942) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; import org.jboss.cache.pojo.test.Person; @@ -75,12 +75,12 @@ public void testSimple() throws Exception { boolean toStart = true; - cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); Person ben = createPerson("/person/test1", "Ben Wang", 40); //System.out.println("\n*** I ***"); //System.out.println(((CacheImpl<Object, Object>) cache.getCache()).printDetails()); - cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); + cache1 = PojoCacheFactory.createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.start(); //System.out.println("\n*** II ***");