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

Author: mircea.markus Date: 2009-01-09 04:21:18 -0500 (Fri, 09 Jan 2009) New Revision: 7422 Added: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java Removed: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithTM.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/PassivationTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/PassivationTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy2NodesBackupActivationInactivationTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java core/trunk/src/test/java/org/jboss/cache/factories/UnitTestXmlConfigurationParser.java core/trunk/src/test/java/org/jboss/cache/invalidation/CacheLoaderInvalidationTest.java core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithRollbackTest.java core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoader2Test.java core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java core/trunk/src/test/java/org/jboss/cache/loader/RootChildrenLoadedTest.java core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java core/trunk/src/test/java/org/jboss/cache/testng/Base.java core/trunk/src/test/java/org/jboss/cache/testng/Other.java core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java Log: renamed factory class and fixed test Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -12,7 +12,7 @@ import org.jboss.cache.config.ConfigurationException; import org.jboss.cache.config.parsing.XmlConfigurationParser; import org.jboss.cache.config.parsing.XmlConfigurationParser2x; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import java.io.IOException; @@ -109,7 +109,7 @@ public Cache<K, V> createCache(boolean start, Class ownerClass) throws ConfigurationException { - Configuration config = UnitTestCacheConfigurationFactory.getEmptyConfiguration(); + Configuration config = UnitTestConfigurationFactory.getEmptyConfiguration(); return createCache(config, start, ownerClass); } @@ -274,7 +274,7 @@ { if (clusterConfig == null) { - if (UnitTestCacheConfigurationFactory.JGROUPS_CHANNEL.equals("udp")) + if (UnitTestConfigurationFactory.JGROUPS_CHANNEL.equals("udp")) { return mangleClusterConfigurationUdp(null); } @@ -304,9 +304,7 @@ // No explicit cluster configuration found. we need to resolve the default config // now in orded to be able to update it before the cache (and the channel) starts. - // TODO: this does not seem to be the best solution :( - clusterConfig = UnitTestCacheConfigurationFactory.getClusterConfigFromFile( - new Configuration().getDefaultClusterConfig()); + clusterConfig = UnitTestConfigurationFactory.getEmptyConfiguration().getClusterConfig(); } @@ -344,7 +342,7 @@ { if (clusterConfig == null) { - clusterConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC).getClusterConfig(); + clusterConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC).getClusterConfig(); } // replace mcast_addr Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,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.util.TestingUtil; import org.jboss.cache.util.internals.ViewChangeListener; import static org.testng.AssertJUnit.*; @@ -27,9 +27,9 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - Configuration conf1 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration conf1 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); - Configuration conf2 = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration conf2 = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); conf1.setNodeLockingScheme(nodeLockingScheme); conf2.setNodeLockingScheme(nodeLockingScheme); Modified: core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,10 +2,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.util.TestingUtil; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.testng.annotations.Test; import javax.transaction.TransactionManager; @@ -37,7 +34,7 @@ public CacheSPI createCache() { - cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true), false, getClass()); + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true), false, getClass()); cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL); cache.getConfiguration().setCacheLoaderConfig(null); cache.getConfiguration().setNodeLockingScheme(nodeLockingScheme); Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,14 +10,12 @@ 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 static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; import org.testng.annotations.Test; import javax.transaction.TransactionManager; -import java.util.HashSet; -import java.util.Set; @Test(groups = {"functional", "jgroups", "pessimistic"}, testName = "api.NodeReplicatedMoveTest") public class NodeReplicatedMoveTest extends AbstractMultipleCachesTest @@ -34,7 +32,7 @@ protected void createCaches() { // start a single cache instance - cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache1.getConfiguration().setSyncCommitPhase(true); cache1.getConfiguration().setSyncRollbackPhase(true); cache1.getConfiguration().setNodeLockingScheme(nodeLockingScheme); @@ -43,7 +41,7 @@ tm = cache1.getTransactionManager(); // start second instance - cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache2.getConfiguration().setSyncCommitPhase(true); cache2.getConfiguration().setSyncRollbackPhase(true); cache2.getConfiguration().setNodeLockingScheme(nodeLockingScheme); Modified: core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -7,7 +7,7 @@ import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; import org.jboss.cache.eviction.LRUAlgorithmConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.internals.EvictionController; import static org.testng.Assert.*; import org.testng.annotations.AfterMethod; @@ -36,7 +36,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() { - Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration cacheConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); cacheConfig.setCacheMode(Configuration.CacheMode.LOCAL); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, false, getClass()); cache.getConfiguration().getEvictionConfig().setWakeupInterval(1000); @@ -172,7 +172,7 @@ public void testResidencyAndOptimisticLocking() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); config.setCacheMode(Configuration.CacheMode.LOCAL); config.setNodeLockingScheme(Configuration.NodeLockingScheme.OPTIMISTIC); CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(config, true, getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -11,17 +11,13 @@ 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.util.TestingUtil; import static org.testng.AssertJUnit.*; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.util.HashMap; import java.util.Map; -import java.util.Set; -import java.util.HashSet; /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> @@ -35,8 +31,8 @@ protected void createCaches() { - cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); - cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache1.getConfiguration().setNodeLockingScheme(nodeLockingScheme); cache2.getConfiguration().setNodeLockingScheme(nodeLockingScheme); Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -16,7 +16,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.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; @@ -27,7 +27,6 @@ import javax.transaction.HeuristicRollbackException; import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; -import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; @@ -47,7 +46,7 @@ public void setUp() throws CloneNotSupportedException { caches = new ArrayList<CacheSPI<Object, Object>>(); - CacheSPI<Object, Object> cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + CacheSPI<Object, Object> cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache1.getConfiguration().setNodeLockingScheme(nodeLockingScheme); cache1.getConfiguration().setSyncCommitPhase(true); Modified: core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithTM.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithTM.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithTM.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,12 +1,10 @@ package org.jboss.cache.api.batch; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; 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.util.TestingUtil; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.testng.annotations.Test; import javax.transaction.TransactionManager; @@ -91,7 +89,7 @@ public CacheSPI<String, String> createCache() { UnitTestCacheFactory<String, String> cf = new UnitTestCacheFactory<String, String>(); - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); // this should pick up any configured TM for the test + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL); // this should pick up any configured TM for the test c.setNodeLockingScheme(NodeLockingScheme.MVCC); c.setInvocationBatchingEnabled(true); assert c.getTransactionManagerLookupClass() != null : "Should have a transaction manager lookup class attached!!"; Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/LockTestBase.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -3,7 +3,7 @@ import org.jboss.cache.*; 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.invocation.InvocationContextContainer; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.LockManager; @@ -38,7 +38,7 @@ public CacheSPI createCache() { - cache = new UnitTestCacheFactory<String, String>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL), false, getClass()); + cache = new UnitTestCacheFactory<String, String>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL), false, getClass()); cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.MVCC); cache.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); cache.getConfiguration().setIsolationLevel(repeatableRead ? IsolationLevel.REPEATABLE_READ : IsolationLevel.READ_COMMITTED); Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/PassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/PassivationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/PassivationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.invocation.InvocationContextContainer; import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; import org.jboss.cache.lock.IsolationLevel; @@ -25,7 +25,7 @@ String binName = "bin-" + Thread.currentThread().getName(); - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), "debug=true\nbin=" + binName, false, true, false, false, false); clc.setPassivation(true); cache.getConfiguration().setCacheLoaderConfig(clc); Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/PassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/PassivationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/PassivationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.invocation.InvocationContextContainer; import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; import org.jboss.cache.lock.IsolationLevel; @@ -22,7 +22,7 @@ { cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.MVCC); cache.getConfiguration().setIsolationLevel(IsolationLevel.REPEATABLE_READ); - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), "bin=" + Thread.currentThread().getName() + getClass().getName(), false, true, false, false, false); clc.setPassivation(true); cache.getConfiguration().setCacheLoaderConfig(clc); Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.api.mvcc.LockAssert; 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.invocation.InvocationContextContainer; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.LockManager; @@ -39,7 +39,7 @@ @BeforeMethod public void setUp() { - cache = new UnitTestCacheFactory<String, String>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL), false, getClass()); + cache = new UnitTestCacheFactory<String, String>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL), false, getClass()); cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.MVCC); cache.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); cache.getConfiguration().setIsolationLevel(repeatableRead ? IsolationLevel.REPEATABLE_READ : IsolationLevel.READ_COMMITTED); Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.optimistic.TransactionWorkspace; import org.jboss.cache.transaction.GlobalTransaction; import org.jboss.cache.transaction.OptimisticTransactionContext; @@ -48,7 +48,7 @@ { UnitTestCacheFactory<String, String> cf = new UnitTestCacheFactory<String, String>(); - cache1 = (CacheSPI<String, String>) cf.createCache(UnitTestCacheConfigurationFactory.createConfiguration(cacheMode), false, getClass()); + cache1 = (CacheSPI<String, String>) cf.createCache(UnitTestConfigurationFactory.createConfiguration(cacheMode), false, getClass()); cache1.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); cache1.getConfiguration().setSerializationExecutorPoolSize(0);//this is very important for async tests! cache1.getConfiguration().setNodeLockingScheme(nodeLockingScheme); @@ -56,7 +56,7 @@ cache1.start(); tm1 = cache1.getConfiguration().getRuntimeConfig().getTransactionManager(); - cache2 = (CacheSPI<String, String>) cf.createCache(UnitTestCacheConfigurationFactory.createConfiguration(cacheMode), false, getClass()); + cache2 = (CacheSPI<String, String>) cf.createCache(UnitTestConfigurationFactory.createConfiguration(cacheMode), false, getClass()); cache2.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); cache2.getConfiguration().setSerializationExecutorPoolSize(0); //this is very important for async tests! cache2.getConfiguration().setNodeLockingScheme(nodeLockingScheme); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy2NodesBackupActivationInactivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy2NodesBackupActivationInactivationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy2NodesBackupActivationInactivationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -13,8 +13,7 @@ import org.jboss.cache.config.BuddyReplicationConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.util.CachePrinter; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.BeforeClass; @@ -121,7 +120,7 @@ protected CacheSPI<Object, Object> createCache() throws Exception { CacheMode mode = CacheMode.REPL_SYNC; - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(mode); + Configuration c = UnitTestConfigurationFactory.createConfiguration(mode); CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c, false, getClass()); cache.getConfiguration().setUseRegionBasedMarshalling(true); cache.getConfiguration().setInactiveOnStartup(true); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -12,7 +12,7 @@ import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; 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.loader.CacheLoader; import org.jboss.cache.loader.CacheLoaderManager; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; @@ -133,7 +133,7 @@ protected CacheSPI<Object, Object> createCache(boolean optimisticLocks, int numBuddies, String buddyPoolName, boolean useDataGravitation, boolean removeOnFind, boolean start) throws Exception { - CacheSPI<Object, Object> c = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, false, false, true), false, getClass()); + CacheSPI<Object, Object> c = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, false, false, true), false, getClass()); String threadId = Thread.currentThread().getName(); //c.getConfiguration().setClusterName("BuddyReplicationTest-" + threadId); Modified: core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,7 +2,7 @@ import org.jboss.cache.Cache; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener; import org.testng.annotations.AfterMethod; @@ -23,7 +23,7 @@ @BeforeMethod public void setUp() throws CloneNotSupportedException { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_ASYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_ASYNC); cache = new UnitTestCacheFactory<Object, Object>().createCache(c, false, getClass()); cache.getConfiguration().setUseReplQueue(true); cache.getConfiguration().setReplQueueInterval(100); Modified: core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,7 +2,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -24,7 +24,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() { - Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); + Configuration cacheConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, false, getClass()); cache.start(); txMgr = cache.getTransactionManager(); Modified: core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.NodeSPI; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -29,7 +29,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() { - Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); + Configuration cacheConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, getClass()); txMgr = cache.getTransactionManager(); } Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -13,7 +13,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertNotNull; @@ -54,7 +54,7 @@ void initCaches() throws Exception { UnitTestCacheFactory<Integer, String> factory = new UnitTestCacheFactory<Integer, String>(); - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); conf.setEvictionConfig(buildEvictionConfig()); conf.setCacheLoaderConfig(buildCacheLoaderConfig()); conf.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -6,7 +6,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; @@ -18,7 +18,7 @@ Cache<String, String> c = null; try { - Configuration cfg = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL, true); + Configuration cfg = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL, true); cfg.getEvictionConfig().setWakeupInterval(0); c = new UnitTestCacheFactory<String, String>().createCache(cfg, getClass()); ComponentRegistry cr = TestingUtil.extractComponentRegistry(c); @@ -37,7 +37,7 @@ Cache<String, String> c = null; try { - Configuration cfg = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL, true); + Configuration cfg = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL, true); cfg.getEvictionConfig().setWakeupInterval(10); c = new UnitTestCacheFactory<String, String>().createCache(cfg, getClass()); ComponentRegistry cr = TestingUtil.extractComponentRegistry(c); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; @@ -48,7 +48,7 @@ void initCaches() throws Exception { - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); EvictionConfig evConfig = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new ElementSizeAlgorithmConfig(5000, 100), 200000), -1); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/data"), new ElementSizeAlgorithmConfig(10, 20))); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/test/data"), new ElementSizeAlgorithmConfig(-1, 5))); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -11,7 +11,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; @@ -58,7 +58,7 @@ void initCaches() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); EvictionConfig evConfig = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new FIFOAlgorithmConfig(maxNodes), 2000000), 0); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/test/data"), new FIFOAlgorithmConfig(5))); config.setEvictionConfig(evConfig); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -12,7 +12,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.EvictionController; @@ -32,8 +32,8 @@ { CacheSPI<Object, Object> cache; final String ROOT_STR = "/test"; - Throwable t1_ex, t2_ex; - boolean isTrue; + volatile Throwable t1_ex, t2_ex; + volatile boolean isTrue; int maxNodesDefault = 500, minNodesDefault = 10, maxNodesR1 = 200, minNodesR1 = 100, maxNodesR2 = -1, minNodesR2 = 5; private EvictionController evController; @@ -47,7 +47,7 @@ void initCaches() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); EvictionConfig evConfig = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new LFUAlgorithmConfig(maxNodesDefault, minNodesDefault), 200000), 0); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/data"), new LFUAlgorithmConfig(maxNodesR1, minNodesR1))); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/test/data"), new LFUAlgorithmConfig(maxNodesR2, minNodesR2))); @@ -297,9 +297,11 @@ } catch (Throwable e) { - e.printStackTrace(); +// e.printStackTrace(); + System.out.println("Got exception:" + e); if (t1_ex == null) { + isTrue = false; t1_ex = e; } } @@ -326,6 +328,7 @@ counter++; if (t1_ex != null) { + isTrue = false; fail("Exception generated in put() " + t1_ex); } TestingUtil.sleepThread(250); @@ -336,4 +339,10 @@ } } } + + public static void main(String[] args) + { + NullPointerException npe = new NullPointerException(); + npe.printStackTrace(); + } } Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -7,9 +7,8 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; -import org.jboss.cache.util.CachePrinter; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.EvictionController; import org.jboss.cache.util.internals.EvictionWatcher; @@ -41,14 +40,14 @@ private int baseRegionTTLMillis = 1000; final String ROOT_STR = "/test"; - Throwable t1_ex, t2_ex; - boolean isTrue; + volatile Throwable t1_ex, t2_ex; + volatile boolean isTrue; @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); EvictionConfig evConfig = conf.getEvictionConfig(); evConfig.setWakeupInterval(wakeupIntervalMillis); List<EvictionRegionConfig> regionConfigs = new ArrayList<EvictionRegionConfig>(); @@ -267,9 +266,10 @@ } catch (Throwable e) { - e.printStackTrace(); + System.out.println("Got exception: " + e); if (t1_ex == null) { + isTrue = false; t1_ex = e; } } @@ -298,6 +298,7 @@ counter++; if (t1_ex != null) { + isTrue = false; fail("Exception generated in put() " + t1_ex); } TestingUtil.sleepThread(1000); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -12,7 +12,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; @@ -60,7 +60,7 @@ private void initCaches() { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); EvictionConfig evConfig = config.getEvictionConfig(); evConfig.setWakeupInterval(200); // root ERC Modified: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -6,7 +6,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.internals.EvictionWatcher; @@ -49,7 +49,7 @@ */ public void testEviction() throws InterruptedException { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); EvictionConfig evConfig = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new NullEvictionAlgorithmConfig(), 200000), 200); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/test"), new NullEvictionAlgorithmConfig())); evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/lru"), new LRUAlgorithmConfig(1000, 10000))); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.interceptors.EvictionInterceptor; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.EvictionController; @@ -36,7 +36,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); config.setNodeLockingScheme(Configuration.NodeLockingScheme.OPTIMISTIC); config.setEvictionConfig(buildEvictionConfig()); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(config, getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -29,7 +29,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import static org.testng.AssertJUnit.*; @@ -37,7 +37,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.concurrent.TimeUnit; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.EvictionController; @@ -65,7 +64,7 @@ private void initCache() { - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); UnitTestCacheFactory<Object, Object> instance = new UnitTestCacheFactory<Object, Object>(); cache = (CacheSPI<Object, Object>) instance.createCache(conf, false, getClass()); EvictionConfig erc = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new LRUAlgorithmConfig(0, 0, 10)), -1); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -3,7 +3,7 @@ import org.jboss.cache.CacheSPI; 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.notifications.annotation.CacheListener; import org.jboss.cache.notifications.annotation.NodeEvicted; import org.jboss.cache.notifications.event.Event; @@ -32,7 +32,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true), false, getClass()); + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true), false, getClass()); cache1.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); cache1.getConfiguration().setUseRegionBasedMarshalling(true); cache1.getConfiguration().getEvictionConfig().setWakeupInterval(wakeupIntervalMillis); Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -15,7 +15,7 @@ { public void testConstruction() { - Cache c = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC), getClass()); + Cache c = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC), getClass()); c.put("/a", "b", "c"); TestingUtil.killCaches(c); } Deleted: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,271 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.cache.factories; - -import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.config.ConfigurationException; -import org.jboss.cache.config.parsing.XmlConfigHelper; -import org.jboss.cache.config.parsing.XmlConfigurationParser; -import org.jboss.cache.transaction.TransactionSetup; -import org.jboss.cache.util.FileLookup; -import org.jgroups.conf.XmlConfigurator; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -import java.io.InputStream; -import java.net.URL; -import java.util.Properties; - -import org.jgroups.conf.ConfiguratorFactory; - -/** - * Cache configuration factory used by unit tests. - */ -public class UnitTestCacheConfigurationFactory -{ - public static final String JGROUPS_CHANNEL; - public static final String JGROUPS_STACK_TYPE = "jgroups.stack"; - public static final String DEFAULT_CONFIGURATION_FILE = "unit-test-cache-service.xml"; - - static - { - JGROUPS_CHANNEL = System.getProperty(JGROUPS_STACK_TYPE, "tcp"); - System.out.println("IN USE JGROUPS_CHANNEL = " + JGROUPS_CHANNEL); - } - - public static Configuration createConfiguration(CacheMode mode) throws ConfigurationException - { - return createConfiguration(mode, false, false); - } - - public static Configuration createConfiguration(CacheMode mode, boolean useEviction) throws ConfigurationException - { - return createConfiguration(mode, useEviction, false); - } - - public static Configuration createConfiguration(CacheMode mode, boolean useEviction, boolean usePassivation) throws ConfigurationException - { - return createConfiguration(mode, useEviction, usePassivation, false); - } - - public static Configuration createConfiguration(CacheMode mode, boolean useEviction, boolean usePassivation, boolean killable) throws ConfigurationException - { - UnitTestXmlConfigurationParser parser = new UnitTestXmlConfigurationParser(); - Configuration c = parser.parseFile(DEFAULT_CONFIGURATION_FILE, mode); - - if (!useEviction) - { - c.setEvictionConfig(null); - } - - if (!usePassivation) - { - c.setCacheLoaderConfig(null); - } - - c.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup()); - - if (mode != CacheMode.LOCAL && killable) - { - String clusterConfig = c.getClusterConfig(); - c.setClusterConfig(injectDiscard(clusterConfig, 0, 0)); - } - - return c; - } - - public static CacheLoaderConfig buildSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, - String properties, boolean async, boolean fetchPersistentState, - boolean shared, boolean purgeOnStartup, boolean ignoreModifications) throws Exception - { - CacheLoaderConfig clc = new CacheLoaderConfig(); - IndividualCacheLoaderConfig iclc = new IndividualCacheLoaderConfig(); - iclc.setClassName(cacheloaderClass); - iclc.setAsync(async); - iclc.setFetchPersistentState(fetchPersistentState); - iclc.setPurgeOnStartup(purgeOnStartup); - iclc.setIgnoreModifications(ignoreModifications); - iclc.setProperties(properties); - clc.addIndividualCacheLoaderConfig(iclc); - clc.setPassivation(passivation); - clc.setShared(shared); - clc.setPreload(preload); - return clc; - } - public static CacheLoaderConfig buildSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, - Properties properties, boolean async, boolean fetchPersistentState, - boolean shared, boolean purgeOnStartup, boolean ignoreModifications) throws Exception - { - CacheLoaderConfig clc = new CacheLoaderConfig(); - IndividualCacheLoaderConfig iclc = new IndividualCacheLoaderConfig(); - iclc.setClassName(cacheloaderClass); - iclc.setAsync(async); - iclc.setFetchPersistentState(fetchPersistentState); - iclc.setPurgeOnStartup(purgeOnStartup); - iclc.setIgnoreModifications(ignoreModifications); - iclc.setProperties(properties); - clc.addIndividualCacheLoaderConfig(iclc); - clc.setPassivation(passivation); - clc.setShared(shared); - clc.setPreload(preload); - return clc; - } - - public static CacheLoaderConfig.IndividualCacheLoaderConfig buildIndividualCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean purgeOnStartup, boolean ignoreModifications) throws Exception - { - return buildSingleCacheLoaderConfig(false, preload, cacheloaderClass, properties, async, fetchPersistentState, false, purgeOnStartup, ignoreModifications).getFirstCacheLoaderConfig(); - } - - /** - * Helper method that takes a <b>JGroups</b> configuration file and creates an old-style JGroups config {@link String} that can be used - * in {@link org.jboss.cache.config.Configuration#setClusterConfig(String)}. Note that expressions - * in the file - such as <tt>${jgroups.udp.mcast_port:45588}</tt> are expanded out accordingly. - * - * @param url url to the cfg file - * @return a String - */ - public static String getClusterConfigFromFile(URL url) - { - try - { - XmlConfigurator conf = XmlConfigurator.getInstance(url); - String tmp = conf.getProtocolStackString(); - // parse this string for ${} substitutions - // Highly crappy approach!! - tmp = tmp.replace("${jgroups.udp.mcast_addr:228.10.10.10}", "228.10.10.10"); - tmp = tmp.replace("${jgroups.udp.mcast_port:45588}", "45588"); - tmp = tmp.replace("${jgroups.udp.ip_ttl:2}", "2"); - return tmp; - } - catch (Exception e) - { - throw new RuntimeException("Problems with url " + url, e); - } - } - - /** - * Helper method that takes a <b>JGroups</b> configuration file and creates an old-style JGroups config {@link String} that can be used - * in {@link org.jboss.cache.config.Configuration#setClusterConfig(String)}. Note that expressions - * in the file - such as <tt>${jgroups.udp.mcast_port:45588}</tt> are expanded out accordingly. - * - * @param properties config properties - * @return a String - */ - public static String getClusterConfigFromProperties(String properties) - { - try - { - XmlConfigurator conf = XmlConfigurator.getInstance(ConfiguratorFactory.getConfigStream(properties)); - String tmp = conf.getProtocolStackString(); - // parse this string for ${} substitutions - // Highly crappy approach!! - tmp = tmp.replace("${jgroups.udp.mcast_addr:228.10.10.10}", "228.10.10.10"); - tmp = tmp.replace("${jgroups.udp.mcast_port:45588}", "45588"); - tmp = tmp.replace("${jgroups.udp.ip_ttl:2}", "2"); - return tmp; - } - catch (Exception e) - { - throw new RuntimeException("Problems with properties " + properties, e); - } - } - - /** - * Takes a JGroups configuration "old-style" String and injects the "DELAY" protcol. - * - * @param jgroupsConfigString JGroups config string - * @param incomingDelay incoming delay - * @param outgoingDelay outgoing delay - * @return new string - */ - public static String injectDelay(String jgroupsConfigString, int incomingDelay, int outgoingDelay) - { - String delay = ":DELAY(in_delay=" + incomingDelay + ";out_delay=" + outgoingDelay + ")"; - return jgroupsConfigString.substring(0, jgroupsConfigString.indexOf(":")) + delay + jgroupsConfigString.substring(jgroupsConfigString.indexOf(":")); - } - - /** - * Takes a JGroups configuration "old-style" String and injects the "DISCARD" protcol. - * - * @param jgroupsConfigString JGroups config string - * @param up factor of incoming messages to discard. 0 is none, 1 is all. - * @param down factor of outgoing messages to discard. 0 is none, 1 is all. - * @return new string - */ - public static String injectDiscard(String jgroupsConfigString, double up, double down) - { - String delay = ":DISCARD(up=" + up + ";down=" + down + ")"; - return jgroupsConfigString.substring(0, jgroupsConfigString.indexOf(":")) + delay + jgroupsConfigString.substring(jgroupsConfigString.indexOf(":")); - } - - /** - * This will make sure that cluster config is according {@link #JGROUPS_STACK_TYPE}, even for local caches. - * This is to avoid the following scenario: if you build a Configuration through new Configuration() then clusterCOnfig - * is set to default value, which might be UDP. - * - */ - public static Configuration getEmptyConfiguration() - { - Configuration tmp = createConfiguration(CacheMode.REPL_SYNC); - Configuration conf = new Configuration(); - conf.setClusterConfig(tmp.getClusterConfig()); - assert conf.getClusterConfig() != null; - return conf; - } - - private static class UnitTestXmlConfigurationParser extends XmlConfigurationParser - { - - public Configuration parseFile(String filename, CacheMode mode) - { - String finalFileName = filename == null ? DEFAULT_CONFIGURATION_FILE : filename; - return parseStream(new FileLookup().lookupFile(finalFileName), mode); - } - - public Configuration parseStream(InputStream stream, CacheMode mode) - { - // loop through all elements in XML. - if (stream == null) throw new ConfigurationException("Input stream for configuration xml is null!"); - - Element root = XmlConfigHelper.getDocumentRoot(stream); - XmlConfigurationParser parser = new UnitTestXmlConfigurationParser(); - Configuration conf = parser.parseElement(root); - - Element list = (Element) root.getElementsByTagNameNS("*","protocol_stacks").item(0); - NodeList stacks = list.getElementsByTagNameNS("*", "stack"); - - for (int i = 0; i < stacks.getLength(); i++) - { - Element stack = (Element) stacks.item(i); - String stackName = stack.getAttribute("name"); - if (stackName.startsWith(JGROUPS_CHANNEL)) - { - Element jgroupsStack = (Element) stack.getElementsByTagNameNS("*", "config").item(0); - if (!mode.isSynchronous() && !stackName.contains("-")) - { - conf.setClusterConfig(jgroupsStack); - conf.setCacheMode(CacheMode.REPL_ASYNC); - break; - } - else if (mode.isSynchronous() && stackName.contains("-")) - { - conf.setClusterConfig(jgroupsStack); - conf.setCacheMode(CacheMode.REPL_SYNC); - break; - } - } - } - - // either way, set mode in the config!! - conf.setCacheMode(mode); - return conf; - } - } -} Copied: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java (from rev 7417, core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java) =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java (rev 0) +++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -0,0 +1,244 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.cache.factories; + +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.Configuration.CacheMode; +import org.jboss.cache.config.ConfigurationException; +import org.jboss.cache.config.parsing.XmlConfigHelper; +import org.jboss.cache.config.parsing.XmlConfigurationParser; +import org.jboss.cache.transaction.TransactionSetup; +import org.jboss.cache.util.FileLookup; +import org.jgroups.conf.XmlConfigurator; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import java.io.InputStream; +import java.net.URL; +import java.util.Properties; + +import org.jgroups.conf.ConfiguratorFactory; + +/** + * Cache configuration factory used by unit tests. + */ +public class UnitTestConfigurationFactory +{ + public static final String JGROUPS_CHANNEL; + public static final String JGROUPS_STACK_TYPE = "jgroups.stack"; + public static final String DEFAULT_CONFIGURATION_FILE = "unit-test-cache-service.xml"; + + static + { + JGROUPS_CHANNEL = System.getProperty(JGROUPS_STACK_TYPE, "tcp"); + System.out.println("IN USE JGROUPS_CHANNEL = " + JGROUPS_CHANNEL); + } + + public static Configuration createConfiguration(CacheMode mode) throws ConfigurationException + { + return createConfiguration(mode, false, false); + } + + public static Configuration createConfiguration(CacheMode mode, boolean useEviction) throws ConfigurationException + { + return createConfiguration(mode, useEviction, false); + } + + public static Configuration createConfiguration(CacheMode mode, boolean useEviction, boolean usePassivation) throws ConfigurationException + { + return createConfiguration(mode, useEviction, usePassivation, false); + } + + public static Configuration createConfiguration(CacheMode mode, boolean useEviction, boolean usePassivation, boolean killable) throws ConfigurationException + { + UnitTestXmlConfigurationParser parser = new UnitTestXmlConfigurationParser(); + Configuration c = parser.parseFile(DEFAULT_CONFIGURATION_FILE, mode); + + if (!useEviction) + { + c.setEvictionConfig(null); + } + + if (!usePassivation) + { + c.setCacheLoaderConfig(null); + } + + c.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup()); + + if (mode != CacheMode.LOCAL && killable) + { + String clusterConfig = c.getClusterConfig(); + c.setClusterConfig(injectDiscard(clusterConfig, 0, 0)); + } + + return c; + } + + public static CacheLoaderConfig buildSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, + String properties, boolean async, boolean fetchPersistentState, + boolean shared, boolean purgeOnStartup, boolean ignoreModifications) throws Exception + { + CacheLoaderConfig clc = new CacheLoaderConfig(); + IndividualCacheLoaderConfig iclc = new IndividualCacheLoaderConfig(); + iclc.setClassName(cacheloaderClass); + iclc.setAsync(async); + iclc.setFetchPersistentState(fetchPersistentState); + iclc.setPurgeOnStartup(purgeOnStartup); + iclc.setIgnoreModifications(ignoreModifications); + iclc.setProperties(properties); + clc.addIndividualCacheLoaderConfig(iclc); + clc.setPassivation(passivation); + clc.setShared(shared); + clc.setPreload(preload); + return clc; + } + public static CacheLoaderConfig buildSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, + Properties properties, boolean async, boolean fetchPersistentState, + boolean shared, boolean purgeOnStartup, boolean ignoreModifications) throws Exception + { + CacheLoaderConfig clc = new CacheLoaderConfig(); + IndividualCacheLoaderConfig iclc = new IndividualCacheLoaderConfig(); + iclc.setClassName(cacheloaderClass); + iclc.setAsync(async); + iclc.setFetchPersistentState(fetchPersistentState); + iclc.setPurgeOnStartup(purgeOnStartup); + iclc.setIgnoreModifications(ignoreModifications); + iclc.setProperties(properties); + clc.addIndividualCacheLoaderConfig(iclc); + clc.setPassivation(passivation); + clc.setShared(shared); + clc.setPreload(preload); + return clc; + } + + public static CacheLoaderConfig.IndividualCacheLoaderConfig buildIndividualCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean purgeOnStartup, boolean ignoreModifications) throws Exception + { + return buildSingleCacheLoaderConfig(false, preload, cacheloaderClass, properties, async, fetchPersistentState, false, purgeOnStartup, ignoreModifications).getFirstCacheLoaderConfig(); + } + + /** + * Helper method that takes a <b>JGroups</b> configuration file and creates an old-style JGroups config {@link String} that can be used + * in {@link org.jboss.cache.config.Configuration#setClusterConfig(String)}. Note that expressions + * in the file - such as <tt>${jgroups.udp.mcast_port:45588}</tt> are expanded out accordingly. + * + * @param properties config properties + * @return a String + */ + public static String getClusterConfigFromProperties(String properties) + { + try + { + XmlConfigurator conf = XmlConfigurator.getInstance(ConfiguratorFactory.getConfigStream(properties)); + String tmp = conf.getProtocolStackString(); + // parse this string for ${} substitutions + // Highly crappy approach!! + tmp = tmp.replace("${jgroups.udp.mcast_addr:228.10.10.10}", "228.10.10.10"); + tmp = tmp.replace("${jgroups.udp.mcast_port:45588}", "45588"); + tmp = tmp.replace("${jgroups.udp.ip_ttl:2}", "2"); + return tmp; + } + catch (Exception e) + { + throw new RuntimeException("Problems with properties " + properties, e); + } + } + + /** + * Takes a JGroups configuration "old-style" String and injects the "DELAY" protcol. + * + * @param jgroupsConfigString JGroups config string + * @param incomingDelay incoming delay + * @param outgoingDelay outgoing delay + * @return new string + */ + public static String injectDelay(String jgroupsConfigString, int incomingDelay, int outgoingDelay) + { + String delay = ":DELAY(in_delay=" + incomingDelay + ";out_delay=" + outgoingDelay + ")"; + return jgroupsConfigString.substring(0, jgroupsConfigString.indexOf(":")) + delay + jgroupsConfigString.substring(jgroupsConfigString.indexOf(":")); + } + + /** + * Takes a JGroups configuration "old-style" String and injects the "DISCARD" protcol. + * + * @param jgroupsConfigString JGroups config string + * @param up factor of incoming messages to discard. 0 is none, 1 is all. + * @param down factor of outgoing messages to discard. 0 is none, 1 is all. + * @return new string + */ + public static String injectDiscard(String jgroupsConfigString, double up, double down) + { + String delay = ":DISCARD(up=" + up + ";down=" + down + ")"; + return jgroupsConfigString.substring(0, jgroupsConfigString.indexOf(":")) + delay + jgroupsConfigString.substring(jgroupsConfigString.indexOf(":")); + } + + /** + * This will make sure that cluster config is according {@link #JGROUPS_STACK_TYPE}, even for local caches. + * This is to avoid the following scenario: if you build a Configuration through new Configuration() then clusterCOnfig + * is set to default value, which might be UDP. + * + */ + public static Configuration getEmptyConfiguration() + { + Configuration tmp = createConfiguration(CacheMode.REPL_SYNC); + Configuration conf = new Configuration(); + conf.setClusterConfig(tmp.getClusterConfig()); + assert conf.getClusterConfig() != null; + return conf; + } + + private static class UnitTestXmlConfigurationParser extends XmlConfigurationParser + { + + public Configuration parseFile(String filename, CacheMode mode) + { + String finalFileName = filename == null ? DEFAULT_CONFIGURATION_FILE : filename; + return parseStream(new FileLookup().lookupFile(finalFileName), mode); + } + + public Configuration parseStream(InputStream stream, CacheMode mode) + { + // loop through all elements in XML. + if (stream == null) throw new ConfigurationException("Input stream for configuration xml is null!"); + + Element root = XmlConfigHelper.getDocumentRoot(stream); + XmlConfigurationParser parser = new UnitTestXmlConfigurationParser(); + Configuration conf = parser.parseElement(root); + + Element list = (Element) root.getElementsByTagNameNS("*","protocol_stacks").item(0); + NodeList stacks = list.getElementsByTagNameNS("*", "stack"); + + for (int i = 0; i < stacks.getLength(); i++) + { + Element stack = (Element) stacks.item(i); + String stackName = stack.getAttribute("name"); + if (stackName.startsWith(JGROUPS_CHANNEL)) + { + Element jgroupsStack = (Element) stack.getElementsByTagNameNS("*", "config").item(0); + if (!mode.isSynchronous() && !stackName.contains("-")) + { + conf.setClusterConfig(jgroupsStack); + conf.setCacheMode(CacheMode.REPL_ASYNC); + break; + } + else if (mode.isSynchronous() && stackName.contains("-")) + { + conf.setClusterConfig(jgroupsStack); + conf.setCacheMode(CacheMode.REPL_SYNC); + break; + } + } + } + + // either way, set mode in the config!! + conf.setCacheMode(mode); + return conf; + } + } +} Property changes on: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestConfigurationFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestXmlConfigurationParser.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestXmlConfigurationParser.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestXmlConfigurationParser.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -21,7 +21,7 @@ */ class UnitTestXmlConfigurationParser { - private static Log log = LogFactory.getLog(UnitTestCacheConfigurationFactory.class); + private static Log log = LogFactory.getLog(UnitTestConfigurationFactory.class); public static final String DEFAULT_CONFIGURATION_FILE = "unit-test-cache-service.xml"; public static final String JGROUPS_CHANNEL; public static final String JGROUPS_STACK_TYPE = "jgroups.stack"; Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/CacheLoaderInvalidationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invalidation/CacheLoaderInvalidationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/invalidation/CacheLoaderInvalidationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -14,7 +14,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; @@ -157,7 +157,7 @@ static CacheLoaderConfig getCacheLoaderConfig(Class requestor) throws Exception { - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", + return UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader", "bin=" + requestor , false, false, false, false, false); } Modified: core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -22,7 +22,7 @@ package org.jboss.cache.jmx; import org.testng.annotations.*; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Cache; @@ -61,7 +61,7 @@ public void testRegisterLocalCache() throws Exception { - Configuration localConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL); + Configuration localConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL); localConfig.setExposeManagementStatistics(true); Cache cache = cacheFactory.createCache(localConfig, getClass()); JmxRegistrationManager regManager = new JmxRegistrationManager(mBeanServer, cache, (ObjectName)null); @@ -76,7 +76,7 @@ public void testRegisterReplicatedCache() throws Exception { - Configuration localConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); + Configuration localConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); localConfig.setExposeManagementStatistics(true); Cache cache = cacheFactory.createCache(localConfig, getClass()); JmxRegistrationManager regManager = new JmxRegistrationManager(mBeanServer, cache, (ObjectName)null); @@ -95,7 +95,7 @@ @Test(enabled = false) public static void main(String[] args) { - Configuration localConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); + Configuration localConfig = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); localConfig.setExposeManagementStatistics(true); CacheFactory cacheFactory = new DefaultCacheFactory(); Cache cache = cacheFactory.createCache(localConfig); Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,6 +1,5 @@ package org.jboss.cache.jmx.deprecated; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.jmx.CacheJmxWrapper; @@ -9,7 +8,7 @@ import org.jboss.cache.config.CacheLoaderConfig; 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.loader.CacheLoader; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; @@ -291,7 +290,7 @@ protected Configuration createConfiguration(String clusterName) throws Exception { - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration config = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); config.setCacheMode(Configuration.CacheMode.REPL_SYNC); config.setCacheLoaderConfig(getCacheLoaderConfig("location=" + getTempDir())); config.setExposeManagementStatistics(true); @@ -322,7 +321,7 @@ protected static CacheLoaderConfig getCacheLoaderConfig(String properties) throws Exception { - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", + return UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.FileCacheLoader", properties, false, false, true, false, false); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.marshall.NodeData; import org.jboss.cache.statetransfer.DefaultStateTransferManager; import org.jboss.cache.util.UnitTestDatabaseManager; @@ -215,7 +215,7 @@ prop.setProperty("cache.jdbc.table.primarykey", (tablePkPrefix + 1)); CacheLoaderConfig.IndividualCacheLoaderConfig base = - UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), + UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), prop, false, true, false, false, false).getFirstCacheLoaderConfig(); JDBCCacheLoader jdbcCacheLoader = new JDBCCacheLoader(); jdbcCacheLoader.setConfig(base); @@ -226,7 +226,7 @@ private JDBCCacheLoaderOld getOldLoader(Properties prop) throws Exception { CacheLoaderConfig.IndividualCacheLoaderConfig base = - UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", + UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", prop, false, true, false, false, false).getFirstCacheLoaderConfig(); JDBCCacheLoaderOld jdbcCacheLoader = new JDBCCacheLoaderOld(); jdbcCacheLoader.setConfig(base); Modified: core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -18,7 +18,7 @@ import java.util.Collections; import java.util.HashMap; import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; @Test(groups = "functional", sequential = true, testName = "loader.AsyncFileCacheLoaderTest") @@ -35,7 +35,7 @@ { cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(false, getClass()); cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL); - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory .buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", props, true, false, true, false, false)); cache.create(); cache.start(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,7 +2,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.Test; @@ -24,7 +24,7 @@ String tmpDir = TestingUtil.TEST_FILES; String tmpCLLoc = tmpDir + "/JBossCache-BdbjeCacheLoaderTest"; - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + tmpCLLoc, false, true, false, false, false)); TestingUtil.recursiveFileRemove(tmpCLLoc); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -7,7 +7,7 @@ package org.jboss.cache.loader; import org.jboss.cache.CacheSPI; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.testng.annotations.Test; import org.testng.annotations.BeforeTest; @@ -31,6 +31,6 @@ protected void configureCache(CacheSPI cache) throws Exception { - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false, false, false)); + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false, false, false)); } } Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.parsing.XmlConfigHelper; import org.jboss.cache.config.parsing.element.LoadersElementParser; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import static org.testng.AssertJUnit.*; import org.testng.annotations.Test; import org.w3c.dom.Element; @@ -113,7 +113,7 @@ public void testSingleCacheLoaderFromXml() throws Exception { // without async - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), false, false, false, false, false); CacheLoaderManager mgr = new CacheLoaderManager(); @@ -123,7 +123,7 @@ assertEquals(FileCacheLoader.class, cl.getClass()); // with async - clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", + clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), true, false, false, false, false); mgr.setConfig(clc, null, null); @@ -133,9 +133,9 @@ public void testSingleCacheLoaderPassivationFromXml() throws Exception { - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), false, false, false, false, false); - CacheLoaderConfig bdbjeCl = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + getTempDir(), false, false, false, false, false); - CacheLoaderConfig jdbCl = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.JDBCCacheLoader", "location=" + getTempDir(), false, false, false, false, false); + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), false, false, false, false, false); + CacheLoaderConfig bdbjeCl = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + getTempDir(), false, false, false, false, false); + CacheLoaderConfig jdbCl = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.JDBCCacheLoader", "location=" + getTempDir(), false, false, false, false, false); clc.getIndividualCacheLoaderConfigs().add(bdbjeCl.getFirstCacheLoaderConfig()); clc.getIndividualCacheLoaderConfigs().add(jdbCl.getFirstCacheLoaderConfig()); CacheLoaderManager mgr = new CacheLoaderManager(); @@ -143,9 +143,9 @@ CacheLoader cl = mgr.getCacheLoader(); assertEquals(FileCacheLoader.class, cl.getClass()); - clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), true, false, false, false, false); - bdbjeCl = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + getTempDir(), true, false, false, false, false); - jdbCl = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.JDBCCacheLoader", "location=" + getTempDir(), true, false, false, false, false); + clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + getTempDir(), true, false, false, false, false); + bdbjeCl = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "location=" + getTempDir(), true, false, false, false, false); + jdbCl = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(true, "", "org.jboss.cache.loader.JDBCCacheLoader", "location=" + getTempDir(), true, false, false, false, false); clc.getIndividualCacheLoaderConfigs().add(bdbjeCl.getFirstCacheLoaderConfig()); clc.getIndividualCacheLoaderConfigs().add(jdbCl.getFirstCacheLoaderConfig()); @@ -189,9 +189,9 @@ public void testChainingCacheLoaderFromXml() throws Exception { - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", "a=b", false, false, false, false, false); - clc.addIndividualCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildIndividualCacheLoaderConfig("", + clc.addIndividualCacheLoaderConfig(UnitTestConfigurationFactory.buildIndividualCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", "cache.jdbc.driver=com.mysql.jdbc.Driver\ncache.jdbc.url=jdbc:mysql://localhost/test\ncache.jdbc.user=user\ncache.jdbc.password=pwd", false, false, false, false)); CacheLoaderManager mgr = new CacheLoaderManager(); mgr.setConfig(clc, null, null); @@ -205,9 +205,9 @@ assertEquals(JDBCCacheLoader.class, loaders.get(1).getClass()); // async = true - clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", + clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", "a=b", false, false, false, false, false); - clc.addIndividualCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildIndividualCacheLoaderConfig("", + clc.addIndividualCacheLoaderConfig(UnitTestConfigurationFactory.buildIndividualCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", "cache.jdbc.driver=com.mysql.jdbc.Driver\ncache.jdbc.url=jdbc:mysql://localhost/test\ncache.jdbc.user=user\ncache.jdbc.password=pwd", true, false, false, false)); mgr = new CacheLoaderManager(); mgr.setConfig(clc, null, null); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -9,7 +9,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.loader.testloaders.DummyCountingCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; @@ -34,7 +34,7 @@ if (cache != null) tearDown(); cache = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(false, getClass()); cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyCountingCacheLoader.class.getName(), + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyCountingCacheLoader.class.getName(), "", false, false, false, false, false)); cache.start(); dummyLoader = (DummyCountingCacheLoader) cache.getCacheLoaderManager().getCacheLoader(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -11,7 +11,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.parsing.XmlConfigHelper; @@ -48,7 +48,7 @@ Configuration c = cache.getConfiguration(); String s = "bin=" + getClass().getName(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), s, false, false, false, false, false)); cache.start(); @@ -73,7 +73,7 @@ cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(false, getClass()); Configuration c = cache.getConfiguration(); String s = "bin=" + getClass().getName(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), s, false, false, false, true, false)); cache.start(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -11,7 +11,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.commands.write.PutKeyValueCommand; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; @@ -45,12 +45,12 @@ public void setUp() throws Exception { cache1 = new UnitTestCacheFactory<Object, Object>().createCache(false, getClass()); - cache1.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), + cache1.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "debug=true", false, true, false, false, false)); cache1.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); cache2 = new UnitTestCacheFactory<Object, Object>().createCache(false, getClass()); - cache2.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), + cache2.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "debug=true", false, true, false, false, false)); cache2.getConfiguration().setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithRollbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithRollbackTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithRollbackTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.cache.util.TestingUtil; @@ -21,7 +21,7 @@ public Cache<String, String> init(boolean passivation) throws Exception { - CacheLoaderConfig cacheLoaderConfig = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(passivation, "", DummyInMemoryCacheLoader.class.getName(), "", false, true, false, false, false); + CacheLoaderConfig cacheLoaderConfig = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(passivation, "", DummyInMemoryCacheLoader.class.getName(), "", false, true, false, false, false); Configuration cfg = new Configuration(); cfg.setCacheLoaderConfig(cacheLoaderConfig); cfg.getRuntimeConfig().setTransactionManager(new DummyTransactionManager()); @@ -69,4 +69,10 @@ TestingUtil.killCaches(cache); } } + + public static void main(String[] args) + { + NullPointerException pointerException = new NullPointerException(); + System.out.println(pointerException); + } } Modified: core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -12,7 +12,7 @@ import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; @@ -66,8 +66,8 @@ protected CacheLoaderConfig getCacheLoaderConfig(boolean ignoreMods1, boolean ignoreMods2) throws Exception { - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, null, DummyInMemoryCacheLoader.class.getName(), "", false, true, false, false, ignoreMods1); - CacheLoaderConfig.IndividualCacheLoaderConfig ic = UnitTestCacheConfigurationFactory.buildIndividualCacheLoaderConfig(null, DummyInMemoryCacheLoader.class.getName(), "", false, false, false, ignoreMods2); + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, null, DummyInMemoryCacheLoader.class.getName(), "", false, true, false, false, ignoreMods1); + CacheLoaderConfig.IndividualCacheLoaderConfig ic = UnitTestConfigurationFactory.buildIndividualCacheLoaderConfig(null, DummyInMemoryCacheLoader.class.getName(), "", false, false, false, ignoreMods2); clc.addIndividualCacheLoaderConfig(ic); return clc; } Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -9,14 +9,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.*; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.lock.TimeoutException; 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 java.util.ArrayList; @@ -53,9 +51,9 @@ c1.setCacheMode(Configuration.CacheMode.REPL_SYNC); c2.setCacheMode(Configuration.CacheMode.REPL_SYNC); - c1.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.ClusteredCacheLoader", + c1.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=5000", false, false, false, false, false)); - c2.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.ClusteredCacheLoader", + c2.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.ClusteredCacheLoader", "timeout=5000", false, false, false, false, false)); c1.setUseRegionBasedMarshalling(useRegionBasedMarshalling); Modified: core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.util.TestingUtil; @@ -36,7 +36,7 @@ @BeforeTest public void setUp() throws Exception { - CacheLoaderConfig cacheLoaderConfig = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), + CacheLoaderConfig cacheLoaderConfig = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, false, false, false, false); Configuration cfg = new Configuration(); cfg.setCacheLoaderConfig(cacheLoaderConfig); Modified: core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -9,7 +9,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.UnitTestDatabaseManager; @@ -52,7 +52,7 @@ props.put("cache.jdbc.datasource", JNDI_NAME); props.put("cache.jdbc.table.create", true); props.put("cache.jdbc.table.drop", true); - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", props, false, false, false, false, false); + return UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", props, false, false, false, false, false); } /** Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,7 +2,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; @@ -18,7 +18,7 @@ { // use the shared variation of the DIMCL so that state is persisted in a static variable in memory rather than an // instance one. - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), "debug=true \n bin=" + getClass().getName(), false, true, false, false, false); cache.getConfiguration().setCacheLoaderConfig(clc); cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -3,7 +3,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.testng.annotations.Test; @@ -22,7 +22,7 @@ // use the shared variation of the DIMCL so that state is persisted in a static variable in memory rather than an // instance one. String bin = "DummyInMemoryCacheLoader-" + Thread.currentThread().getName(); - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), "bin=" + bin, false, true, false, false, false); cache.getConfiguration().setCacheLoaderConfig(clc); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,7 +2,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.Test; @@ -23,7 +23,7 @@ protected void configureCache(CacheSPI cache) throws Exception { - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.FileCacheLoader", "location=" + tmpCLLoc, false, true, false, false, false)); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.UnitTestDatabaseManager; import org.testng.annotations.AfterMethod; @@ -28,7 +28,7 @@ { props = UnitTestDatabaseManager.getTestDbProperties(); cache = new UnitTestCacheFactory<Object, Object>().createCache(false, getClass()); - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), props, false, false, true, false, false)); + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), props, false, false, true, false, false)); cache.start(); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -27,7 +27,7 @@ import org.jboss.cache.config.CacheLoaderConfig; 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.transaction.GenericTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.UnitTestDatabaseManager; @@ -80,7 +80,7 @@ { Configuration c = new Configuration(); c.setTransactionManagerLookupClass(GenericTransactionManagerLookup.class.getName()); - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "/", JDBCCacheLoader.class.getName(), props, false, true, false, false, false); + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "/", JDBCCacheLoader.class.getName(), props, false, true, false, false, false); clc.setPassivation(false); clc.getFirstCacheLoaderConfig().setPurgeOnStartup(true); c.setCacheLoaderConfig(clc); Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -8,7 +8,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.UnitTestDatabaseManager; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; @@ -61,7 +61,7 @@ protected void configureCache(CacheSPI cache) throws Exception { String props = props2String(this.props); - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), props, false, true, false, false, false)); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoader2Test.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoader2Test.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoader2Test.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,7 +1,7 @@ package org.jboss.cache.loader; import org.jboss.cache.CacheSPI; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; @@ -18,7 +18,7 @@ protected void configureCache(CacheSPI cache) throws Exception { String tmpCLLoc = TestingUtil.TEST_FILES + "/JdbmCacheLoader2Test"; - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.jdbm.JdbmCacheLoader2", + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.jdbm.JdbmCacheLoader2", "location=" + tmpCLLoc, false, true, false, false, false)); TestingUtil.recursiveFileRemove(tmpCLLoc); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,7 +1,7 @@ package org.jboss.cache.loader; import org.jboss.cache.CacheSPI; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; @@ -17,7 +17,7 @@ protected void configureCache(CacheSPI cache) throws Exception { String tmpCLLoc = TestingUtil.TEST_FILES + "/JdbmCacheLoaderTest"; - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.jdbm.JdbmCacheLoader", + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.jdbm.JdbmCacheLoader", "location=" + tmpCLLoc, false, true, false, false, false)); TestingUtil.recursiveFileRemove(tmpCLLoc); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -6,7 +6,7 @@ import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; 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.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -27,9 +27,9 @@ public void testPreload() throws Exception { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL); String props = "bin=" + getClass().getName(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "/a", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "/a", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone(), getClass()); cache.put(fqn, key, value); @@ -43,9 +43,9 @@ public void testPreloadMultiRegions() throws Exception { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL); String props = "bin=" + getClass().getName(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "/a", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "/a", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone(), getClass()); cache.put(fqn, key, value); @@ -53,17 +53,17 @@ cache.destroy(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "/c,/a,/b", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "/c,/a,/b", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone(), getClass()); assertExists(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "/c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "/c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone(), getClass()); assertExists(); - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, " /c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, " /c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone(), getClass()); assertExists(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/RootChildrenLoadedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/RootChildrenLoadedTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/RootChildrenLoadedTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterTest; @@ -22,7 +22,7 @@ @BeforeTest public void setUp() throws Exception { - CacheLoaderConfig cacheLoaderConfig = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, true, false, false, false); + CacheLoaderConfig cacheLoaderConfig = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, true, false, false, false); // assign the cache loader explicitly so it will stick between restarts cacheLoaderConfig.getFirstCacheLoaderConfig().setCacheLoader(new DummyInMemoryCacheLoader()); Configuration cfg = new Configuration(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.testng.annotations.Test; import org.testng.annotations.AfterClass; @@ -59,7 +59,7 @@ "cache.s3.accessKeyId=" + accessKey + "\n" + "cache.s3.secretAccessKey=" + System.getProperty("secretKey") + "\n"; } - CacheLoaderConfig config = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.s3.S3CacheLoader", + CacheLoaderConfig config = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.s3.S3CacheLoader", properties, false, true, false, false, false); Properties p = config.getFirstCacheLoaderConfig().getProperties(); assertNotNull(p.get("cache.s3.accessKeyId")); Modified: core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -9,7 +9,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.loader.testloaders.DummyCountingCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.interceptors.CacheStoreInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; @@ -45,9 +45,9 @@ c1.setCacheMode("REPL_SYNC"); c2.setCacheMode("REPL_SYNC"); - c1.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyCountingCacheLoader.class.getName(), + c1.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyCountingCacheLoader.class.getName(), "", false, false, true, false, false)); - c2.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyCountingCacheLoader.class.getName(), + c2.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyCountingCacheLoader.class.getName(), "", false, false, true, false, false)); cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c1, false, getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -13,7 +13,7 @@ import org.jboss.cache.config.CacheLoaderConfig; 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.util.internals.ViewChangeListener; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; @@ -47,9 +47,9 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); - cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); - cache3 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + cache3 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache1.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); cache2.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); @@ -281,7 +281,7 @@ protected CacheLoaderConfig getSingletonStoreCacheLoaderConfig(String cacheloaderClass) throws Exception { - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, null, cacheloaderClass, "", false, false, false, false, false); + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, null, cacheloaderClass, "", false, false, false, false, false); CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig sc = new CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig(); sc.setSingletonStoreEnabled(true); sc.setProperties("pushStateWhenCoordinator = true\n pushStateWhenCoordinatorTimeout = 5000\n"); Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.interceptors.OrderedSynchronizationHandler; import org.jboss.cache.loader.tcp.TcpCacheServer; import org.jboss.cache.notifications.annotation.CacheListener; @@ -64,7 +64,7 @@ cacheServer = new TcpCacheServer(); cacheServer.setBindAddress(TCP_CACHE_SERVER_HOST); cacheServer.setPort(TCP_CACHE_SERVER_PORT); - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); // disable eviction!! config.setEvictionConfig(null); CacheSPI cache = (CacheSPI) new DefaultCacheFactory<Object, Object>().createCache(config); Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,8 +5,8 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; +import org.jboss.cache.factories.UnitTestConfigurationFactory; +import static org.jboss.cache.factories.UnitTestConfigurationFactory.buildSingleCacheLoaderConfig; import org.jboss.cache.jmx.CacheJmxWrapper; import org.jboss.cache.loader.tcp.TcpCacheServer; import org.jboss.cache.util.TestingUtil; @@ -117,7 +117,7 @@ public void testInjectConfigFilePath() throws Exception { createTcpCacheServer(); - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); CacheSPI cacheSPI = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(conf, getClass()); cache_server.setCache(cacheSPI); startTcpCacheServer(); @@ -129,7 +129,7 @@ public void testInjectCache() throws Exception { createTcpCacheServer(); - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); CacheSPI cacheSPI = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(conf, getClass()); cache_server.setCache(cacheSPI); startTcpCacheServer(); @@ -141,7 +141,7 @@ public void testInjectCacheJmxWrapper() throws Exception { createTcpCacheServer(); - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); CacheSPI cacheSPI = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(conf, getClass()); CacheJmxWrapper wrapper = new CacheJmxWrapper<Object, Object>(cacheSPI); wrapper.start(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -7,7 +7,6 @@ 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.RollbackException; @@ -18,7 +17,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.AbstractMultipleCachesTest; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.config.Configuration; /** @@ -38,7 +37,7 @@ c1.setCacheMode("repl_sync"); c1.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup()); c1.setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); - c1.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), + c1.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, false, false, false, false)); cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c1, false, getClass()); @@ -49,7 +48,7 @@ c2.setCacheMode("repl_sync"); c2.setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); c2.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup()); - c2.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), + c2.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), "", false, false, false, false, false)); c2.setLockAcquisitionTimeout(2000); // cache2.setReplQueueInterval(3000); Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.Fqn; 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.loader.testloaders.DummyInMemoryCacheLoader; import org.jboss.cache.transaction.DummyTransactionManager; import org.testng.annotations.AfterMethod; @@ -121,7 +121,7 @@ //m_contextFactory = System.getProperty(Context.INITIAL_CONTEXT_FACTORY); System.setProperty(Context.INITIAL_CONTEXT_FACTORY, CONTEXT_FACTORY); - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); c.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c, false, getClass()); } @@ -159,7 +159,7 @@ cache.getConfiguration().setCacheMode(cacheMode); if (cacheLoaderClass != null) { - cache.getConfiguration().setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", cacheLoaderClass, + cache.getConfiguration().setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", cacheLoaderClass, "", false, false, false, false, false)); } cache.getConfiguration().setLockAcquisitionTimeout(600000); Modified: core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -26,7 +26,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; @@ -154,7 +154,7 @@ throw new IllegalStateException(cacheID + " already created"); } - CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache.getConfiguration().setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); cache.create(); Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -17,7 +17,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.marshall.data.Address; import org.jboss.cache.marshall.data.Person; import org.jboss.cache.util.TestingUtil; @@ -71,7 +71,7 @@ private CacheSPI<Object, Object> createCache(String name) { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); c.setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); c.setClusterName(name + "-" + Thread.currentThread().getName()); // Use marshaller Modified: core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -7,7 +7,7 @@ import org.jboss.cache.commands.write.PutKeyValueCommand; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener; import org.testng.annotations.AfterMethod; @@ -35,7 +35,7 @@ @BeforeMethod public void setUp() throws CloneNotSupportedException { - c1 = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_ASYNC), false, getClass()); + c1 = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_ASYNC), false, getClass()); c1.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); String jgroupsCfg = c1.getConfiguration().getClusterConfig(); Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.interceptors.MarshalledValueInterceptor; import org.jboss.cache.interceptors.base.CommandInterceptor; import org.jboss.cache.invocation.CacheInvocationDelegate; @@ -49,7 +49,7 @@ @BeforeMethod public void setUp() throws CloneNotSupportedException { - cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, false), false, getClass()); + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, false), false, getClass()); if (cache1.getConfiguration().getBuddyReplicationConfig() != null) cache1.getConfiguration().setBuddyReplicationConfig(null); cache1.getConfiguration().setUseLazyDeserialization(true); @@ -259,8 +259,8 @@ public void testCacheLoaders() throws CloneNotSupportedException { tearDown(); - cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC), false, getClass()); - cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC), false, getClass()); + cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC), false, getClass()); + cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC), false, getClass()); CacheLoaderConfig clc = new CacheLoaderConfig(); CacheLoaderConfig.IndividualCacheLoaderConfig iclc = new CacheLoaderConfig.IndividualCacheLoaderConfig(); Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -14,7 +14,7 @@ import org.jboss.cache.Region; 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.marshall.data.Address; import org.jboss.cache.marshall.data.Person; import org.jboss.cache.util.TestingUtil; @@ -73,7 +73,7 @@ private CacheSPI<Object, Object> createCache(String name) { - CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); + CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass()); cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); cache.getConfiguration().setClusterName(name + "-" + Thread.currentThread().getName()); // Use marshaller Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.UnitTestCacheFactory; 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.interceptors.InvalidationInterceptor; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; @@ -148,7 +148,7 @@ private CacheSPI<Object, Object> createCache(String clusterName) { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.INVALIDATION_SYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.INVALIDATION_SYNC); c.setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC); c.setExposeManagementStatistics(true); c.setClusterName(clusterName); Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; +import static org.jboss.cache.factories.UnitTestConfigurationFactory.buildSingleCacheLoaderConfig; import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; import org.testng.annotations.AfterMethod; Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,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.interceptors.TxInterceptor; import static org.testng.AssertJUnit.*; import org.testng.annotations.BeforeMethod; @@ -210,7 +210,7 @@ private CacheSPI<Object, Object> createCache(String clusterName) { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); c.setUseRegionBasedMarshalling(false); c.setCacheMode(Configuration.CacheMode.REPL_SYNC); c.setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -3,9 +3,8 @@ import org.jboss.cache.Cache; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; -import org.jgroups.JChannel; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -29,9 +28,8 @@ public void setUp() throws Exception { muxHelper = new MultiplexerTestHelper(); - Configuration config = new Configuration(); + Configuration config = UnitTestConfigurationFactory.getEmptyConfiguration(); config.setCacheMode(Configuration.CacheMode.REPL_SYNC); - config.setClusterConfig(UnitTestCacheConfigurationFactory.getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK)); cache = new UnitTestCacheFactory<Object, Object>().createCache(config, false, getClass()); cacheStarted = false; } Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,10 +4,12 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.RuntimeConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jgroups.Channel; import org.jgroups.JChannel; +import org.jgroups.conf.XmlConfigurator; +import org.jgroups.conf.ConfiguratorFactory; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -31,9 +33,8 @@ public void setUp() throws Exception { muxHelper = new MultiplexerTestHelper(); - Configuration config = new Configuration(); + Configuration config = UnitTestConfigurationFactory.getEmptyConfiguration(); config.setCacheMode(Configuration.CacheMode.REPL_SYNC); - config.setClusterConfig(UnitTestCacheConfigurationFactory.getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK)); cache = new UnitTestCacheFactory<Object, Object>().createCache(config, false, getClass()); cacheStarted = false; } @@ -64,7 +65,7 @@ muxHelper.configureCacheForMux(cache); Channel channel = new JChannel(new UnitTestCacheFactory().mangleClusterConfigurationUdp( - UnitTestCacheConfigurationFactory.getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK))); + getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK))); RuntimeConfig rtcfg = cache.getConfiguration().getRuntimeConfig(); rtcfg.setChannel(channel); @@ -104,4 +105,32 @@ } } + + + /** + * Helper method that takes a <b>JGroups</b> configuration file and creates an old-style JGroups config {@link String} that can be used + * in {@link org.jboss.cache.config.Configuration#setClusterConfig(String)}. Note that expressions + * in the file - such as <tt>${jgroups.udp.mcast_port:45588}</tt> are expanded out accordingly. + * + * @param properties config properties + * @return a String + */ + public static String getClusterConfigFromProperties(String properties) + { + try + { + XmlConfigurator conf = XmlConfigurator.getInstance(ConfiguratorFactory.getConfigStream(properties)); + String tmp = conf.getProtocolStackString(); + // parse this string for ${} substitutions + // Highly crappy approach!! + tmp = tmp.replace("${jgroups.udp.mcast_addr:228.10.10.10}", "228.10.10.10"); + tmp = tmp.replace("${jgroups.udp.mcast_port:45588}", "45588"); + tmp = tmp.replace("${jgroups.udp.ip_ttl:2}", "2"); + return tmp; + } + catch (Exception e) + { + throw new RuntimeException("Problems with properties " + properties, e); + } + } } Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerTestHelper.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -35,7 +35,7 @@ import java.util.Set; import java.util.StringTokenizer; import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; /** * Utility class that can associate a cache with a multiplexer-enabled @@ -88,7 +88,7 @@ private String getChannelProperties(Cache cache) { String props = cache.getConfiguration().getClusterConfig(); - return (props == null ? UnitTestCacheConfigurationFactory.getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK) : props); + return (props == null ? UnitTestConfigurationFactory.getEmptyConfiguration().getClusterConfig() : props); } /** Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; import org.jboss.cache.notifications.annotation.*; import org.jboss.cache.notifications.event.Event; @@ -51,7 +51,7 @@ conf2.setSyncRollbackPhase(true); conf1.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); conf2.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); - conf1.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), (Properties) null, false, false, false, false, false)); + conf1.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummyInMemoryCacheLoader.class.getName(), (Properties) null, false, false, false, false, false)); cache1 = instance.createCache(conf1, false, getClass()); cache2 = instance.createCache(conf2, false, getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,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.notifications.event.Event; import static org.jboss.cache.notifications.event.Event.Type.NODE_INVALIDATED; import org.jboss.cache.notifications.event.EventImpl; @@ -24,7 +24,7 @@ Cache<String, String> c1 = null, c2 = null; try { - Configuration cfg = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.INVALIDATION_SYNC, false); + Configuration cfg = UnitTestConfigurationFactory.createConfiguration(CacheMode.INVALIDATION_SYNC, false); cfg.setNodeLockingScheme(NodeLockingScheme.MVCC); c1 = new UnitTestCacheFactory<String, String>().createCache(cfg.clone(), getClass()); c2 = new UnitTestCacheFactory<String, String>().createCache(cfg.clone(), getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.commands.WriteCommand; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.interceptors.CacheMgmtInterceptor; import org.jboss.cache.interceptors.CallInterceptor; import org.jboss.cache.interceptors.NotificationInterceptor; @@ -60,7 +60,7 @@ protected CacheSPI<Object, Object> createCacheUnstarted(boolean optimistic) throws Exception { - CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL), false, getClass()); + CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL), false, getClass()); if (optimistic) cache.getConfiguration().setNodeLockingScheme("OPTIMISTIC"); return cache; } @@ -103,7 +103,7 @@ { props = "bin = " + getClass().getName(); } - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, props, false, (!shared), shared, false, false); + return UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, props, false, (!shared), shared, false, false); } protected CacheSPI<Object, Object> createCacheWithLoader(boolean passivationEnabled) throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -8,7 +8,7 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.config.CacheLoaderConfig; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; +import static org.jboss.cache.factories.UnitTestConfigurationFactory.buildSingleCacheLoaderConfig; import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.transaction.DummyTransactionManager; import static org.testng.AssertJUnit.assertEquals; Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,11 +1,11 @@ package org.jboss.cache.passivation; import org.testng.annotations.Test; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.*; +import static org.jboss.cache.factories.UnitTestConfigurationFactory.*; import java.io.File; import java.io.FileFilter; -import org.jboss.cache.CacheSPI; + import org.jboss.cache.util.TestingUtil; /** Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -1,8 +1,7 @@ package org.jboss.cache.passivation; -import org.jboss.cache.CacheSPI; import org.jboss.cache.util.TestingUtil; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; +import static org.jboss.cache.factories.UnitTestConfigurationFactory.buildSingleCacheLoaderConfig; import org.testng.annotations.Test; /** Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -8,7 +8,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.CacheLoaderConfig; -import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig; +import static org.jboss.cache.factories.UnitTestConfigurationFactory.buildSingleCacheLoaderConfig; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.UnitTestDatabaseManager; import org.testng.annotations.AfterMethod; Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -28,7 +28,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.loader.testloaders.DummySharedInMemoryCacheLoader; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; @@ -171,7 +171,7 @@ } c.setCacheMode(CacheMode.REPL_SYNC); c.setNodeLockingScheme(nls); - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", DummySharedInMemoryCacheLoader.class.getName(), "bin=" + name, false, true, false, false, false); clc.setPassivation(true); c.setCacheLoaderConfig(clc); Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -34,7 +34,7 @@ import org.jboss.cache.config.EvictionConfig; import org.jboss.cache.config.EvictionRegionConfig; import org.jboss.cache.eviction.LRUAlgorithmConfig; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.loader.testloaders.DummyInMemoryCacheLoader; import org.jboss.cache.loader.testloaders.DummySharedInMemoryCacheLoader; import org.jboss.cache.notifications.annotation.CacheListener; @@ -89,7 +89,7 @@ Configuration getCfg() throws Exception { - Configuration cfg = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); + Configuration cfg = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); cfg.setEvictionConfig(buildEvictionConfig()); cfg.setCacheLoaderConfig(buildCacheLoaderConfig()); cfg.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); Modified: core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -5,7 +5,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.parsing.JGroupsStackParser; import org.jboss.cache.config.parsing.XmlConfigHelper; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; @@ -22,7 +22,7 @@ @BeforeTest public void setUp() { - Configuration cfg = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); + Configuration cfg = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC); cache = new UnitTestCacheFactory<Object, Object>().createCache(cfg, false, getClass()); } Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -6,7 +6,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.util.Caches; import org.jboss.cache.util.Caches.HashKeySelector; @@ -50,7 +50,7 @@ @BeforeTest public void setUp() { - Configuration cfg = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL); + Configuration cfg = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL); cfg.setNodeLockingScheme(NodeLockingScheme.MVCC); cfg.setConcurrencyLevel(500); cache = new UnitTestCacheFactory<String, String>().createCache(cfg, false, getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -12,7 +12,7 @@ import org.jboss.cache.CacheSPI; 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.util.internals.replicationlisteners.ReplicationListener; import static org.testng.AssertJUnit.*; @@ -56,7 +56,7 @@ private CacheSPI<Object, Object> createCache(String name) throws Exception { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); c.setClusterName(name); CacheSPI<Object, Object> cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c, false, getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -4,7 +4,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.TimeoutException; import org.jboss.cache.transaction.DummyTransactionManagerLookup; import org.jboss.cache.util.TestingUtil; @@ -59,8 +59,8 @@ { cache1.getConfiguration().setSyncReplTimeout(1); // 1ms. this is *bound* to fail. cache2.getConfiguration().setSyncReplTimeout(1); - String s = UnitTestCacheConfigurationFactory.getClusterConfigFromFile(cache1.getConfiguration().getDefaultClusterConfig()); - String newCfg = UnitTestCacheConfigurationFactory.injectDelay(s, 100, 100); + String s = UnitTestConfigurationFactory.getEmptyConfiguration().getClusterConfig(); + String newCfg = UnitTestConfigurationFactory.injectDelay(s, 100, 100); cache1.getConfiguration().setClusterConfig(newCfg); cache2.getConfiguration().setClusterConfig(newCfg); Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -13,7 +13,7 @@ import org.jboss.cache.NodeSPI; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.invocation.CacheInvocationDelegate; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; @@ -33,8 +33,8 @@ public void setUp() { Cache<Object, Object>[] caches = new Cache[2]; - caches[0] = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), getClass()); - caches[1] = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), getClass()); + caches[0] = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), getClass()); + caches[1] = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), getClass()); cachesTL.set(caches); TestingUtil.blockUntilViewsReceived(caches, 5000); } Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -27,7 +27,7 @@ import org.jboss.cache.Version; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.factories.annotations.NonVolatile; import org.jboss.cache.lock.TimeoutException; import org.jboss.cache.remoting.jgroups.ChannelMessageListener; @@ -54,7 +54,7 @@ public void testFailedStateTransfer() throws Exception { Map<String, Cache> caches = cachesTL.get(); - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); //c.setClusterName("VersionedTestBase"); c.setReplVersionString(getReplicationVersion()); // Use a long timeout to facilitate setting debugger breakpoints @@ -74,7 +74,7 @@ cache.start(); - c= UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); + c= UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_ASYNC); //c.setClusterName("VersionedTestBase"); c.setReplVersionString(getReplicationVersion()); // Use a long timeout to facilitate setting debugger breakpoints Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -19,7 +19,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.marshall.InactiveRegionException; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.EvictionController; @@ -470,14 +470,14 @@ { Map<String, Cache> caches = cachesTL.get(); - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); additionalConfiguration(c); Cache<Object, Object> cache1 = new UnitTestCacheFactory<Object, Object>().createCache(c, getClass()); caches.put("evict1", cache1); cache1.put(Fqn.fromString("/a/b/c"), "key", "value"); - c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); + c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); additionalConfiguration(c); Cache<Object, Object> cache2 = new UnitTestCacheFactory<Object, Object>().createCache(c, getClass()); caches.put("evict2", cache2); @@ -500,7 +500,7 @@ */ public void testEvictionAfterStateTransfer() throws Exception { - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); additionalConfiguration(c); Cache<Object, Object> cache1 = new UnitTestCacheFactory<Object, Object>().createCache(c, getClass()); Map<String, Cache> caches = cachesTL.get(); @@ -524,7 +524,7 @@ int childrenSize = cache1.getRoot().getChild(Fqn.fromString("/org/jboss/data")).getChildren().size(); assert childrenSize == 5000 : "Expected 5000, saw " + childrenSize; - c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); + c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC, true); additionalConfiguration(c); final Cache<Object, Object> cache2 = new UnitTestCacheFactory<Object, Object>().createCache(c, getClass()); caches.put("evict2", cache2); Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -31,7 +31,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.loader.CacheLoader; import org.jboss.cache.marshall.SelectedClassnameClassLoader; import org.jboss.cache.util.TestingUtil; @@ -129,7 +129,7 @@ } CacheMode mode = sync ? CacheMode.REPL_SYNC : CacheMode.REPL_ASYNC; - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(mode); + Configuration c = UnitTestConfigurationFactory.createConfiguration(mode); if (sync) { @@ -235,7 +235,7 @@ + prop.getProperty("cache.jdbc.node.type") + "\n" + "cache.jdbc.table.name=" + prop.getProperty("cache.jdbc.table.name"); - CacheLoaderConfig clc = UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", + CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false, false, false); clc.getFirstCacheLoaderConfig().setPurgeOnStartup(true); c.setCacheLoaderConfig(clc); @@ -253,7 +253,7 @@ tmp_location = escapeWindowsPath(tmp_location); String props = "location = " + tmp_location + "\n"; - c.setCacheLoaderConfig(UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", cacheloaderClass, + c.setCacheLoaderConfig(UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, "", cacheloaderClass, props, async, fetchPersistentState, false, false, false)); } } Modified: core/trunk/src/test/java/org/jboss/cache/testng/Base.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/testng/Base.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/testng/Base.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -3,9 +3,8 @@ import org.testng.annotations.*; import org.jboss.cache.Cache; import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.config.*; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; /** * @author Mircea.Markus(a)jboss.com @@ -19,7 +18,7 @@ public void beforeTest() { // System.out.println("Base.beforeTest"); - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, true); cache = new UnitTestCacheFactory().createCache(config, true, getClass()); System.out.println("Base:::" + cache.getConfiguration().getClusterConfig()); } Modified: core/trunk/src/test/java/org/jboss/cache/testng/Other.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/testng/Other.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/testng/Other.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -6,7 +6,7 @@ import org.jboss.cache.Cache; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; /** * @author Mircea.Markus(a)jboss.com @@ -20,7 +20,7 @@ public void beforeTest() { // System.out.println("Base.beforeTest"); - Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, true); + Configuration config = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, true); cache = new UnitTestCacheFactory().createCache(config, true, getClass()); System.out.println("Other:::" + cache.getConfiguration().getClusterConfig()); } Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -3,14 +3,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.CacheException; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.TimeoutException; -import org.jboss.cache.util.CachePrinter; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.fail; @@ -52,7 +50,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); UnitTestCacheFactory<Object, Integer> instance = new UnitTestCacheFactory<Object, Integer>(); cache = (CacheSPI<Object, Integer>) instance.createCache(conf, false, getClass()); cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZABLE); Modified: core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.commands.tx.PrepareCommand; import static org.jboss.cache.config.Configuration.CacheMode.REPL_SYNC; import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jgroups.Address; import org.jgroups.Channel; @@ -46,7 +46,7 @@ @BeforeMethod public void setUp() throws CloneNotSupportedException { - c1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(REPL_SYNC), getClass()); + c1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(REPL_SYNC), getClass()); } @AfterMethod Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -2,11 +2,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; 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 static org.testng.AssertJUnit.fail; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -104,7 +103,7 @@ exception = null; UnitTestCacheFactory<Boolean, Boolean> instance = new UnitTestCacheFactory<Boolean, Boolean>(); // setup and start the source cache - Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + Configuration c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); c.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup()); c.setCacheMode(Configuration.CacheMode.REPL_SYNC); c.setSyncCommitPhase(true); @@ -114,7 +113,7 @@ srcCache.start(); // setup and start the destination cache - c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); + c = UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC); c.setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); c.setCacheMode(Configuration.CacheMode.REPL_SYNC); c.setSyncCommitPhase(true); Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -10,7 +10,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.commands.write.PutKeyValueCommand; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.interceptors.OrderedSynchronizationHandler; import org.jboss.cache.transaction.DummyTransactionManager; import org.jboss.cache.transaction.NotifyingTransactionManager; @@ -18,7 +18,6 @@ import org.jboss.cache.transaction.TransactionContext; import org.jboss.cache.util.TestingUtil; import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener; -import org.jgroups.JChannel; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -57,7 +56,7 @@ private CacheSPI initCache(boolean notifying) throws Exception { - Configuration conf = UnitTestCacheConfigurationFactory.getEmptyConfiguration(); + Configuration conf = UnitTestConfigurationFactory.getEmptyConfiguration(); conf.setCacheMode("REPL_SYNC"); conf.setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); conf.setFetchInMemoryState(false); Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2009-01-09 09:03:32 UTC (rev 7421) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2009-01-09 09:21:18 UTC (rev 7422) @@ -13,7 +13,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.transaction.TransactionSetup; import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.lock.IsolationLevel; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.fail; @@ -50,7 +50,7 @@ private void createCache(IsolationLevel level) { - Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); + Configuration conf = UnitTestConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); conf.setCacheMode(Configuration.CacheMode.LOCAL); conf.setIsolationLevel(level); conf.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup());