[jbosscache-commits] JBoss Cache SVN: r7092 - in core/trunk: src/main/java/org/jboss/cache/eviction and 54 other directories.

Author: mircea.markus Date: 2008-11-06 20:07:10 -0500 (Thu, 06 Nov 2008) New Revision: 7092 Added: core/trunk/src/test/java/org/jboss/cache/TestClass.java core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java Modified: core/trunk/pom.xml core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithmConfig.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java core/trunk/src/test/java/org/jboss/cache/CallbackTest.java core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java core/trunk/src/test/java/org/jboss/cache/DataContainerTest.java core/trunk/src/test/java/org/jboss/cache/FqnTest.java core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java core/trunk/src/test/java/org/jboss/cache/TreeNodeTest.java core/trunk/src/test/java/org/jboss/cache/VersionConversionTest.java core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.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/DestroyedCacheAPITest.java core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java core/trunk/src/test/java/org/jboss/cache/api/NodeSPITest.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/batch/BatchWithoutTM.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/BuddyReplicationConcurrencyTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/CacheSPIMVCCTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/ForceWriteLockTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/PersistingTransientStateTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheAPIMVCCTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/DeletedChildResurrectionMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeAPIMVCCTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeMoveMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeReplicatedMoveMvccTest.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/read_committed/ReadCommittedLockParentTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferConcurrencyTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplTxMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheAPIMVCCTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/DeletedChildResurrectionMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeAPIMVCCTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeMoveMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeReplicatedMoveMvccTest.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/RepeatableReadLockParentTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferConcurrencyTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplTxMvccTest.java core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalMvccNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedMvccNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheAPIOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheSPIOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/DeletedChildResurrectionOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeAPIOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeMoveOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeReplicatedMoveOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplTxOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationAsyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationSyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplAsyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplSyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationAsyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationSyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplAsyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplSyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationAsyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationSyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplAsyncTest.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplSyncTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyAssignmentStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyBackupActivationInactivationTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyGroupAssignmentTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationContentTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationRejoinTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithPassivationTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithTransactionsTest.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/GravitationCleanupTest.java core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.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/commands/legacy/read/GravitateDataCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/ClearDataCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/CreateNodeCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/PutKeyValueCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveKeyCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveNodeCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/read/ExistsCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/read/GetChildrenNamesCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/read/GetDataMapCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeyValueCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeysCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java core/trunk/src/test/java/org/jboss/cache/commands/write/InvalidateCommandTest.java core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java core/trunk/src/test/java/org/jboss/cache/config/EvictionRegionConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.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/ElementSizeAlgorithmTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LFUQueueTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/LRUQueueTest.java core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/MRUQueueTest.java core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.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/RegionManagerTest.java core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java core/trunk/src/test/java/org/jboss/cache/eviction/legacy/BackwardCompatibilityTest.java core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/factories/LifeCycleTest.java core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java core/trunk/src/test/java/org/jboss/cache/jmx/ResourceDMBeanTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/InterceptorRegistrationTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LifecycleNotificationTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.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/BdbjeTest.java core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.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/CacheLoaderTestsBase.java core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.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/FileCacheLoaderConfigTest.java core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizationTest.java core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConfigTest.java core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.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/JdbmCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.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/UnnecessaryLoadingTest.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/lock/IdentityLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/LockMapTest.java core/trunk/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java core/trunk/src/test/java/org/jboss/cache/lock/LockTest.java core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerNoTxTest.java core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockWithUpgradeTest.java core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreference2Readers1WriterLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreferenceReadWriteLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/StripedLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/UpgradeLockTest.java core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java core/trunk/src/test/java/org/jboss/cache/manager/CacheManagerTest.java core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Test.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller300Test.java core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.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/MethodIdPreservationTest.java core/trunk/src/test/java/org/jboss/cache/marshall/RedeploymentEmulationTest.java core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshallingTestBase.java core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.java core/trunk/src/test/java/org/jboss/cache/marshall/ReplicateToInactiveRegionTest.java core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java core/trunk/src/test/java/org/jboss/cache/marshall/SimpleArrayReplTest.java core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java core/trunk/src/test/java/org/jboss/cache/marshall/UnmarshalledReferencesTest.java core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/CacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtCoreTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java core/trunk/src/test/java/org/jboss/cache/mgmt/PassivationTest.java core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/PessimisticSyncReplTxTest.java core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java core/trunk/src/test/java/org/jboss/cache/notifications/AsyncNotificationTest.java core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java core/trunk/src/test/java/org/jboss/cache/notifications/NotifierTest.java core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/PersistingTransientStateTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java core/trunk/src/test/java/org/jboss/cache/options/PessimisticLockAcquisitionTimeoutTest.java core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationOptLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplOptLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplPessLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationOptLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationPessLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplOptLocksTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplPessLocksTest.java core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToDummyInMemoryCacheLoaderTest.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/PassivationToLocalDelegatingCacheLoaderTest.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/ConstructionTest.java core/trunk/src/test/java/org/jboss/cache/profiling/MemConsumptionTest.java core/trunk/src/test/java/org/jboss/cache/profiling/MemoryFootprintTest.java core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.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/PessimisticSyncReplTxTest.java core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.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/ForcedStateTransferTest.java core/trunk/src/test/java/org/jboss/cache/statetransfer/PersistingTransientStateTest.java core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferCompatibilityTest.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/statetransfer/StateTransferUnderLoadTest.java core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/IsolationLevelNoneTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java core/trunk/src/test/java/org/jboss/cache/util/MinMapUtilTest.java core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java Log: parallelizing tests Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/pom.xml 2008-11-07 01:07:10 UTC (rev 7092) @@ -124,25 +124,25 @@ </dependencies> <build> - <plugins> + <plugins> <!-- ensure parallel test execution --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> <version>2.4.3-JBOSS</version> - <configuration> - <parallel>methods</parallel> + <configuration> + <parallel>tests</parallel> <threadCount>10</threadCount> <forkMode>none</forkMode> - <trimStackTrace>false</trimStackTrace> - <properties> - <property> - <name>listener</name> - <value>org.jboss.cache.util.UnitTestTestNGListener</value> - </property> + <trimStackTrace>false</trimStackTrace> + <properties> + <property> + <name>listener</name> + <value>org.jboss.cache.util.UnitTestTestNGListener</value> + </property> </properties> </configuration> - </plugin> + </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-1</version> @@ -430,11 +430,11 @@ </profile> <profile> - <id>test-integration</id> - <properties> - <defaultTestGroup>integration</defaultTestGroup> - </properties> - </profile> + <id>test-integration</id> + <properties> + <defaultTestGroup>integration</defaultTestGroup> + </properties> + </profile> <profile> Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithmConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithmConfig.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithmConfig.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -68,7 +68,7 @@ this.maxAge = maxAge; } - public LRUAlgorithmConfig(long timeToLive, int maxAge, int maxNodes) + public LRUAlgorithmConfig(long timeToLive, long maxAge, int maxNodes) { this(timeToLive, maxAge); this.maxNodes = maxNodes; Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -303,10 +303,6 @@ n = helper.wrapNodeForWriting(ctx, fqn, true, true, true, false, false); n.setDataLoaded(false); } - else - { - this.cacheMisses++; - } if (nodeData != null && n != null) { setNodeState(ctx, fqn, n, nodeData); Modified: core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -482,8 +482,7 @@ * Internal version of store(String,Object,Object) that allows passing a * transaction. */ - private Object doPut(Transaction txn, Fqn name, Object key, Object value) - throws Exception + private Object doPut(Transaction txn, Fqn name, Object key, Object value) throws Exception { Object oldVal = null; Modified: core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/CacheFactoryTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "CacheFactoryTest") public class CacheFactoryTest { Configuration expected; Modified: core/trunk/src/test/java/org/jboss/cache/CallbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "CallbackTest") public class CallbackTest { CacheSPI<Object, Object> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -13,7 +13,7 @@ * * @author xenephon */ -@Test(groups = "unit") +@Test(groups = "unit", testName = "ComparatorTest") public class ComparatorTest { FqnComparator comp = new FqnComparator(); Modified: core/trunk/src/test/java/org/jboss/cache/DataContainerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/DataContainerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/DataContainerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,281 +1,281 @@ -package org.jboss.cache; - -import org.jboss.cache.buddyreplication.BuddyFqnTransformer; -import org.jboss.cache.marshall.NodeData; -import org.jboss.cache.mock.MockNodesFixture; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; -import org.testng.annotations.AfterMethod; - -/** - * Tests functionality from DataContainer. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class DataContainerTest -{ - private DataContainerImpl container; - private MockNodesFixture nodes; - - //end of node structure. - - @BeforeMethod - public void setUp() - { - nodes = new MockNodesFixture(); - container = new DataContainerImpl(); - container.setRoot(nodes.root); - container.setBuddyFqnTransformer(new BuddyFqnTransformer()); - } - - @AfterMethod - public void tearDown() - { - container = null; - nodes = null; - } - /** - * tests {@link DataContainerImpl#peek(Fqn, boolean, boolean)} method - */ - public void testPeekNodesSimple() - { - assert nodes.root == container.peek(Fqn.ROOT, true, true); - assert nodes.adfgNode == container.peek(nodes.adfg, false, false); - assert nodes.adfgNode == container.peek(nodes.adfg, false, true); - assert nodes.adfgNode == container.peek(nodes.adfg, true, true); - } - - /** - * tests {@link DataContainerImpl#peek(Fqn, boolean, boolean)} for invalid nodes. - */ - public void testPeekInvalidNodes() - { - nodes.adfgNode.setValid(false, false); - assert null == container.peek(nodes.adfg, true, false); - assert nodes.adfgNode == container.peek(nodes.adfg, true, true); - } - - /** - * tests {@link DataContainerImpl#peek(Fqn, boolean, boolean)} method for deleted nodes. - */ - public void testPeekDeletedNodes() - { - nodes.adfgNode.markAsDeleted(true); - assert null == container.peek(nodes.adfg, false, false); - assert nodes.adfgNode == container.peek(nodes.adfg, true, false); - } - - /** - * tests {@link DataContainerImpl#exists(Fqn)} - */ - public void testsExists() - { - assert container.exists(nodes.ab) : "ab exists"; - nodes.abNode.markAsDeleted(true); - assert !container.exists(nodes.ab) : "ab marked as deleted"; - assert container.exists(nodes.ad); - nodes.adNode.setValid(false, false); - assert !container.exists(nodes.ade) : "its parent was marked as invalid"; - } - - /** - * tests {@link DataContainerImpl#hasChildren(Fqn)} - */ - public void testHasChildren() - { - assert container.hasChildren(nodes.ad) : " ade is a child of ad"; - assert !container.hasChildren(nodes.notExistent) : " this one does not exist"; - assert !container.hasChildren(nodes.adfg) : "this one exists but does not have children"; - nodes.adNode.setValid(false, false); - assert !container.hasChildren(nodes.ad) : "ad exists and has children but is invalid"; - } - - /** - * test {@link DataContainer#buildNodeData(java.util.List} - */ - public void testBuildNodeData() - { - nodes.abNode.put("ab", "ab"); - nodes.abcNode.put("abc", "abc"); - List<NodeData> result = new ArrayList<NodeData>(); - container.buildNodeData(result, nodes.abNode, true); - assert result.size() == 2; - assert result.contains(new NodeData(nodes.ab, nodes.abNode.getData(), true)); - assert result.contains(new NodeData(nodes.abc, nodes.abcNode.getData(), true)); - } - - /** - * tests {@link DataContainerImpl#getNodesForEviction(Fqn, boolean)} in a nonrecursive scenario. - */ - public void testGetNodesForEvictionNonrecursive() - { - //check for root first - List<Fqn> result = container.getNodesForEviction(Fqn.ROOT, false); - assert result.size() == 1 : "for root the direct children are considered for eviction"; - assert result.contains(nodes.a); - - //check normal - result = container.getNodesForEviction(nodes.ad, false); - assert result.size() == 1 : "one child expected"; - assert result.contains(nodes.ad); - - //check resident scenario - nodes.adNode.setResident(true); - result = container.getNodesForEviction(nodes.ad, false); - assert result.size() == 0 : "no children expected"; - } - - /** - * tests {@link DataContainerImpl#getNodesForEviction(Fqn, boolean)} in a recursive scenario. - */ - public void testGetNodesForEvictionRecursive() - { - //check for root first - List<Fqn> result = container.getNodesForEviction(Fqn.ROOT, true); - assert result.size() == 8 : "all children are considered for eviction"; - - //check normal - result = container.getNodesForEviction(nodes.ad, true); - assert result.size() == 5 : "five childrens expected"; - assert result.contains(nodes.ad); - assert result.contains(nodes.ade); - assert result.contains(nodes.adf); - assert result.contains(nodes.adfh); - assert result.contains(nodes.adfg); - - //check resident scenario - nodes.adNode.setResident(true); - result = container.getNodesForEviction(nodes.ad, true); - assert result.size() == 4 : "only children expected"; - assert result.contains(nodes.ade); - assert result.contains(nodes.adf); - assert result.contains(nodes.adfh); - assert result.contains(nodes.adfg); - } - - /** - * tests {@link DataContainerImpl#getNodesForEviction(Fqn, boolean)} in a recursive scenario. - */ - public void testGetNodesForEvictionRecursiveNullNodes() - { - container.removeFromDataStructure(nodes.ad, true); - //check for root first - List<Fqn> result = container.getNodesForEviction(Fqn.ROOT, true); - assert result.size() == 3 : "all children are considered for eviction"; - - //check normal - // this node does not exist!! Should NOT throw a NPE. - result = container.getNodesForEviction(nodes.ad, true); - assert result.isEmpty() : "Should be empty"; - } - - - /** - * tests {@link DataContainerImpl#getNumberOfNodes()} - */ - public void testGetNumberOfNodes() - { - assert container.getNumberOfNodes() == 8 : "eoght nodes expected"; - } - - /** - * tests {@link DataContainerImpl#removeFromDataStructure(Fqn, boolean)} having skipMarkerCheck set to false. - */ - public void removeFromDataStructureNoSkip1() - { - //check inexisten node - assert !container.removeFromDataStructure(nodes.notExistent, false); - - //check root - all the subnodes should be deleted and marked as invalid, but the root itself - nodes.root.markAsDeleted(true); - assert container.removeFromDataStructure(Fqn.ROOT, false); - assert !nodes.aNode.isValid(); - assert !nodes.abNode.isValid(); - assert !nodes.abcNode.isValid(); - assert !nodes.adNode.isValid(); - assert !nodes.adeNode.isValid(); - assert !nodes.adfNode.isValid(); - assert !nodes.adfgNode.isValid(); - assert !nodes.adfhNode.isValid(); - assert nodes.root.isValid(); - } - - /** - * tests {@link DataContainerImpl#removeFromDataStructure(Fqn, boolean)} having skipMarkerCheck set to false. - */ - public void removeFromDataStructureNoSkip2() - { - //check root - all the subnodes should be deleted and marked as invalid, but the root itself - nodes.root.markAsDeleted(false); - assert !container.removeFromDataStructure(Fqn.ROOT, false); - - //check a normal node - nodes.adNode.markAsDeleted(true); - assert container.removeFromDataStructure(nodes.ad, false); - assert !nodes.adeNode.isValid(); - assert !nodes.adfNode.isValid(); - assert !nodes.adfhNode.isValid(); - assert !nodes.adfhNode.isValid(); - } - - /** - * tests {@link DataContainerImpl#removeFromDataStructure(Fqn, boolean)} having skipMarkerCheck set to true. - */ - public void removeFromDataStructureWithSkip() - { - //check inexisten node - assert !container.removeFromDataStructure(nodes.notExistent, false); - - //check root - all the subnodes should be deleted and marked as invalid, but the root itself - assert container.removeFromDataStructure(Fqn.ROOT, true); - assert !nodes.aNode.isValid(); - assert !nodes.abNode.isValid(); - assert !nodes.abcNode.isValid(); - assert !nodes.adNode.isValid(); - assert !nodes.adeNode.isValid(); - assert !nodes.adfNode.isValid(); - assert !nodes.adfgNode.isValid(); - assert !nodes.adfhNode.isValid(); - assert nodes.root.isValid(); - } - - /** - * tests {@link DataContainerImpl#evict(Fqn)} - */ - public void testEvict() - { - //tests eviction of leaf nodes - assert container.evict(nodes.abc); - assert !nodes.abcNode.isValid(); - assert !nodes.abNode.hasChild("c"); - - //test eviction of intermediate nodes - nodes.adNode.put("key", "value"); - assert !container.evict(nodes.ad); - assert nodes.adNode.isValid(); - assert nodes.adNode.getData().isEmpty(); - assert nodes.aNode.hasChild("d"); - assert nodes.adNode.hasChild("e"); - } - - /** - * test {@link DataContainerImpl#createNodes(Fqn)} - */ - public void testCreateNodes() - { - Object[] objects = container.createNodes(Fqn.fromString("/a/x/y/z")); - List result = (List) objects[0]; - assert result.size() == 3; - assert ((NodeSPI) result.get(0)).getFqn().equals(Fqn.fromString("/a/x")); - assert ((NodeSPI) result.get(1)).getFqn().equals(Fqn.fromString("/a/x/y")); - assert ((NodeSPI) result.get(2)).getFqn().equals(Fqn.fromString("/a/x/y/z")); - NodeSPI target = (NodeSPI) objects[1]; - assert target != null; - assert target.getFqn().toString().equals("/a/x/y/z"); - } -} +package org.jboss.cache; + +import org.jboss.cache.buddyreplication.BuddyFqnTransformer; +import org.jboss.cache.marshall.NodeData; +import org.jboss.cache.mock.MockNodesFixture; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; +import org.testng.annotations.AfterMethod; + +/** + * Tests functionality from DataContainer. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "DataContainerTest") +public class DataContainerTest +{ + private DataContainerImpl container; + private MockNodesFixture nodes; + + //end of node structure. + + @BeforeMethod + public void setUp() + { + nodes = new MockNodesFixture(); + container = new DataContainerImpl(); + container.setRoot(nodes.root); + container.setBuddyFqnTransformer(new BuddyFqnTransformer()); + } + + @AfterMethod + public void tearDown() + { + container = null; + nodes = null; + } + /** + * tests {@link DataContainerImpl#peek(Fqn, boolean, boolean)} method + */ + public void testPeekNodesSimple() + { + assert nodes.root == container.peek(Fqn.ROOT, true, true); + assert nodes.adfgNode == container.peek(nodes.adfg, false, false); + assert nodes.adfgNode == container.peek(nodes.adfg, false, true); + assert nodes.adfgNode == container.peek(nodes.adfg, true, true); + } + + /** + * tests {@link DataContainerImpl#peek(Fqn, boolean, boolean)} for invalid nodes. + */ + public void testPeekInvalidNodes() + { + nodes.adfgNode.setValid(false, false); + assert null == container.peek(nodes.adfg, true, false); + assert nodes.adfgNode == container.peek(nodes.adfg, true, true); + } + + /** + * tests {@link DataContainerImpl#peek(Fqn, boolean, boolean)} method for deleted nodes. + */ + public void testPeekDeletedNodes() + { + nodes.adfgNode.markAsDeleted(true); + assert null == container.peek(nodes.adfg, false, false); + assert nodes.adfgNode == container.peek(nodes.adfg, true, false); + } + + /** + * tests {@link DataContainerImpl#exists(Fqn)} + */ + public void testsExists() + { + assert container.exists(nodes.ab) : "ab exists"; + nodes.abNode.markAsDeleted(true); + assert !container.exists(nodes.ab) : "ab marked as deleted"; + assert container.exists(nodes.ad); + nodes.adNode.setValid(false, false); + assert !container.exists(nodes.ade) : "its parent was marked as invalid"; + } + + /** + * tests {@link DataContainerImpl#hasChildren(Fqn)} + */ + public void testHasChildren() + { + assert container.hasChildren(nodes.ad) : " ade is a child of ad"; + assert !container.hasChildren(nodes.notExistent) : " this one does not exist"; + assert !container.hasChildren(nodes.adfg) : "this one exists but does not have children"; + nodes.adNode.setValid(false, false); + assert !container.hasChildren(nodes.ad) : "ad exists and has children but is invalid"; + } + + /** + * test {@link DataContainer#buildNodeData(java.util.List} + */ + public void testBuildNodeData() + { + nodes.abNode.put("ab", "ab"); + nodes.abcNode.put("abc", "abc"); + List<NodeData> result = new ArrayList<NodeData>(); + container.buildNodeData(result, nodes.abNode, true); + assert result.size() == 2; + assert result.contains(new NodeData(nodes.ab, nodes.abNode.getData(), true)); + assert result.contains(new NodeData(nodes.abc, nodes.abcNode.getData(), true)); + } + + /** + * tests {@link DataContainerImpl#getNodesForEviction(Fqn, boolean)} in a nonrecursive scenario. + */ + public void testGetNodesForEvictionNonrecursive() + { + //check for root first + List<Fqn> result = container.getNodesForEviction(Fqn.ROOT, false); + assert result.size() == 1 : "for root the direct children are considered for eviction"; + assert result.contains(nodes.a); + + //check normal + result = container.getNodesForEviction(nodes.ad, false); + assert result.size() == 1 : "one child expected"; + assert result.contains(nodes.ad); + + //check resident scenario + nodes.adNode.setResident(true); + result = container.getNodesForEviction(nodes.ad, false); + assert result.size() == 0 : "no children expected"; + } + + /** + * tests {@link DataContainerImpl#getNodesForEviction(Fqn, boolean)} in a recursive scenario. + */ + public void testGetNodesForEvictionRecursive() + { + //check for root first + List<Fqn> result = container.getNodesForEviction(Fqn.ROOT, true); + assert result.size() == 8 : "all children are considered for eviction"; + + //check normal + result = container.getNodesForEviction(nodes.ad, true); + assert result.size() == 5 : "five childrens expected"; + assert result.contains(nodes.ad); + assert result.contains(nodes.ade); + assert result.contains(nodes.adf); + assert result.contains(nodes.adfh); + assert result.contains(nodes.adfg); + + //check resident scenario + nodes.adNode.setResident(true); + result = container.getNodesForEviction(nodes.ad, true); + assert result.size() == 4 : "only children expected"; + assert result.contains(nodes.ade); + assert result.contains(nodes.adf); + assert result.contains(nodes.adfh); + assert result.contains(nodes.adfg); + } + + /** + * tests {@link DataContainerImpl#getNodesForEviction(Fqn, boolean)} in a recursive scenario. + */ + public void testGetNodesForEvictionRecursiveNullNodes() + { + container.removeFromDataStructure(nodes.ad, true); + //check for root first + List<Fqn> result = container.getNodesForEviction(Fqn.ROOT, true); + assert result.size() == 3 : "all children are considered for eviction"; + + //check normal + // this node does not exist!! Should NOT throw a NPE. + result = container.getNodesForEviction(nodes.ad, true); + assert result.isEmpty() : "Should be empty"; + } + + + /** + * tests {@link DataContainerImpl#getNumberOfNodes()} + */ + public void testGetNumberOfNodes() + { + assert container.getNumberOfNodes() == 8 : "eoght nodes expected"; + } + + /** + * tests {@link DataContainerImpl#removeFromDataStructure(Fqn, boolean)} having skipMarkerCheck set to false. + */ + public void removeFromDataStructureNoSkip1() + { + //check inexisten node + assert !container.removeFromDataStructure(nodes.notExistent, false); + + //check root - all the subnodes should be deleted and marked as invalid, but the root itself + nodes.root.markAsDeleted(true); + assert container.removeFromDataStructure(Fqn.ROOT, false); + assert !nodes.aNode.isValid(); + assert !nodes.abNode.isValid(); + assert !nodes.abcNode.isValid(); + assert !nodes.adNode.isValid(); + assert !nodes.adeNode.isValid(); + assert !nodes.adfNode.isValid(); + assert !nodes.adfgNode.isValid(); + assert !nodes.adfhNode.isValid(); + assert nodes.root.isValid(); + } + + /** + * tests {@link DataContainerImpl#removeFromDataStructure(Fqn, boolean)} having skipMarkerCheck set to false. + */ + public void removeFromDataStructureNoSkip2() + { + //check root - all the subnodes should be deleted and marked as invalid, but the root itself + nodes.root.markAsDeleted(false); + assert !container.removeFromDataStructure(Fqn.ROOT, false); + + //check a normal node + nodes.adNode.markAsDeleted(true); + assert container.removeFromDataStructure(nodes.ad, false); + assert !nodes.adeNode.isValid(); + assert !nodes.adfNode.isValid(); + assert !nodes.adfhNode.isValid(); + assert !nodes.adfhNode.isValid(); + } + + /** + * tests {@link DataContainerImpl#removeFromDataStructure(Fqn, boolean)} having skipMarkerCheck set to true. + */ + public void removeFromDataStructureWithSkip() + { + //check inexisten node + assert !container.removeFromDataStructure(nodes.notExistent, false); + + //check root - all the subnodes should be deleted and marked as invalid, but the root itself + assert container.removeFromDataStructure(Fqn.ROOT, true); + assert !nodes.aNode.isValid(); + assert !nodes.abNode.isValid(); + assert !nodes.abcNode.isValid(); + assert !nodes.adNode.isValid(); + assert !nodes.adeNode.isValid(); + assert !nodes.adfNode.isValid(); + assert !nodes.adfgNode.isValid(); + assert !nodes.adfhNode.isValid(); + assert nodes.root.isValid(); + } + + /** + * tests {@link DataContainerImpl#evict(Fqn)} + */ + public void testEvict() + { + //tests eviction of leaf nodes + assert container.evict(nodes.abc); + assert !nodes.abcNode.isValid(); + assert !nodes.abNode.hasChild("c"); + + //test eviction of intermediate nodes + nodes.adNode.put("key", "value"); + assert !container.evict(nodes.ad); + assert nodes.adNode.isValid(); + assert nodes.adNode.getData().isEmpty(); + assert nodes.aNode.hasChild("d"); + assert nodes.adNode.hasChild("e"); + } + + /** + * test {@link DataContainerImpl#createNodes(Fqn)} + */ + public void testCreateNodes() + { + Object[] objects = container.createNodes(Fqn.fromString("/a/x/y/z")); + List result = (List) objects[0]; + assert result.size() == 3; + assert ((NodeSPI) result.get(0)).getFqn().equals(Fqn.fromString("/a/x")); + assert ((NodeSPI) result.get(1)).getFqn().equals(Fqn.fromString("/a/x/y")); + assert ((NodeSPI) result.get(2)).getFqn().equals(Fqn.fromString("/a/x/y/z")); + NodeSPI target = (NodeSPI) objects[1]; + assert target != null; + assert target.getFqn().toString().equals("/a/x/y/z"); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * @author <a href="mailto:bela@jboss.org">Bela Ban</a> May 9, 2003 * @version $Revision$ */ -@Test(groups = "unit", sequential = true) +@Test(groups = "unit", sequential = true, testName = "FqnTest") public class FqnTest { private Cache<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "GetKeysTest") public class GetKeysTest { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ public class GlobalTransactionTest { - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testEquality() throws UnknownHostException { IpAddress a1 = new IpAddress("localhost", 4444); @@ -45,7 +45,7 @@ } - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testEqualityWithOtherObject() throws UnknownHostException { IpAddress a1 = new IpAddress("localhost", 4444); @@ -54,7 +54,7 @@ assertFalse(tx1.equals(Thread.currentThread())); } - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testEqualityWithNull() throws UnknownHostException { IpAddress a1 = new IpAddress("localhost", 4444); @@ -63,7 +63,7 @@ assertFalse(tx1.equals(null)); } - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testHashcode() throws UnknownHostException { IpAddress a1 = new IpAddress("localhost", 4444); @@ -87,7 +87,7 @@ assertEquals(hcode_1, hcode_2); } - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testExternalization() throws Exception { IpAddress a1 = new IpAddress("localhost", 4444); @@ -133,7 +133,7 @@ } - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testWithNullAddress() { GlobalTransaction tx1, tx2, tmp_tx1; @@ -146,7 +146,7 @@ assertTrue(tx1.equals(tx2) == false); } - @Test(groups = {"functional"}) + @Test(groups = {"functional"}, testName = "GlobalTransactionTest") public void testOneNullAddress() throws UnknownHostException { GlobalTransaction tx1, tx2; Added: core/trunk/src/test/java/org/jboss/cache/TestClass.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/TestClass.java (rev 0) +++ core/trunk/src/test/java/org/jboss/cache/TestClass.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -0,0 +1,13 @@ +package org.jboss.cache; + +/** + * @author Mircea.Markus(a)jboss.com + */ +public class TestClass +{ + @Property(description = "za_name") + private String name; + + @Property(description = "za_value") + private String value; +} Modified: core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "TreeCacheFunctionalTest") public class TreeCacheFunctionalTest { CacheSPI<Object, Object> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/TreeNodeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/TreeNodeTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/TreeNodeTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "TreeNodeTest") public class TreeNodeTest { CacheSPI<Object, Object> cache; @@ -45,4 +45,4 @@ assertFalse(node.getChildren().isEmpty()); assertTrue(node.getChild(Fqn.fromElements("f")) != null); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/VersionConversionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/VersionConversionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/VersionConversionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "VersionConversionTest") public class VersionConversionTest { public void testStringToShort() Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> */ -@Test(groups = {"functional", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "api.CacheAPITest") public class CacheAPITest { private CacheSPI<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = {"functional", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "api.CacheSPITest") public class CacheSPITest { private CacheSPI<Object, Object> cache1; @@ -111,4 +111,4 @@ assert viewChangeListener.waitForViewChange(60, TimeUnit.SECONDS) : "Should have received a view change!"; assertTrue("Cache2 is coordinator", cache2.getRPCManager().isCoordinator()); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,100 +1,100 @@ -package org.jboss.cache.api; - -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.NodeSPI; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.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.testng.annotations.Test; - -import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; - -/** - * Tests whether, in a single tx, deleting a parent node with an pre-existing - * child and then re-adding a node with the parent Fqn results - * in the pre-existing child remaining in the cache after tx commit. - * - * @author Brian Stansberry - * @since 2.1.0 - */ -@Test(groups = {"functional", "pessimistic"}, sequential = true) -public class DeletedChildResurrectionTest -{ - private CacheSPI<Object, Object> cache; - private static final Fqn A_B = Fqn.fromString("/a/b"); - private static final Fqn A = Fqn.fromString("/a"); - private static final Fqn A_C = Fqn.fromString("/a/c"); - private static final String KEY = "key"; - private static final String VALUE = "value"; - private static final String K2 = "k2"; - private static final String V2 = "v2"; - protected NodeLockingScheme nodeLockingScheme = NodeLockingScheme.PESSIMISTIC; - protected NodeSPI root; - protected TransactionManager txManager; - - @BeforeMethod(alwaysRun = true) - public void setUp() - { - cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true), false); - cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL); - cache.getConfiguration().setCacheLoaderConfig(null); - cache.getConfiguration().setNodeLockingScheme(nodeLockingScheme); - configure(cache.getConfiguration()); - cache.start(); - root = cache.getRoot(); - txManager = cache.getTransactionManager(); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() throws Exception - { - TestingUtil.killCaches(cache); - cache = null; - txManager = null; - root = null; - } - - protected void configure(Configuration c) - { - // to be overridden - } - - public void testDeletedChildResurrection1() throws Exception - { - root.addChild(A_B).put(KEY, VALUE); - cache.put(A, "key", "value"); - txManager.begin(); - root.removeChild(A); - root.addChild(A); - txManager.commit(); - assert !root.hasChild(A_B); - assert null == cache.get(A, "key"); - // do a peek to ensure the node really has been removed and not just marked for removal - assert cache.peek(A_B, true, true) == null; - assert root.hasChild(A); - } - - /** - * Tests whether, in a single tx, deleting a parent node with an pre-existing - * child and then inserting a different child under the parent Fqn results - * in the pre-existing child remaining in the cache after tx commit. - */ - public void testDeletedChildResurrection2() throws Exception - { - root.addChild(A_B).put(KEY, VALUE); - - txManager.begin(); - root.removeChild(A); - root.addChild(A_C).put(K2, V2); - txManager.commit(); - - assert !root.hasChild(A_B); - assert root.hasChild(A_C); - assert V2.equals(root.getChild(A_C).get(K2)); - } -} +package org.jboss.cache.api; + +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.NodeSPI; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.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.testng.annotations.Test; + +import javax.transaction.TransactionManager; +import org.jboss.cache.UnitTestCacheFactory; + +/** + * Tests whether, in a single tx, deleting a parent node with an pre-existing + * child and then re-adding a node with the parent Fqn results + * in the pre-existing child remaining in the cache after tx commit. + * + * @author Brian Stansberry + * @since 2.1.0 + */ +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "api.DeletedChildResurrectionTest") +public class DeletedChildResurrectionTest +{ + private CacheSPI<Object, Object> cache; + private static final Fqn A_B = Fqn.fromString("/a/b"); + private static final Fqn A = Fqn.fromString("/a"); + private static final Fqn A_C = Fqn.fromString("/a/c"); + private static final String KEY = "key"; + private static final String VALUE = "value"; + private static final String K2 = "k2"; + private static final String V2 = "v2"; + protected NodeLockingScheme nodeLockingScheme = NodeLockingScheme.PESSIMISTIC; + protected NodeSPI root; + protected TransactionManager txManager; + + @BeforeMethod(alwaysRun = true) + public void setUp() + { + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true), false); + cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL); + cache.getConfiguration().setCacheLoaderConfig(null); + cache.getConfiguration().setNodeLockingScheme(nodeLockingScheme); + configure(cache.getConfiguration()); + cache.start(); + root = cache.getRoot(); + txManager = cache.getTransactionManager(); + } + + @AfterMethod(alwaysRun = true) + public void tearDown() throws Exception + { + TestingUtil.killCaches(cache); + cache = null; + txManager = null; + root = null; + } + + protected void configure(Configuration c) + { + // to be overridden + } + + public void testDeletedChildResurrection1() throws Exception + { + root.addChild(A_B).put(KEY, VALUE); + cache.put(A, "key", "value"); + txManager.begin(); + root.removeChild(A); + root.addChild(A); + txManager.commit(); + assert !root.hasChild(A_B); + assert null == cache.get(A, "key"); + // do a peek to ensure the node really has been removed and not just marked for removal + assert cache.peek(A_B, true, true) == null; + assert root.hasChild(A); + } + + /** + * Tests whether, in a single tx, deleting a parent node with an pre-existing + * child and then inserting a different child under the parent Fqn results + * in the pre-existing child remaining in the cache after tx commit. + */ + public void testDeletedChildResurrection2() throws Exception + { + root.addChild(A_B).put(KEY, VALUE); + + txManager.begin(); + root.removeChild(A); + root.addChild(A_C).put(K2, V2); + txManager.commit(); + + assert !root.hasChild(A_B); + assert root.hasChild(A_C); + assert V2.equals(root.getChild(A_C).get(K2)); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/api/DestroyedCacheAPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/DestroyedCacheAPITest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/DestroyedCacheAPITest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -26,7 +26,7 @@ * @author Brian Stansberry */ -@Test(groups = {"functional", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "api.DestroyedCacheAPITest") public class DestroyedCacheAPITest { private Cache<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -32,7 +32,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.NodeAPITest") public class NodeAPITest { protected ThreadLocal<CacheSPI<Object, Object>> cacheTL = new ThreadLocal<CacheSPI<Object, Object>>(); Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.NodeMoveAPITest") public class NodeMoveAPITest { protected final Log log = LogFactory.getLog(getClass()); Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; -@Test(groups = {"functional", "jgroups", "pessimistic"}) +@Test(groups = {"functional", "jgroups", "pessimistic"}, testName = "api.NodeReplicatedMoveTest") public class NodeReplicatedMoveTest { private class NodeReplicatedMoveTestTL { Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeSPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeSPITest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeSPITest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ /** * Tests NodeSPI specific APIs. */ -@Test(groups = {"functional", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "api.NodeSPITest") public class NodeSPITest { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/ResidentNodesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,239 +1,239 @@ -package org.jboss.cache.api; - -import org.jboss.cache.Cache; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.config.Configuration; -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.util.internals.EvictionController; -import static org.testng.Assert.*; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; - -/** - * Tester class for Node.isResident functionality. - * - * @author <a href="mailto:mircea.markus@jboss.com">Mircea Markus</a> - * @since 2.1.0 - */ -@Test(groups = {"functional", "pessimistic"}, sequential = true) -public class ResidentNodesTest -{ - private CacheSPI<Object, Object> cache; - private EvictionController evController; - - private final String TEST_NODES_ROOT = "residentNodesTest"; - private Cache[] caches = {}; - - @BeforeMethod(alwaysRun = true) - public void setUp() - { - Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); - cacheConfig.setCacheMode(Configuration.CacheMode.LOCAL); - cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, false); - cache.getConfiguration().getEvictionConfig().setWakeupInterval(1000); - createNewRegion(); - cache.start(); - evController = new EvictionController(cache); - } - - /** - * Setting up a new region for our purposes. - */ - private void createNewRegion() - { - EvictionConfig evConfig = cache.getConfiguration().getEvictionConfig(); - EvictionRegionConfig evRegConfig = new EvictionRegionConfig(); - evRegConfig.setRegionFqn(Fqn.fromString("/" + TEST_NODES_ROOT)); - evRegConfig.setEventQueueSize(100); - LRUAlgorithmConfig lruConfig = new LRUAlgorithmConfig(); - lruConfig.setMaxAge(100000000); - lruConfig.setTimeToLive(100000000); - lruConfig.setMaxNodes(3); - evRegConfig.setEvictionAlgorithmConfig(lruConfig); - evConfig.addEvictionRegionConfig(evRegConfig); - //end setting up region stuff - } - - @AfterMethod(alwaysRun = true) - public void tearDown() throws Exception - { - TestingUtil.killCaches(cache); - if (caches != null) TestingUtil.killCaches(caches); - cache = null; - caches = null; - evController = null; - } - - /** - * Mark some nodes as resident and show that they won't get evicted, - * even if normally scenario they would - */ - public void testHappyFlow() throws InterruptedException - { - cache.put(getSubFqn("/a"), "k_a", "v_a"); - cache.getNode(getSubFqn("/a")).setResident(true); - cache.put(getSubFqn("/b"), "k_b", "v_b"); - cache.getNode(getSubFqn("/b")).setResident(true); - cache.put(getSubFqn("/c"), "k_c", "v_c"); - cache.put(getSubFqn("/d"), "k_d", "v_d"); - cache.put(getSubFqn("/e"), "k_e", "v_e"); - cache.put(getSubFqn("/f"), "k_f", "v_f"); - cache.put(getSubFqn("/g"), "k_g", "v_g"); - cache.put(getSubFqn("/h"), "k_h", "v_h"); - cache.put(getSubFqn("/i"), "k_i", "v_i"); - - evController.startEviction(); - - assertTrue(cache.exists(getSubFqn("/a"))); - assertTrue(cache.exists(getSubFqn("/b"))); - assertFalse(cache.exists(getSubFqn("/c"))); - assertFalse(cache.exists(getSubFqn("/d"))); - assertFalse(cache.exists(getSubFqn("/e"))); - assertFalse(cache.exists(getSubFqn("/f"))); - - //only last three used are not evicted - assertTrue(cache.exists(getSubFqn("/g"))); - assertTrue(cache.exists(getSubFqn("/h"))); - assertTrue(cache.exists(getSubFqn("/i"))); - - } - - public void simpleTest() throws Exception - { - cache.put(getSubFqn("/a"), "k_a", "v_a"); - cache.put(getSubFqn("/b"), "k_b", "v_b"); - cache.put(getSubFqn("/c"), "k_c", "v_c"); - cache.put(getSubFqn("/d"), "k_d", "v_d"); - - evController.startEviction(); - - assertFalse(cache.exists(getSubFqn("/a"))); - assertTrue(cache.exists(getSubFqn("/b"))); - assertTrue(cache.exists(getSubFqn("/c"))); - assertTrue(cache.exists(getSubFqn("/d"))); - } - - /** - * If a node is marked as resident, and a get is made on that given node then an VISITED event would normally be - * added to the eviction queue. In a LRU scenario, this will cause another node to be evicted given that the size of - * the eviction queue is bounded. This test makes sure that this scenario will not hapen. - */ - public void testNoEvictionEventsForResidentNodes() throws InterruptedException - { - cache.put(getSubFqn("/a"), "k_a", "v_a"); - cache.put(getSubFqn("/b"), "k_b", "v_b"); - - cache.getNode(getSubFqn("/a")).setResident(true); - cache.getNode(getSubFqn("/b")).setResident(true); - - cache.put(getSubFqn("/c"), "k_c", "v_c"); - cache.put(getSubFqn("/d"), "k_d", "v_d"); - cache.put(getSubFqn("/e"), "k_e", "v_e"); - cache.put(getSubFqn("/f"), "k_f", "v_f"); - cache.put(getSubFqn("/g"), "k_g", "v_g"); - cache.put(getSubFqn("/h"), "k_h", "v_h"); - - //at this point the oldest nodes are /a and /b so. There are eviction events in the queue corresponding - // to those nodes - cache.getNode(getSubFqn("/a")); - cache.getNode(getSubFqn("/b")); - - evController.startEviction(); - - //a and b should exist as those were marked resident. Also they shouldn't be caunted as nodes in the eviction - // queue - assertTrue(cache.exists(getSubFqn("/a"))); - assertTrue(cache.exists(getSubFqn("/b"))); - - // c, d and e were the first accessed, they should be evicted - assertFalse(cache.exists(getSubFqn("/c"))); - assertFalse(cache.exists(getSubFqn("/d"))); - assertFalse(cache.exists(getSubFqn("/e"))); - - //all of them should be there - even if we re-retrieved a and b at a prev step (cache.get(getSubFqn("/a"))) this - //call shouldn't create an eviction event. - assertTrue(cache.exists(getSubFqn("/f"))); - assertTrue(cache.exists(getSubFqn("/g"))); - assertTrue(cache.exists(getSubFqn("/h"))); - } - - /** - * Check the behavior whilst using optimistic locking. - */ - public void testResidencyAndOptimisticLocking() throws Exception - { - - Configuration config = UnitTestCacheConfigurationFactory.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); - - cache.put(Fqn.fromString("/a/b"), "key", "value"); - TransactionManager txManager = cache.getTransactionManager(); - txManager.begin(); - cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(true); - cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); - assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); - txManager.rollback(); - assertTrue(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); - - txManager.begin(); - cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(false); - cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); - assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); - txManager.commit(); - assertFalse(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); - assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); - - try - { - if (cache.getTransactionManager().getTransaction() != null) - { - cache.getTransactionManager().rollback(); - } - } - finally - { - cache.stop(); - } - } - - public void testResidencyAndPessimisticLocking() throws Exception - { - cache.put(Fqn.fromString("/a/b"), "key", "value"); - TransactionManager txManager = cache.getTransactionManager(); - - assert cache.getNumberOfLocksHeld() == 0 : "Should have no stale locks!"; - - txManager.begin(); - cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(true); - cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); - assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); - txManager.rollback(); - assertTrue(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); - - assert cache.getNumberOfLocksHeld() == 0 : "Should have no stale locks!"; - - txManager.begin(); - cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(false); - cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); - assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); - txManager.commit(); - assertFalse(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); - assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); - } - - private Fqn getSubFqn(String str) - { - return Fqn.fromString("/" + TEST_NODES_ROOT + str); - } -} +package org.jboss.cache.api; + +import org.jboss.cache.Cache; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.config.Configuration; +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.util.internals.EvictionController; +import static org.testng.Assert.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import javax.transaction.TransactionManager; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.util.TestingUtil; + +/** + * Tester class for Node.isResident functionality. + * + * @author <a href="mailto:mircea.markus@jboss.com">Mircea Markus</a> + * @since 2.1.0 + */ +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "api.ResidentNodesTest") +public class ResidentNodesTest +{ + private CacheSPI<Object, Object> cache; + private EvictionController evController; + + private final String TEST_NODES_ROOT = "residentNodesTest"; + private Cache[] caches = {}; + + @BeforeMethod(alwaysRun = true) + public void setUp() + { + Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true); + cacheConfig.setCacheMode(Configuration.CacheMode.LOCAL); + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, false); + cache.getConfiguration().getEvictionConfig().setWakeupInterval(1000); + createNewRegion(); + cache.start(); + evController = new EvictionController(cache); + } + + /** + * Setting up a new region for our purposes. + */ + private void createNewRegion() + { + EvictionConfig evConfig = cache.getConfiguration().getEvictionConfig(); + EvictionRegionConfig evRegConfig = new EvictionRegionConfig(); + evRegConfig.setRegionFqn(Fqn.fromString("/" + TEST_NODES_ROOT)); + evRegConfig.setEventQueueSize(100); + LRUAlgorithmConfig lruConfig = new LRUAlgorithmConfig(); + lruConfig.setMaxAge(100000000); + lruConfig.setTimeToLive(100000000); + lruConfig.setMaxNodes(3); + evRegConfig.setEvictionAlgorithmConfig(lruConfig); + evConfig.addEvictionRegionConfig(evRegConfig); + //end setting up region stuff + } + + @AfterMethod(alwaysRun = true) + public void tearDown() throws Exception + { + TestingUtil.killCaches(cache); + if (caches != null) TestingUtil.killCaches(caches); + cache = null; + caches = null; + evController = null; + } + + /** + * Mark some nodes as resident and show that they won't get evicted, + * even if normally scenario they would + */ + public void testHappyFlow() throws InterruptedException + { + cache.put(getSubFqn("/a"), "k_a", "v_a"); + cache.getNode(getSubFqn("/a")).setResident(true); + cache.put(getSubFqn("/b"), "k_b", "v_b"); + cache.getNode(getSubFqn("/b")).setResident(true); + cache.put(getSubFqn("/c"), "k_c", "v_c"); + cache.put(getSubFqn("/d"), "k_d", "v_d"); + cache.put(getSubFqn("/e"), "k_e", "v_e"); + cache.put(getSubFqn("/f"), "k_f", "v_f"); + cache.put(getSubFqn("/g"), "k_g", "v_g"); + cache.put(getSubFqn("/h"), "k_h", "v_h"); + cache.put(getSubFqn("/i"), "k_i", "v_i"); + + evController.startEviction(); + + assertTrue(cache.exists(getSubFqn("/a"))); + assertTrue(cache.exists(getSubFqn("/b"))); + assertFalse(cache.exists(getSubFqn("/c"))); + assertFalse(cache.exists(getSubFqn("/d"))); + assertFalse(cache.exists(getSubFqn("/e"))); + assertFalse(cache.exists(getSubFqn("/f"))); + + //only last three used are not evicted + assertTrue(cache.exists(getSubFqn("/g"))); + assertTrue(cache.exists(getSubFqn("/h"))); + assertTrue(cache.exists(getSubFqn("/i"))); + + } + + public void simpleTest() throws Exception + { + cache.put(getSubFqn("/a"), "k_a", "v_a"); + cache.put(getSubFqn("/b"), "k_b", "v_b"); + cache.put(getSubFqn("/c"), "k_c", "v_c"); + cache.put(getSubFqn("/d"), "k_d", "v_d"); + + evController.startEviction(); + + assertFalse(cache.exists(getSubFqn("/a"))); + assertTrue(cache.exists(getSubFqn("/b"))); + assertTrue(cache.exists(getSubFqn("/c"))); + assertTrue(cache.exists(getSubFqn("/d"))); + } + + /** + * If a node is marked as resident, and a get is made on that given node then an VISITED event would normally be + * added to the eviction queue. In a LRU scenario, this will cause another node to be evicted given that the size of + * the eviction queue is bounded. This test makes sure that this scenario will not hapen. + */ + public void testNoEvictionEventsForResidentNodes() throws InterruptedException + { + cache.put(getSubFqn("/a"), "k_a", "v_a"); + cache.put(getSubFqn("/b"), "k_b", "v_b"); + + cache.getNode(getSubFqn("/a")).setResident(true); + cache.getNode(getSubFqn("/b")).setResident(true); + + cache.put(getSubFqn("/c"), "k_c", "v_c"); + cache.put(getSubFqn("/d"), "k_d", "v_d"); + cache.put(getSubFqn("/e"), "k_e", "v_e"); + cache.put(getSubFqn("/f"), "k_f", "v_f"); + cache.put(getSubFqn("/g"), "k_g", "v_g"); + cache.put(getSubFqn("/h"), "k_h", "v_h"); + + //at this point the oldest nodes are /a and /b so. There are eviction events in the queue corresponding + // to those nodes + cache.getNode(getSubFqn("/a")); + cache.getNode(getSubFqn("/b")); + + evController.startEviction(); + + //a and b should exist as those were marked resident. Also they shouldn't be caunted as nodes in the eviction + // queue + assertTrue(cache.exists(getSubFqn("/a"))); + assertTrue(cache.exists(getSubFqn("/b"))); + + // c, d and e were the first accessed, they should be evicted + assertFalse(cache.exists(getSubFqn("/c"))); + assertFalse(cache.exists(getSubFqn("/d"))); + assertFalse(cache.exists(getSubFqn("/e"))); + + //all of them should be there - even if we re-retrieved a and b at a prev step (cache.get(getSubFqn("/a"))) this + //call shouldn't create an eviction event. + assertTrue(cache.exists(getSubFqn("/f"))); + assertTrue(cache.exists(getSubFqn("/g"))); + assertTrue(cache.exists(getSubFqn("/h"))); + } + + /** + * Check the behavior whilst using optimistic locking. + */ + public void testResidencyAndOptimisticLocking() throws Exception + { + + Configuration config = UnitTestCacheConfigurationFactory.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); + + cache.put(Fqn.fromString("/a/b"), "key", "value"); + TransactionManager txManager = cache.getTransactionManager(); + txManager.begin(); + cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(true); + cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); + assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); + txManager.rollback(); + assertTrue(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); + + txManager.begin(); + cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(false); + cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); + assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); + txManager.commit(); + assertFalse(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); + assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); + + try + { + if (cache.getTransactionManager().getTransaction() != null) + { + cache.getTransactionManager().rollback(); + } + } + finally + { + cache.stop(); + } + } + + public void testResidencyAndPessimisticLocking() throws Exception + { + cache.put(Fqn.fromString("/a/b"), "key", "value"); + TransactionManager txManager = cache.getTransactionManager(); + + assert cache.getNumberOfLocksHeld() == 0 : "Should have no stale locks!"; + + txManager.begin(); + cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(true); + cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); + assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); + txManager.rollback(); + assertTrue(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); + + assert cache.getNumberOfLocksHeld() == 0 : "Should have no stale locks!"; + + txManager.begin(); + cache.getRoot().getChild(Fqn.fromString("/a/b")).setResident(false); + cache.getRoot().getChild(Fqn.fromString("/a/b")).put("k2", "v2"); + assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); + txManager.commit(); + assertFalse(cache.getRoot().getChild(Fqn.fromString("/a/b")).isResident()); + assertEquals(cache.getRoot().getChild(Fqn.fromString("/a/b")).getKeys().size(), 2); + } + + private Fqn getSubFqn(String str) + { + return Fqn.fromString("/" + TEST_NODES_ROOT + str); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,7 +29,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "jgroups", "pessimistic"}, sequential = true, testName = "api.SyncReplTest") public class SyncReplTest { private CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -37,7 +37,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups", "transaction", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "jgroups", "transaction", "pessimistic"}, sequential = true, testName = "api.SyncReplTxTest") public class SyncReplTxTest { private List<CacheSPI<Object, Object>> caches; 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithTM.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import javax.transaction.TransactionManager; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = {"functional", "transaction"}) +@Test(groups = {"functional", "transaction"}, testName = "api.batch.BatchWithTM") public class BatchWithTM extends AbstractBatchTest { public void testBatchWithOngoingTM() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithoutTM.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithoutTM.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithoutTM.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "api.batch.BatchWithoutTM") public class BatchWithoutTM extends AbstractBatchTest { public void testBatchWithoutCfg() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/BuddyReplicationConcurrencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/BuddyReplicationConcurrencyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/BuddyReplicationConcurrencyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.BuddyReplicationConcurrencyTest") public class BuddyReplicationConcurrencyTest extends BuddyReplicationTestsBase { public static final Fqn f = Fqn.fromString("/a/b/c"); Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/CacheSPIMVCCTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/CacheSPIMVCCTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/CacheSPIMVCCTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.CacheSPIMVCCTest") public class CacheSPIMVCCTest extends CacheSPITest { public CacheSPIMVCCTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/ForceWriteLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/ForceWriteLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/ForceWriteLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ import static org.testng.AssertJUnit.assertTrue; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.ForceWriteLockTest") public class ForceWriteLockTest extends org.jboss.cache.options.ForceWriteLockTest { public ForceWriteLockTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/PersistingTransientStateTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/PersistingTransientStateTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/PersistingTransientStateTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "api.mvcc.PersistingTransientStateTest") public class PersistingTransientStateTest extends org.jboss.cache.statetransfer.PersistingTransientStateTest { public PersistingTransientStateTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheAPIMVCCTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheAPIMVCCTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheAPIMVCCTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ /** * MVCC version of {@link org.jboss.cache.api.CacheAPITest} */ -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.CacheAPIMVCCTest") public class CacheAPIMVCCTest extends CacheAPITest { @Override @@ -25,5 +25,4 @@ { return NodeLockingScheme.MVCC; } - } \ No newline at end of file Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/CacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.CacheLoaderTest") public class CacheLoaderTest extends DummyInMemoryCacheLoaderTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/DeletedChildResurrectionMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/DeletedChildResurrectionMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/DeletedChildResurrectionMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.DeletedChildResurrectionMvccTest") public class DeletedChildResurrectionMvccTest extends DeletedChildResurrectionTest { public DeletedChildResurrectionMvccTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeAPIMVCCTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeAPIMVCCTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeAPIMVCCTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ /** * An MVCC version of {@link org.jboss.cache.api.NodeAPITest} */ -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.NodeAPIMVCCTest") public class NodeAPIMVCCTest extends NodeAPITest { protected NodeLockingScheme getNodeLockingScheme() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeMoveMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeMoveMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeMoveMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.NodeMoveMvccTest") public class NodeMoveMvccTest extends NodeMoveMvccTestBase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeReplicatedMoveMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeReplicatedMoveMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/NodeReplicatedMoveMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.NodeReplicatedMoveMvccTest") public class NodeReplicatedMoveMvccTest extends NodeReplicatedMoveTest { public NodeReplicatedMoveMvccTest() 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/PassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.PassivationTest") public class PassivationTest extends PassivationTestsBase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockParentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockParentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockParentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -2,7 +2,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.ReadCommittedLockParentTest") public class ReadCommittedLockParentTest extends ReadCommittedLockTest { public ReadCommittedLockParentTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/ReadCommittedLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.api.mvcc.LockTestBase; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.ReadCommittedLockTest") public class ReadCommittedLockTest extends LockTestBase { public ReadCommittedLockTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferConcurrencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferConcurrencyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferConcurrencyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.StateTransferConcurrencyTest") public class StateTransferConcurrencyTest extends org.jboss.cache.statetransfer.StateTransferConcurrencyTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/StateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.statetransfer.StateTransfer200Test; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.StateTransferTest") public class StateTransferTest extends StateTransfer200Test { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups", "mvcc"}) +@Test(groups = {"functional", "jgroups", "mvcc"}, testName = "api.mvcc.read_committed.SyncReplMvccTest") public class SyncReplMvccTest extends SyncReplTest { public SyncReplMvccTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplTxMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplTxMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/read_committed/SyncReplTxMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups", "transaction", "mvcc"}) +@Test(groups = {"functional", "jgroups", "transaction", "mvcc"}, testName = "api.mvcc.read_committed.SyncReplTxMvccTest") public class SyncReplTxMvccTest extends SyncReplTxTest { public SyncReplTxMvccTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheAPIMVCCTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheAPIMVCCTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheAPIMVCCTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ /** * MVCC version of {@link org.jboss.cache.api.CacheAPITest} */ -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.CacheAPIMVCCTest") public class CacheAPIMVCCTest extends CacheAPITest { @Override @@ -25,5 +25,4 @@ { return NodeLockingScheme.MVCC; } - } \ No newline at end of file Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/CacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.CacheLoaderTest") public class CacheLoaderTest extends DummyInMemoryCacheLoaderTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/DeletedChildResurrectionMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/DeletedChildResurrectionMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/DeletedChildResurrectionMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.DeletedChildResurrectionMvccTest") public class DeletedChildResurrectionMvccTest extends DeletedChildResurrectionTest { public DeletedChildResurrectionMvccTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeAPIMVCCTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeAPIMVCCTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeAPIMVCCTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ /** * An MVCC version of {@link org.jboss.cache.api.NodeAPITest} */ -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.NodeAPIMVCCTest") public class NodeAPIMVCCTest extends NodeAPITest { protected NodeLockingScheme getNodeLockingScheme() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeMoveMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeMoveMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeMoveMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.NodeMoveMvccTest") public class NodeMoveMvccTest extends NodeMoveMvccTestBase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeReplicatedMoveMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeReplicatedMoveMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/NodeReplicatedMoveMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.NodeReplicatedMoveMvccTest") public class NodeReplicatedMoveMvccTest extends NodeReplicatedMoveTest { public NodeReplicatedMoveMvccTest() 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/PassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.PassivationTest") public class PassivationTest extends PassivationTestsBase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockParentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockParentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockParentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -2,7 +2,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.RepeatableReadLockParentTest") public class RepeatableReadLockParentTest extends RepeatableReadLockTest { public RepeatableReadLockParentTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/RepeatableReadLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ import javax.transaction.TransactionManager; import org.jboss.cache.Cache; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.RepeatableReadLockTest") public class RepeatableReadLockTest extends LockTestBase { public RepeatableReadLockTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferConcurrencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferConcurrencyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferConcurrencyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.StateTransferConcurrencyTest") public class StateTransferConcurrencyTest extends org.jboss.cache.statetransfer.StateTransferConcurrencyTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/StateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.statetransfer.StateTransfer200Test; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.StateTransferTest") public class StateTransferTest extends StateTransfer200Test { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups", "mvcc"}) +@Test(groups = {"functional", "jgroups", "mvcc"}, testName = "api.mvcc.repeatable_read.SyncReplMvccTest") public class SyncReplMvccTest extends SyncReplTest { public SyncReplMvccTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplTxMvccTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplTxMvccTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/SyncReplTxMvccTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups", "transaction", "mvcc"}) +@Test(groups = {"functional", "jgroups", "transaction", "mvcc"}, testName = "api.mvcc.repeatable_read.SyncReplTxMvccTest") public class SyncReplTxMvccTest extends SyncReplTxTest { public SyncReplTxMvccTest() 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ import java.util.concurrent.CountDownLatch; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = {"functional", "mvcc"}, sequential = true) +@Test(groups = {"functional", "mvcc"}, sequential = true, testName = "api.mvcc.repeatable_read.WriteSkewTest") public class WriteSkewTest { protected Cache<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.nodevalidity.InvalidatedMvccNodeValidityTest") public class InvalidatedMvccNodeValidityTest extends InvalidatedPessNodeValidityTest { public InvalidatedMvccNodeValidityTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedOptNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.nodevalidity.InvalidatedOptNodeValidityTest") public class InvalidatedOptNodeValidityTest extends InvalidatedPessNodeValidityTest { public InvalidatedOptNodeValidityTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedPessNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.nodevalidity.InvalidatedPessNodeValidityTest") public class InvalidatedPessNodeValidityTest extends NodeValidityTestBase { protected ThreadLocal<DummyInMemoryCacheLoader> loaderTL = new ThreadLocal<DummyInMemoryCacheLoader>(); Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalMvccNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalMvccNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalMvccNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.nodevalidity.LocalMvccNodeValidityTest") public class LocalMvccNodeValidityTest extends LocalPessNodeValidityTest { public LocalMvccNodeValidityTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalOptNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.nodevalidity.LocalOptNodeValidityTest") public class LocalOptNodeValidityTest extends LocalPessNodeValidityTest { public LocalOptNodeValidityTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.nodevalidity.LocalPessNodeValidityTest") public class LocalPessNodeValidityTest extends NodeValidityTestBase { private ThreadLocal<Cache<String, String>> cacheTL = new ThreadLocal<Cache<String, String>>(); Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedMvccNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedMvccNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedMvccNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.jboss.cache.lock.IsolationLevel; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.nodevalidity.ReplicatedMvccNodeValidityTest") public class ReplicatedMvccNodeValidityTest extends ReplicatedPessNodeValidityTest { public ReplicatedMvccNodeValidityTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedOptNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.nodevalidity.ReplicatedOptNodeValidityTest") public class ReplicatedOptNodeValidityTest extends ReplicatedPessNodeValidityTest { public ReplicatedOptNodeValidityTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"} , testName = "api.nodevalidity.ReplicatedPessNodeValidityTest") public class ReplicatedPessNodeValidityTest extends NodeValidityTestBase { protected Cache<String, String> createObserver() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheAPIOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheAPIOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheAPIOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ /** * Optimistically locked version of {@link org.jboss.cache.api.CacheAPITest} */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.optimistic.CacheAPIOptimisticTest") public class CacheAPIOptimisticTest extends CacheAPITest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheSPIOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheSPIOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/CacheSPIOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.optimistic.CacheSPIOptimisticTest") public class CacheSPIOptimisticTest extends CacheSPITest { public CacheSPIOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/DeletedChildResurrectionOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/DeletedChildResurrectionOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/DeletedChildResurrectionOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.optimistic.DeletedChildResurrectionOptimisticTest") public class DeletedChildResurrectionOptimisticTest extends DeletedChildResurrectionTest { public DeletedChildResurrectionOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeAPIOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeAPIOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeAPIOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ /** * An optimistic version of {@link org.jboss.cache.api.NodeAPITest} */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.optimistic.NodeAPIOptimisticTest") public class NodeAPIOptimisticTest extends NodeAPITest { protected NodeLockingScheme getNodeLockingScheme() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeMoveOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeMoveOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeMoveOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.optimistic.NodeMoveOptimisticTest") public class NodeMoveOptimisticTest extends NodeMoveAPITest { public NodeMoveOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeReplicatedMoveOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeReplicatedMoveOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/NodeReplicatedMoveOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.optimistic.NodeReplicatedMoveOptimisticTest") public class NodeReplicatedMoveOptimisticTest extends NodeReplicatedMoveTest { public NodeReplicatedMoveOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups", "optimistic"}) +@Test(groups = {"functional", "jgroups", "optimistic"}, testName = "api.optimistic.SyncReplOptimisticTest") public class SyncReplOptimisticTest extends SyncReplTest { public SyncReplOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplTxOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplTxOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/optimistic/SyncReplTxOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups", "transaction", "optimistic"}) +@Test(groups = {"functional", "jgroups", "transaction", "optimistic"}, testName = "api.optimistic.SyncReplTxOptimisticTest") public class SyncReplTxOptimisticTest extends SyncReplTxTest { public SyncReplTxOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationAsyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationAsyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationAsyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.pfer.PFERMvccInvalidationAsyncTest") public class PFERMvccInvalidationAsyncTest extends PFERMVCCTestBase { public PFERMvccInvalidationAsyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationSyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationSyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccInvalidationSyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.pfer.PFERMvccInvalidationSyncTest") public class PFERMvccInvalidationSyncTest extends PFERMVCCTestBase { public PFERMvccInvalidationSyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplAsyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplAsyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplAsyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.pfer.PFERMvccReplAsyncTest") public class PFERMvccReplAsyncTest extends PFERMVCCTestBase { public PFERMvccReplAsyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplSyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplSyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERMvccReplSyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "api.pfer.PFERMvccReplSyncTest") public class PFERMvccReplSyncTest extends PFERMVCCTestBase { public PFERMvccReplSyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationAsyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationAsyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationAsyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.pfer.PFEROptimisticInvalidationAsyncTest") public class PFEROptimisticInvalidationAsyncTest extends PFEROptimisticTestBase { public PFEROptimisticInvalidationAsyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationSyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationSyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticInvalidationSyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.pfer.PFEROptimisticInvalidationSyncTest") public class PFEROptimisticInvalidationSyncTest extends PFEROptimisticTestBase { public PFEROptimisticInvalidationSyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplAsyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplAsyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplAsyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.pfer.PFEROptimisticReplAsyncTest") public class PFEROptimisticReplAsyncTest extends PFEROptimisticTestBase { public PFEROptimisticReplAsyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplSyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplSyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFEROptimisticReplSyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "api.pfer.PFEROptimisticReplSyncTest") public class PFEROptimisticReplSyncTest extends PFEROptimisticTestBase { public PFEROptimisticReplSyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationAsyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationAsyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationAsyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.pfer.PFERPessimisticInvalidationAsyncTest") public class PFERPessimisticInvalidationAsyncTest extends PFERPessimisticTestBase { public PFERPessimisticInvalidationAsyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationSyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationSyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticInvalidationSyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.pfer.PFERPessimisticInvalidationSyncTest") public class PFERPessimisticInvalidationSyncTest extends PFERPessimisticTestBase { public PFERPessimisticInvalidationSyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplAsyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplAsyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplAsyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.pfer.PFERPessimisticReplAsyncTest") public class PFERPessimisticReplAsyncTest extends PFERPessimisticTestBase { public PFERPessimisticReplAsyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplSyncTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplSyncTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PFERPessimisticReplSyncTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "pessimistic"}) +@Test(groups = {"functional", "pessimistic"}, testName = "api.pfer.PFERPessimisticReplSyncTest") public class PFERPessimisticReplSyncTest extends PFERPessimisticTestBase { public PFERPessimisticReplSyncTest() Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "buddyreplication.BuddyAssignmentStateTransferTest") public class BuddyAssignmentStateTransferTest extends BuddyReplicationTestsBase { Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ * * @author Brian Stansberry */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.BuddyBackupActivationInactivationTest") public class BuddyBackupActivationInactivationTest extends BuddyReplicationTestsBase { public static final Fqn A = Fqn.fromString("/a"); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.2.0 */ -@Test(groups = "unit") +@Test(groups = "unit", testName = "buddyreplication.BuddyFqnTransformerTest") public class BuddyFqnTransformerTest { private BuddyFqnTransformer buddyFqnTransformer = new BuddyFqnTransformer(); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyGroupAssignmentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "buddyreplication.BuddyGroupAssignmentTest") public class BuddyGroupAssignmentTest extends BuddyReplicationTestsBase { private Log log = LogFactory.getLog(BuddyGroupAssignmentTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.BuddyManagerTest") public class BuddyManagerTest { private static final String DUMMY_LOCAL_ADDRESS = "myLocalAddress:12345"; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyPoolBroadcastTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.BuddyPoolBroadcastTest") public class BuddyPoolBroadcastTest extends BuddyReplicationTestsBase { private Log log = LogFactory.getLog(BuddyPoolBroadcastTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}, sequential = true) +@Test(groups = {"functional", "jgroups"}, sequential = true, testName = "buddyreplication.BuddyReplicationConfigTest") public class BuddyReplicationConfigTest { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationContentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "buddyreplication.BuddyReplicationTestsBase") public class BuddyReplicationContentTest extends BuddyReplicationTestsBase { private final String key = "key"; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.BuddyReplicationFailoverTest") public class BuddyReplicationFailoverTest extends BuddyReplicationTestsBase { protected boolean optimisticLocks = false; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationRejoinTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * * @author Fredrik Johansson, Cubeia Ltd */ -@Test(sequential = true) +@Test(testName = "buddyreplication.BuddyReplicationTestsBase") public class BuddyReplicationRejoinTest extends BuddyReplicationTestsBase { private static Log log = LogFactory.getLog(BuddyReplicationRejoinTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -35,7 +35,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "buddyreplication.BuddyReplicationTestsBase") public abstract class BuddyReplicationTestsBase { protected final ThreadLocal<List<CacheSPI<Object, Object>>> cachesTL = new ThreadLocal<List<CacheSPI<Object, Object>>>(); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.BuddyReplicationWithCacheLoaderTest") public class BuddyReplicationWithCacheLoaderTest extends BuddyReplicationTestsBase { Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups", "optimistic"}) +@Test(groups = {"functional", "jgroups", "optimistic"}, testName = "buddyreplication.BuddyReplicationFailoverTest") public class BuddyReplicationWithOptimisticLockingTest extends BuddyReplicationFailoverTest { public BuddyReplicationWithOptimisticLockingTest() Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.BuddyReplicationWithPassivationTest") public class BuddyReplicationWithPassivationTest extends BuddyReplicationWithCacheLoaderTest { public BuddyReplicationWithPassivationTest() Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "buddyreplication.BuddyReplicationWithTransactionsTest") public class BuddyReplicationWithTransactionsTest extends BuddyReplicationTestsBase { private Fqn fqn = Fqn.fromString("test"); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "buddyreplication.DisabledStateTransferTest") public class DisabledStateTransferTest extends BuddyReplicationTestsBase { public void testCachesWithoutStateTransfer() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/EmptyRegionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "buddyreplication.EmptyRegionTest") public class EmptyRegionTest extends BuddyReplicationTestsBase { CacheSPI c1, c2; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/EvictionOfBuddyBackupsTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -17,7 +17,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.2.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "buddyreplication.EvictionOfBuddyBackupsTest") public class EvictionOfBuddyBackupsTest extends BuddyReplicationTestsBase { private CacheSPI cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/GravitationCleanupTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "buddyreplication.GravitationCleanupTest") public class GravitationCleanupTest extends BuddyReplicationTestsBase { Fqn fqn = Fqn.fromString("/a/b/c"); Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "buddyreplication.NextMemberBuddyLocatorTest") public class NextMemberBuddyLocatorTest { private IpAddress dataOwner; Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/RemoveRootBuddyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,37 +1,37 @@ -package org.jboss.cache.buddyreplication; - -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; - -/** - * Test added to replicate a found issue. When fixing it consider moving test to some other class. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.1 - */ -@Test(groups = {"functional"}) -public class RemoveRootBuddyTest extends BuddyReplicationTestsBase -{ - public void testRemoveRootNode() throws Exception - { - CacheSPI cache1 = createCache(false, 1, "myBuddyPoolReplicationGroup", false, true, true); - CacheSPI cache2 = createCache(false, 1, "myBuddyPoolReplicationGroup", false, true, true); - List<CacheSPI<Object, Object>> caches = new ArrayList<CacheSPI<Object, Object>>(2); - cachesTL.set(caches); - caches.add(cache1); - caches.add(cache2); - int opCount = 10; - for (int i = 0; i < opCount; i++) - { - String key = String.valueOf(opCount); - String value = String.valueOf(opCount); - Fqn f = Fqn.fromElements("test", key); - cache1.put(f, key, value); - } - cache1.removeNode(Fqn.ROOT); - } -} +package org.jboss.cache.buddyreplication; + +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; + +/** + * Test added to replicate a found issue. When fixing it consider moving test to some other class. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.1 + */ +@Test(groups = {"functional"}, testName = "buddyreplication.RemoveRootBuddyTest") +public class RemoveRootBuddyTest extends BuddyReplicationTestsBase +{ + public void testRemoveRootNode() throws Exception + { + CacheSPI cache1 = createCache(false, 1, "myBuddyPoolReplicationGroup", false, true, true); + CacheSPI cache2 = createCache(false, 1, "myBuddyPoolReplicationGroup", false, true, true); + List<CacheSPI<Object, Object>> caches = new ArrayList<CacheSPI<Object, Object>>(2); + cachesTL.set(caches); + caches.add(cache1); + caches.add(cache2); + int opCount = 10; + for (int i = 0; i < opCount; i++) + { + String key = String.valueOf(opCount); + String value = String.valueOf(opCount); + Fqn f = Fqn.fromElements("test", key); + cache1.put(f, key, value); + } + cache1.removeNode(Fqn.ROOT); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyAssignmentStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyAssignmentStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyAssignmentStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyAssignmentStateTransferTest") public class BuddyAssignmentStateTransferTest extends org.jboss.cache.buddyreplication.BuddyAssignmentStateTransferTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyBackupActivationInactivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyBackupActivationInactivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyBackupActivationInactivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyBackupActivationInactivationTest") public class BuddyBackupActivationInactivationTest extends org.jboss.cache.buddyreplication.BuddyBackupActivationInactivationTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyGroupAssignmentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyGroupAssignmentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyGroupAssignmentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyGroupAssignmentTest") public class BuddyGroupAssignmentTest extends org.jboss.cache.buddyreplication.BuddyGroupAssignmentTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationContentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationContentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationContentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyReplicationContentTest") public class BuddyReplicationContentTest extends org.jboss.cache.buddyreplication.BuddyReplicationContentTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyReplicationFailoverTest") public class BuddyReplicationFailoverTest extends org.jboss.cache.buddyreplication.BuddyReplicationFailoverTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationRejoinTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationRejoinTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationRejoinTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyReplicationRejoinTest") public class BuddyReplicationRejoinTest extends org.jboss.cache.buddyreplication.BuddyReplicationRejoinTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyReplicationWithCacheLoaderTest") public class BuddyReplicationWithCacheLoaderTest extends org.jboss.cache.buddyreplication.BuddyReplicationWithCacheLoaderTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyReplicationWithPassivationTest") public class BuddyReplicationWithPassivationTest extends org.jboss.cache.buddyreplication.BuddyReplicationWithPassivationTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithTransactionsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithTransactionsTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationWithTransactionsTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.BuddyReplicationWithTransactionsTest") public class BuddyReplicationWithTransactionsTest extends org.jboss.cache.buddyreplication.BuddyReplicationWithTransactionsTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/GravitationCleanupTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/GravitationCleanupTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/GravitationCleanupTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = {"functional", "mvcc"}) +@Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.GravitationCleanupTest") public class GravitationCleanupTest extends org.jboss.cache.buddyreplication.GravitationCleanupTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,174 +1,174 @@ -package org.jboss.cache.cluster; - -import org.easymock.EasyMock; -import static org.easymock.EasyMock.*; -import org.jboss.cache.Cache; -import org.jboss.cache.RPCManager; -import org.jboss.cache.commands.ReplicableCommand; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.ComponentRegistry; -import org.jboss.cache.util.TestingUtil; -import org.jboss.cache.util.internals.ReplicationQueueNotifier; -import org.jgroups.Address; -import static org.testng.AssertJUnit.assertNotNull; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.util.Collections; -import java.util.Vector; -import java.util.concurrent.CountDownLatch; -import org.jboss.cache.UnitTestCacheFactory; - -@Test(groups = "functional", sequential = true) -public class ReplicationQueueTest -{ - private static final int COUNT = 10; - Cache cache, cache2; - ReplicationQueue replQ; - ComponentRegistry registry; - RPCManager originalRpcManager; - - @BeforeMethod - public void setUp() throws CloneNotSupportedException - { - Configuration c = new Configuration(); - c.setCacheMode(Configuration.CacheMode.REPL_ASYNC); - c.setUseReplQueue(true); - c.setReplQueueMaxElements(COUNT); - c.setReplQueueInterval(-1); - cache = new UnitTestCacheFactory<Object, Object>().createCache(c, false); - cache.start(); - registry = TestingUtil.extractComponentRegistry(cache); - replQ = registry.getComponent(ReplicationQueue.class); - originalRpcManager = cache.getConfiguration().getRuntimeConfig().getRPCManager(); - cache2 = new UnitTestCacheFactory<Object, Object>().createCache(cache.getConfiguration().clone()); - - TestingUtil.blockUntilViewsReceived(60000, cache, cache2); - } - - @AfterMethod - public void tearDown() - { - // reset the original RPCManager - injectRpcManager(originalRpcManager); - TestingUtil.killCaches(cache, cache2); - cache = null; - cache2 = null; - } - - private void injectRpcManager(RPCManager manager) - { - registry.registerComponent(manager, RPCManager.class); - } - - public void testQueueHoldAndFlush() throws Exception - { - assert replQ != null; - - // mock the RPCManager used in the cache - RPCManager mockRpcManager = EasyMock.createStrictMock(RPCManager.class); - injectRpcManager(mockRpcManager); - - // expect basic cluster related calls - expect(mockRpcManager.getMembers()).andReturn(originalRpcManager.getMembers()).anyTimes(); - replay(mockRpcManager); - - // check that nothing on the RPCManager will be called until we hit the replication queue threshold. - for (int i = 0; i < COUNT - 1; i++) cache.put("/a/b/c/" + i, "k", "v"); - assert replQ.elements.size() == COUNT - 1; - - // verify that no calls have been made on the mockRpcManager - verify(mockRpcManager); - - // reset the mock - reset(mockRpcManager); - - // now try the last PUT which should result in the queue being flushed. - expect(mockRpcManager.getMembers()).andReturn(originalRpcManager.getMembers()).anyTimes(); - expect(mockRpcManager.callRemoteMethods((Vector<Address>) anyObject(), (ReplicableCommand) anyObject(), anyBoolean(), anyLong(), anyBoolean())).andReturn(Collections.emptyList()).anyTimes(); - replay(mockRpcManager); - - cache.put("/a/b/c/LAST", "k", "v"); - assert replQ.elements.size() == 0; - - // verify that the rpc call was only made once. - verify(mockRpcManager); - } - - public void testFlushConcurrency() throws Exception - { - // will create multiple threads to constantly perform a cache update, and measure the number of expected invocations on the RPC manager. - final int numThreads = 25; - final int numLoopsPerThread = 1000; - - int totalInvocations = numThreads * numLoopsPerThread; - - assert totalInvocations % COUNT == 0 : "NumThreads and NumLoopsPerThread must multiply to be a multiple of COUNT"; - - final CountDownLatch latch = new CountDownLatch(1); - - // mock the RPCManager used in the cache - RPCManager mockRpcManager = EasyMock.createStrictMock(RPCManager.class); - injectRpcManager(mockRpcManager); - - // expect basic cluster related calls - expect(mockRpcManager.getMembers()).andReturn(originalRpcManager.getMembers()).anyTimes(); - expect(mockRpcManager.callRemoteMethods((Vector<Address>) anyObject(), (ReplicableCommand) anyObject(), anyBoolean(), anyLong(), anyBoolean())).andReturn(Collections.emptyList()).anyTimes(); - replay(mockRpcManager); - - Thread[] threads = new Thread[numThreads]; - - for (int i = 0; i < numThreads; i++) - { - threads[i] = new Thread() - { - public void run() - { - try - { - latch.await(); - } - catch (InterruptedException e) - { - // do nothing - } - for (int j = 0; j < numLoopsPerThread; j++) - { - cache.put("/a/b/c/" + getName() + "/" + j, "k", "v"); - } - } - }; - threads[i].start(); - } - - // start the threads - latch.countDown(); - - // wait for threads to join - for (Thread t : threads) t.join(); - - // now test results - verify(mockRpcManager); - - ReplicationQueueNotifier notifier = new ReplicationQueueNotifier(cache); - notifier.waitUntillAllReplicated(250); -// TestingUtil.sleepThread(250); // make sure the queue flushes - - assert replQ.elements.size() == 0; - } - - public void testFailure() throws InterruptedException - { - for (int i = 0; i < COUNT; i++) - { - System.out.println("on put i = " + i); - cache.put("/a/b/c" + i, "key", "value"); - assertNotNull(cache.get("/a/b/c" + i, "key")); - } - ReplicationQueueNotifier notifier = new ReplicationQueueNotifier(cache); - notifier.waitUntillAllReplicated(500); -// TestingUtil.sleepThread(500); - for (int i = 0; i < COUNT; i++) assertNotNull("on get i = " + i, cache2.get("/a/b/c" + i, "key")); - } -} +package org.jboss.cache.cluster; + +import org.easymock.EasyMock; +import static org.easymock.EasyMock.*; +import org.jboss.cache.Cache; +import org.jboss.cache.RPCManager; +import org.jboss.cache.commands.ReplicableCommand; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.factories.ComponentRegistry; +import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.internals.ReplicationQueueNotifier; +import org.jgroups.Address; +import static org.testng.AssertJUnit.assertNotNull; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.Collections; +import java.util.Vector; +import java.util.concurrent.CountDownLatch; +import org.jboss.cache.UnitTestCacheFactory; + +@Test(groups = "functional", sequential = true, testName = "cluster.ReplicationQueueTest") +public class ReplicationQueueTest +{ + private static final int COUNT = 10; + Cache cache, cache2; + ReplicationQueue replQ; + ComponentRegistry registry; + RPCManager originalRpcManager; + + @BeforeMethod + public void setUp() throws CloneNotSupportedException + { + Configuration c = new Configuration(); + c.setCacheMode(Configuration.CacheMode.REPL_ASYNC); + c.setUseReplQueue(true); + c.setReplQueueMaxElements(COUNT); + c.setReplQueueInterval(-1); + cache = new UnitTestCacheFactory<Object, Object>().createCache(c, false); + cache.start(); + registry = TestingUtil.extractComponentRegistry(cache); + replQ = registry.getComponent(ReplicationQueue.class); + originalRpcManager = cache.getConfiguration().getRuntimeConfig().getRPCManager(); + cache2 = new UnitTestCacheFactory<Object, Object>().createCache(cache.getConfiguration().clone()); + + TestingUtil.blockUntilViewsReceived(60000, cache, cache2); + } + + @AfterMethod + public void tearDown() + { + // reset the original RPCManager + injectRpcManager(originalRpcManager); + TestingUtil.killCaches(cache, cache2); + cache = null; + cache2 = null; + } + + private void injectRpcManager(RPCManager manager) + { + registry.registerComponent(manager, RPCManager.class); + } + + public void testQueueHoldAndFlush() throws Exception + { + assert replQ != null; + + // mock the RPCManager used in the cache + RPCManager mockRpcManager = EasyMock.createStrictMock(RPCManager.class); + injectRpcManager(mockRpcManager); + + // expect basic cluster related calls + expect(mockRpcManager.getMembers()).andReturn(originalRpcManager.getMembers()).anyTimes(); + replay(mockRpcManager); + + // check that nothing on the RPCManager will be called until we hit the replication queue threshold. + for (int i = 0; i < COUNT - 1; i++) cache.put("/a/b/c/" + i, "k", "v"); + assert replQ.elements.size() == COUNT - 1; + + // verify that no calls have been made on the mockRpcManager + verify(mockRpcManager); + + // reset the mock + reset(mockRpcManager); + + // now try the last PUT which should result in the queue being flushed. + expect(mockRpcManager.getMembers()).andReturn(originalRpcManager.getMembers()).anyTimes(); + expect(mockRpcManager.callRemoteMethods((Vector<Address>) anyObject(), (ReplicableCommand) anyObject(), anyBoolean(), anyLong(), anyBoolean())).andReturn(Collections.emptyList()).anyTimes(); + replay(mockRpcManager); + + cache.put("/a/b/c/LAST", "k", "v"); + assert replQ.elements.size() == 0; + + // verify that the rpc call was only made once. + verify(mockRpcManager); + } + + public void testFlushConcurrency() throws Exception + { + // will create multiple threads to constantly perform a cache update, and measure the number of expected invocations on the RPC manager. + final int numThreads = 25; + final int numLoopsPerThread = 1000; + + int totalInvocations = numThreads * numLoopsPerThread; + + assert totalInvocations % COUNT == 0 : "NumThreads and NumLoopsPerThread must multiply to be a multiple of COUNT"; + + final CountDownLatch latch = new CountDownLatch(1); + + // mock the RPCManager used in the cache + RPCManager mockRpcManager = EasyMock.createStrictMock(RPCManager.class); + injectRpcManager(mockRpcManager); + + // expect basic cluster related calls + expect(mockRpcManager.getMembers()).andReturn(originalRpcManager.getMembers()).anyTimes(); + expect(mockRpcManager.callRemoteMethods((Vector<Address>) anyObject(), (ReplicableCommand) anyObject(), anyBoolean(), anyLong(), anyBoolean())).andReturn(Collections.emptyList()).anyTimes(); + replay(mockRpcManager); + + Thread[] threads = new Thread[numThreads]; + + for (int i = 0; i < numThreads; i++) + { + threads[i] = new Thread() + { + public void run() + { + try + { + latch.await(); + } + catch (InterruptedException e) + { + // do nothing + } + for (int j = 0; j < numLoopsPerThread; j++) + { + cache.put("/a/b/c/" + getName() + "/" + j, "k", "v"); + } + } + }; + threads[i].start(); + } + + // start the threads + latch.countDown(); + + // wait for threads to join + for (Thread t : threads) t.join(); + + // now test results + verify(mockRpcManager); + + ReplicationQueueNotifier notifier = new ReplicationQueueNotifier(cache); + notifier.waitUntillAllReplicated(250); +// TestingUtil.sleepThread(250); // make sure the queue flushes + + assert replQ.elements.size() == 0; + } + + public void testFailure() throws InterruptedException + { + for (int i = 0; i < COUNT; i++) + { + System.out.println("on put i = " + i); + cache.put("/a/b/c" + i, "key", "value"); + assertNotNull(cache.get("/a/b/c" + i, "key")); + } + ReplicationQueueNotifier notifier = new ReplicationQueueNotifier(cache); + notifier.waitUntillAllReplicated(500); +// TestingUtil.sleepThread(500); + for (int i = 0; i < COUNT; i++) assertNotNull("on get i = " + i, cache2.get("/a/b/c" + i, "key")); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import javax.transaction.TransactionManager; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "cluster.ReplicationQueueTxTest") public class ReplicationQueueTxTest { Cache cache, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/RollbackOnNoOpTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,78 +1,78 @@ -package org.jboss.cache.commands; - -import org.jboss.cache.CacheSPI; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.util.TestingUtil; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; - -/** - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "functional", sequential = true) -public class RollbackOnNoOpTest -{ - private CacheSPI<Object, Object> cache; - private TransactionManager txMgr; - - @BeforeMethod(alwaysRun = true) - public void setUp() - { - Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); - cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, false); - cache.start(); - txMgr = cache.getTransactionManager(); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() - { - TestingUtil.killCaches(cache); - cache = null; - txMgr = null; - } - - public void testRollbackOnRemoveNodeDoesNotFail() throws Exception - { - txMgr.begin(); - cache.remove("/blah/blah", "non-exist"); - txMgr.rollback(); - } - - public void testRollbackOnClearData() throws Exception - { - txMgr.begin(); - cache.clearData("/blah/blah"); - txMgr.rollback(); - } - - public void testCreateNodeCommand() throws Exception - { - cache.put("/blah/blah", "key", "value"); - txMgr.begin(); - cache.clearData("/blah/blah"); - txMgr.rollback(); - assert cache.get("/blah/blah", "key") != null; - } - - public void testRemoveKeyCommand() throws Exception - { - txMgr.begin(); - cache.remove("/blah/blah", "key"); - txMgr.rollback(); - } - - public void testRemoveNodeCommand() throws Exception - { - cache.put("/blah/blah", "key", "value"); - txMgr.begin(); - cache.removeNode("/blah"); - txMgr.rollback(); - } -} +package org.jboss.cache.commands; + +import org.jboss.cache.CacheSPI; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.util.TestingUtil; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import javax.transaction.TransactionManager; +import org.jboss.cache.UnitTestCacheFactory; + +/** + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "functional", sequential = true, testName = "commands.RollbackOnNoOpTest") +public class RollbackOnNoOpTest +{ + private CacheSPI<Object, Object> cache; + private TransactionManager txMgr; + + @BeforeMethod(alwaysRun = true) + public void setUp() + { + Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig, false); + cache.start(); + txMgr = cache.getTransactionManager(); + } + + @AfterMethod(alwaysRun = true) + public void tearDown() + { + TestingUtil.killCaches(cache); + cache = null; + txMgr = null; + } + + public void testRollbackOnRemoveNodeDoesNotFail() throws Exception + { + txMgr.begin(); + cache.remove("/blah/blah", "non-exist"); + txMgr.rollback(); + } + + public void testRollbackOnClearData() throws Exception + { + txMgr.begin(); + cache.clearData("/blah/blah"); + txMgr.rollback(); + } + + public void testCreateNodeCommand() throws Exception + { + cache.put("/blah/blah", "key", "value"); + txMgr.begin(); + cache.clearData("/blah/blah"); + txMgr.rollback(); + assert cache.get("/blah/blah", "key") != null; + } + + public void testRemoveKeyCommand() throws Exception + { + txMgr.begin(); + cache.remove("/blah/blah", "key"); + txMgr.rollback(); + } + + public void testRemoveNodeCommand() throws Exception + { + cache.put("/blah/blah", "key", "value"); + txMgr.begin(); + cache.removeNode("/blah"); + txMgr.rollback(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/StructuralNodesOnRollbackTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,78 +1,78 @@ -package org.jboss.cache.commands; - -import org.jboss.cache.CacheSPI; -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.util.TestingUtil; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import javax.transaction.TransactionManager; -import java.util.HashMap; -import org.jboss.cache.UnitTestCacheFactory; - -/** - * Test to check that structural nodes are being removed on rollback: http://jira.jboss.com/jira/browse/JBCACHE-1365. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "functional", sequential = true) -public class StructuralNodesOnRollbackTest -{ - private CacheSPI<Object, Object> cache; - private TransactionManager txMgr; - - @BeforeMethod(alwaysRun = true) - public void setUp() - { - Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); - cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig); - txMgr = cache.getTransactionManager(); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() - { - TestingUtil.killCaches(cache); - cache = null; - txMgr = null; - } - - public void testNoTx() throws Exception - { - txMgr.begin(); - cache.put("/a/b/c", "k","v"); - NodeSPI<Object,Object> root = cache.getRoot(); - assert root.getChild("a") != null; - assert root.getChild(Fqn.fromString("/a/b/c")) != null; - assert cache.exists("/a/b"); - txMgr.rollback(); - } - - public void testPutDataMap() throws Exception - { - HashMap map = new HashMap(); - map.put("k", "v"); - - assert !cache.exists("/a/b"); - txMgr.begin(); - cache.put("/a/b/c", map); - assert cache.exists("/a/b"); - txMgr.rollback(); - assert !cache.exists("/a/b"); - } - - public void testPutKeyValueCommand() throws Exception - { - assert !cache.exists("/a/b"); - txMgr.begin(); - cache.put("/a/b/c", "key", "value"); - assert cache.exists("/a/b"); - txMgr.rollback(); - assert !cache.exists("/a/b"); - } -} +package org.jboss.cache.commands; + +import org.jboss.cache.CacheSPI; +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.util.TestingUtil; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import javax.transaction.TransactionManager; +import java.util.HashMap; +import org.jboss.cache.UnitTestCacheFactory; + +/** + * Test to check that structural nodes are being removed on rollback: http://jira.jboss.com/jira/browse/JBCACHE-1365. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "functional", sequential = true, testName = "commands.StructuralNodesOnRollbackTest") +public class StructuralNodesOnRollbackTest +{ + private CacheSPI<Object, Object> cache; + private TransactionManager txMgr; + + @BeforeMethod(alwaysRun = true) + public void setUp() + { + Configuration cacheConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false); + cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(cacheConfig); + txMgr = cache.getTransactionManager(); + } + + @AfterMethod(alwaysRun = true) + public void tearDown() + { + TestingUtil.killCaches(cache); + cache = null; + txMgr = null; + } + + public void testNoTx() throws Exception + { + txMgr.begin(); + cache.put("/a/b/c", "k","v"); + NodeSPI<Object,Object> root = cache.getRoot(); + assert root.getChild("a") != null; + assert root.getChild(Fqn.fromString("/a/b/c")) != null; + assert cache.exists("/a/b"); + txMgr.rollback(); + } + + public void testPutDataMap() throws Exception + { + HashMap map = new HashMap(); + map.put("k", "v"); + + assert !cache.exists("/a/b"); + txMgr.begin(); + cache.put("/a/b/c", map); + assert cache.exists("/a/b"); + txMgr.rollback(); + assert !cache.exists("/a/b"); + } + + public void testPutKeyValueCommand() throws Exception + { + assert !cache.exists("/a/b"); + txMgr.begin(); + cache.put("/a/b/c", "key", "value"); + assert cache.exists("/a/b"); + txMgr.rollback(); + assert !cache.exists("/a/b"); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/read/GravitateDataCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/legacy/read/GravitateDataCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/read/GravitateDataCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,148 +1,148 @@ -package org.jboss.cache.commands.legacy.read; - -import static org.easymock.EasyMock.createStrictControl; -import static org.easymock.EasyMock.expect; -import org.easymock.IMocksControl; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.DataContainer; -import org.jboss.cache.Fqn; -import org.jboss.cache.InvocationContext; -import org.jboss.cache.NodeSPI; -import org.jboss.cache.buddyreplication.BuddyFqnTransformer; -import org.jboss.cache.buddyreplication.BuddyManager; -import org.jboss.cache.buddyreplication.GravitateResult; -import org.jboss.cache.invocation.LegacyInvocationContext; -import org.jboss.cache.mock.MockNodesFixture; -import org.jboss.cache.mock.NodeSpiMock; -import org.jgroups.stack.IpAddress; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.Collections; - -/** - * Tester class for {@link org.jboss.cache.commands.read.GravitateDataCommand} - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class GravitateDataCommandTest -{ - LegacyGravitateDataCommand command; - DataContainer containerMock; - CacheSPI spiMock; - IMocksControl control; - Fqn fqn = Fqn.fromString("/dummy"); - InvocationContext ctx; - BuddyFqnTransformer fqnTransformer = new BuddyFqnTransformer(); - - @BeforeMethod - public void setUp() - { - control = createStrictControl(); - containerMock = control.createMock(DataContainer.class); - spiMock = control.createMock(CacheSPI.class); - command = new LegacyGravitateDataCommand(fqn, true, new IpAddress()); - command.initialize(containerMock, spiMock, new BuddyFqnTransformer()); - ctx = new LegacyInvocationContext(containerMock); - } - - public void testNonexistentNode() - { - command.setSearchSubtrees(false); - expect(spiMock.getNode(fqn)).andReturn(null); - control.replay(); - assert GravitateResult.noDataFound().equals(command.perform(ctx)); - } - - public void testExistentNodeInTheCache() - { - MockNodesFixture nodes = new MockNodesFixture(); - command.setSearchSubtrees(false); - - expect(spiMock.getNode(fqn)).andReturn(nodes.adfNode); - ArrayList arrayList = new ArrayList(); - expect(containerMock.buildNodeData(Collections.EMPTY_LIST, nodes.adfNode, false)).andReturn(arrayList); - control.replay(); - GravitateResult result = (GravitateResult) command.perform(ctx); - control.verify(); - - assert result != null; - assert result.getNodeData() == arrayList; - } - - public void testNodeDoesExistsInBackupAndNoDead() - { - MockNodesFixture nodes = new MockNodesFixture(); - expect(spiMock.getNode(fqn)).andReturn(null); - expect(containerMock.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN)).andReturn(nodes.abNode); - - Fqn firstSearch = Fqn.fromString(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN + "/c/dummy"); - expect(spiMock.getNode(firstSearch)).andReturn(nodes.abcNode); - - ArrayList listReference = new ArrayList(); - expect(containerMock.buildNodeData(Collections.EMPTY_LIST, nodes.abcNode, false)).andReturn(listReference); - - control.replay(); - GravitateResult result = (GravitateResult) command.perform(ctx); - assert result.getNodeData() == listReference; - control.verify(); - } - - public void testNodeDoesNotExistsInBackupAndNoDead() - { - MockNodesFixture nodes = new MockNodesFixture(); - expect(spiMock.getNode(fqn)).andReturn(null); - expect(containerMock.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN)).andReturn(nodes.adfNode); - - control.checkOrder(false); - Fqn firstSearch = Fqn.fromString(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN + "/g/dummy"); - expect(spiMock.getNode(firstSearch)).andReturn(null); - Fqn secondSearch = Fqn.fromString(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN + "/h/dummy"); - expect(spiMock.getNode(secondSearch)).andReturn(null); - control.checkOrder(true); - - control.replay(); - assert GravitateResult.noDataFound().equals(command.perform(ctx)); - control.verify(); - } - - public void testDeadBeackup() throws Exception - { - NodeSpiMock root = new NodeSpiMock(Fqn.ROOT); - - //add first dead child - IpAddress firstAddress = new IpAddress("127.0.0.1", 1234); - NodeSpiMock firstDeadNode = (NodeSpiMock) root.addChildDirect(fqnTransformer.getDeadBackupRoot(firstAddress)); - firstDeadNode.addChildDirect(Fqn.fromElements(0)); - firstDeadNode.addChildDirect(Fqn.fromElements(1)); - firstDeadNode.addChildDirect(Fqn.fromElements(2)); - - //add second dead child - IpAddress secondAddress = new IpAddress("127.0.0.1", 4321); - NodeSpiMock secondDeadNode = (NodeSpiMock) root.addChildDirect(fqnTransformer.getDeadBackupRoot(secondAddress)); - secondDeadNode.addChildDirect(Fqn.fromElements(0)); - - - expect(spiMock.getNode(fqn)).andReturn(null); - NodeSPI buddyBackupRoot = (NodeSPI) root.getChild(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); - expect(containerMock.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN)).andReturn(buddyBackupRoot); - - control.checkOrder(false); - expect(spiMock.getChildrenNames(firstDeadNode.getFqn())).andReturn(firstDeadNode.getChildrenNames()); - Object fqnElement = fqn.getLastElement();//this is only composed from one element - expect(spiMock.peek(Fqn.fromRelativeElements(firstDeadNode.getFqn(), 0, fqnElement), false)).andReturn(null); - expect(spiMock.peek(Fqn.fromRelativeElements(firstDeadNode.getFqn(), 1, fqnElement), false)).andReturn(null); - expect(spiMock.peek(Fqn.fromRelativeElements(firstDeadNode.getFqn(), 2, fqnElement), false)).andReturn(null); - - expect(spiMock.getChildrenNames(secondDeadNode.getFqn())).andReturn(secondDeadNode.getChildrenNames()); - expect(spiMock.peek(Fqn.fromRelativeElements(secondDeadNode.getFqn(), 0, fqnElement), false)).andReturn(null); - control.checkOrder(true); - - control.replay(); - assert GravitateResult.noDataFound().equals(command.perform(ctx)); - control.verify(); - } -} +package org.jboss.cache.commands.legacy.read; + +import static org.easymock.EasyMock.createStrictControl; +import static org.easymock.EasyMock.expect; +import org.easymock.IMocksControl; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.DataContainer; +import org.jboss.cache.Fqn; +import org.jboss.cache.InvocationContext; +import org.jboss.cache.NodeSPI; +import org.jboss.cache.buddyreplication.BuddyFqnTransformer; +import org.jboss.cache.buddyreplication.BuddyManager; +import org.jboss.cache.buddyreplication.GravitateResult; +import org.jboss.cache.invocation.LegacyInvocationContext; +import org.jboss.cache.mock.MockNodesFixture; +import org.jboss.cache.mock.NodeSpiMock; +import org.jgroups.stack.IpAddress; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.Collections; + +/** + * Tester class for {@link org.jboss.cache.commands.read.GravitateDataCommand} + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.legacy.read.GravitateDataCommandTest") +public class GravitateDataCommandTest +{ + LegacyGravitateDataCommand command; + DataContainer containerMock; + CacheSPI spiMock; + IMocksControl control; + Fqn fqn = Fqn.fromString("/dummy"); + InvocationContext ctx; + BuddyFqnTransformer fqnTransformer = new BuddyFqnTransformer(); + + @BeforeMethod + public void setUp() + { + control = createStrictControl(); + containerMock = control.createMock(DataContainer.class); + spiMock = control.createMock(CacheSPI.class); + command = new LegacyGravitateDataCommand(fqn, true, new IpAddress()); + command.initialize(containerMock, spiMock, new BuddyFqnTransformer()); + ctx = new LegacyInvocationContext(containerMock); + } + + public void testNonexistentNode() + { + command.setSearchSubtrees(false); + expect(spiMock.getNode(fqn)).andReturn(null); + control.replay(); + assert GravitateResult.noDataFound().equals(command.perform(ctx)); + } + + public void testExistentNodeInTheCache() + { + MockNodesFixture nodes = new MockNodesFixture(); + command.setSearchSubtrees(false); + + expect(spiMock.getNode(fqn)).andReturn(nodes.adfNode); + ArrayList arrayList = new ArrayList(); + expect(containerMock.buildNodeData(Collections.EMPTY_LIST, nodes.adfNode, false)).andReturn(arrayList); + control.replay(); + GravitateResult result = (GravitateResult) command.perform(ctx); + control.verify(); + + assert result != null; + assert result.getNodeData() == arrayList; + } + + public void testNodeDoesExistsInBackupAndNoDead() + { + MockNodesFixture nodes = new MockNodesFixture(); + expect(spiMock.getNode(fqn)).andReturn(null); + expect(containerMock.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN)).andReturn(nodes.abNode); + + Fqn firstSearch = Fqn.fromString(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN + "/c/dummy"); + expect(spiMock.getNode(firstSearch)).andReturn(nodes.abcNode); + + ArrayList listReference = new ArrayList(); + expect(containerMock.buildNodeData(Collections.EMPTY_LIST, nodes.abcNode, false)).andReturn(listReference); + + control.replay(); + GravitateResult result = (GravitateResult) command.perform(ctx); + assert result.getNodeData() == listReference; + control.verify(); + } + + public void testNodeDoesNotExistsInBackupAndNoDead() + { + MockNodesFixture nodes = new MockNodesFixture(); + expect(spiMock.getNode(fqn)).andReturn(null); + expect(containerMock.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN)).andReturn(nodes.adfNode); + + control.checkOrder(false); + Fqn firstSearch = Fqn.fromString(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN + "/g/dummy"); + expect(spiMock.getNode(firstSearch)).andReturn(null); + Fqn secondSearch = Fqn.fromString(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN + "/h/dummy"); + expect(spiMock.getNode(secondSearch)).andReturn(null); + control.checkOrder(true); + + control.replay(); + assert GravitateResult.noDataFound().equals(command.perform(ctx)); + control.verify(); + } + + public void testDeadBeackup() throws Exception + { + NodeSpiMock root = new NodeSpiMock(Fqn.ROOT); + + //add first dead child + IpAddress firstAddress = new IpAddress("127.0.0.1", 1234); + NodeSpiMock firstDeadNode = (NodeSpiMock) root.addChildDirect(fqnTransformer.getDeadBackupRoot(firstAddress)); + firstDeadNode.addChildDirect(Fqn.fromElements(0)); + firstDeadNode.addChildDirect(Fqn.fromElements(1)); + firstDeadNode.addChildDirect(Fqn.fromElements(2)); + + //add second dead child + IpAddress secondAddress = new IpAddress("127.0.0.1", 4321); + NodeSpiMock secondDeadNode = (NodeSpiMock) root.addChildDirect(fqnTransformer.getDeadBackupRoot(secondAddress)); + secondDeadNode.addChildDirect(Fqn.fromElements(0)); + + + expect(spiMock.getNode(fqn)).andReturn(null); + NodeSPI buddyBackupRoot = (NodeSPI) root.getChild(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); + expect(containerMock.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN)).andReturn(buddyBackupRoot); + + control.checkOrder(false); + expect(spiMock.getChildrenNames(firstDeadNode.getFqn())).andReturn(firstDeadNode.getChildrenNames()); + Object fqnElement = fqn.getLastElement();//this is only composed from one element + expect(spiMock.peek(Fqn.fromRelativeElements(firstDeadNode.getFqn(), 0, fqnElement), false)).andReturn(null); + expect(spiMock.peek(Fqn.fromRelativeElements(firstDeadNode.getFqn(), 1, fqnElement), false)).andReturn(null); + expect(spiMock.peek(Fqn.fromRelativeElements(firstDeadNode.getFqn(), 2, fqnElement), false)).andReturn(null); + + expect(spiMock.getChildrenNames(secondDeadNode.getFqn())).andReturn(secondDeadNode.getChildrenNames()); + expect(spiMock.peek(Fqn.fromRelativeElements(secondDeadNode.getFqn(), 0, fqnElement), false)).andReturn(null); + control.checkOrder(true); + + control.replay(); + assert GravitateResult.noDataFound().equals(command.perform(ctx)); + control.verify(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/ClearDataCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/ClearDataCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/ClearDataCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,102 +1,102 @@ -package org.jboss.cache.commands.legacy.write; - -import static org.easymock.EasyMock.expect; -import org.jboss.cache.commands.write.AbstractVersionedDataCommand; -import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; -import org.jboss.cache.notifications.event.NodeModifiedEvent; -import org.testng.annotations.Test; - -import java.util.Collections; - -/** - * tester class for {@link org.jboss.cache.commands.write.ClearDataCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class ClearDataCommandTest extends AbstractVersionedDataCommandTest -{ - - PessClearDataCommand command; - - public AbstractVersionedDataCommand moreSetUp() - { - command = new PessClearDataCommand(globalTransaction, fqn); - command.setDataVersion(dataVersion); - return command; - } - - public void testNonexistentNode() - { - // will happen twice - once in the Pess subclass. - expect(container.peek(fqn)).andReturn(null); - expect(container.peek(fqn)).andReturn(null); - control.replay(); - assert null == command.perform(ctx); - control.verify(); - } - - public void testExistentDataVersioned() - { - nodes.adfgNode.put("key", "value"); - nodes.adfgNode.setVersion(dataVersion); - // will happen twice - once in the Pess subclass. - expect(container.peek(fqn)).andReturn(nodes.adfgNode); - expect(container.peek(fqn)).andReturn(nodes.adfgNode); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, nodes.adfgNode.getDataDirect(), ctx); - notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, Collections.EMPTY_MAP, ctx); - control.replay(); - assert null == command.perform(ctx); - assert nodes.adfgNode.getData().isEmpty(); - control.verify(); - - //now do a rollback - control.reset(); - expect(container.peek(fqn, false, true)).andReturn(nodes.aNode); - control.replay(); - command.rollback(); - assert nodes.aNode.dataSize() == 1; - assert nodes.aNode.getData().get("key").equals("value"); - } - - public void testExistentDataUnversioned() - { - command.setDataVersion(null); - nodes.adfgNode.put("key", "value"); - // will happen twice - once in the Pess subclass. - expect(container.peek(fqn)).andReturn(nodes.adfgNode); - expect(container.peek(fqn)).andReturn(nodes.adfgNode); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, nodes.adfgNode.getDataDirect(), ctx); - notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, Collections.EMPTY_MAP, ctx); - control.replay(); - assert null == command.perform(ctx); - assert nodes.adfgNode.getData().isEmpty(); - control.verify(); - - //now do a rollback - control.reset(); - expect(container.peek(fqn, false, true)).andReturn(nodes.aNode); - control.replay(); - command.rollback(); - assert nodes.aNode.dataSize() == 1; - assert nodes.aNode.getData().get("key").equals("value"); - } - - /** - * If clearing data on an inexistent node, the rollback should not fail - */ - public void testNoOpRollback() - { - expect(container.peek(fqn, false, true)).andReturn(null); - control.replay(); - try - { - command.rollback(); - } - catch (Exception e) - { - assert false : "should not fail but expect this scenarion"; - } - } -} +package org.jboss.cache.commands.legacy.write; + +import static org.easymock.EasyMock.expect; +import org.jboss.cache.commands.write.AbstractVersionedDataCommand; +import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; +import org.jboss.cache.notifications.event.NodeModifiedEvent; +import org.testng.annotations.Test; + +import java.util.Collections; + +/** + * tester class for {@link org.jboss.cache.commands.write.ClearDataCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.legacy.write.ClearDataCommandTest") +public class ClearDataCommandTest extends AbstractVersionedDataCommandTest +{ + + PessClearDataCommand command; + + public AbstractVersionedDataCommand moreSetUp() + { + command = new PessClearDataCommand(globalTransaction, fqn); + command.setDataVersion(dataVersion); + return command; + } + + public void testNonexistentNode() + { + // will happen twice - once in the Pess subclass. + expect(container.peek(fqn)).andReturn(null); + expect(container.peek(fqn)).andReturn(null); + control.replay(); + assert null == command.perform(ctx); + control.verify(); + } + + public void testExistentDataVersioned() + { + nodes.adfgNode.put("key", "value"); + nodes.adfgNode.setVersion(dataVersion); + // will happen twice - once in the Pess subclass. + expect(container.peek(fqn)).andReturn(nodes.adfgNode); + expect(container.peek(fqn)).andReturn(nodes.adfgNode); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, nodes.adfgNode.getDataDirect(), ctx); + notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, Collections.EMPTY_MAP, ctx); + control.replay(); + assert null == command.perform(ctx); + assert nodes.adfgNode.getData().isEmpty(); + control.verify(); + + //now do a rollback + control.reset(); + expect(container.peek(fqn, false, true)).andReturn(nodes.aNode); + control.replay(); + command.rollback(); + assert nodes.aNode.dataSize() == 1; + assert nodes.aNode.getData().get("key").equals("value"); + } + + public void testExistentDataUnversioned() + { + command.setDataVersion(null); + nodes.adfgNode.put("key", "value"); + // will happen twice - once in the Pess subclass. + expect(container.peek(fqn)).andReturn(nodes.adfgNode); + expect(container.peek(fqn)).andReturn(nodes.adfgNode); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, nodes.adfgNode.getDataDirect(), ctx); + notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, Collections.EMPTY_MAP, ctx); + control.replay(); + assert null == command.perform(ctx); + assert nodes.adfgNode.getData().isEmpty(); + control.verify(); + + //now do a rollback + control.reset(); + expect(container.peek(fqn, false, true)).andReturn(nodes.aNode); + control.replay(); + command.rollback(); + assert nodes.aNode.dataSize() == 1; + assert nodes.aNode.getData().get("key").equals("value"); + } + + /** + * If clearing data on an inexistent node, the rollback should not fail + */ + public void testNoOpRollback() + { + expect(container.peek(fqn, false, true)).andReturn(null); + control.replay(); + try + { + command.rollback(); + } + catch (Exception e) + { + assert false : "should not fail but expect this scenarion"; + } + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/CreateNodeCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/CreateNodeCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/CreateNodeCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,73 +1,73 @@ -package org.jboss.cache.commands.legacy.write; - -import static org.easymock.EasyMock.*; -import org.jboss.cache.commands.read.AbstractDataCommandTest; -import org.jboss.cache.mock.MockNodesFixture; -import org.testng.annotations.Test; - -import java.util.ArrayList; - -/** - * Tester class for {@link CreateNodeCommand} - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class CreateNodeCommandTest extends AbstractDataCommandTest -{ - CreateNodeCommand command; - private Object[] result; - private ArrayList createdNodes; - - protected void moreSetup() - { - command = new CreateNodeCommand(testFqn); - command.initialize(container); - createdNodes = new ArrayList(); - result = new Object[2]; - result[0] = this.createdNodes; - } - - public void testPerformNoNodesCreated() - { - expect(container.createNodes(testFqn)).andReturn(result); - replay(container); - assert null == command.perform(ctx); - assert command.getNewlyCreated().isEmpty(); - } - - public void testPerformWithCreatedNodes() - { - MockNodesFixture nodes = new MockNodesFixture(); - createdNodes.add(nodes.aNode); - createdNodes.add(nodes.abNode); - createdNodes.add(nodes.abcNode); - result[1] = nodes.abcNode; - - expect(container.createNodes(testFqn)).andReturn(result); - replay(container); - assert nodes.abcNode == command.perform(ctx); - assert command.getNewlyCreated().size() == 3; - assert command.getNewlyCreated().contains(nodes.a); - assert command.getNewlyCreated().contains(nodes.ab); - assert command.getNewlyCreated().contains(nodes.abc); - } - - public void testRollback() - { - MockNodesFixture nodes = new MockNodesFixture(); - createdNodes.add(nodes.aNode); - createdNodes.add(nodes.abNode); - createdNodes.add(nodes.abcNode); - expect(container.createNodes(testFqn)).andReturn(result); - expect(container.removeFromDataStructure(nodes.a, true)).andReturn(Boolean.TRUE); - expect(container.removeFromDataStructure(nodes.ab, true)).andReturn(Boolean.TRUE); - expect(container.removeFromDataStructure(nodes.abc, true)).andReturn(Boolean.TRUE); - replay(container); - command.perform(ctx); - command.rollback(); - verify(container); - } - -} +package org.jboss.cache.commands.legacy.write; + +import static org.easymock.EasyMock.*; +import org.jboss.cache.commands.read.AbstractDataCommandTest; +import org.jboss.cache.mock.MockNodesFixture; +import org.testng.annotations.Test; + +import java.util.ArrayList; + +/** + * Tester class for {@link CreateNodeCommand} + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.legacy.write.CreateNodeCommandTest") +public class CreateNodeCommandTest extends AbstractDataCommandTest +{ + CreateNodeCommand command; + private Object[] result; + private ArrayList createdNodes; + + protected void moreSetup() + { + command = new CreateNodeCommand(testFqn); + command.initialize(container); + createdNodes = new ArrayList(); + result = new Object[2]; + result[0] = this.createdNodes; + } + + public void testPerformNoNodesCreated() + { + expect(container.createNodes(testFqn)).andReturn(result); + replay(container); + assert null == command.perform(ctx); + assert command.getNewlyCreated().isEmpty(); + } + + public void testPerformWithCreatedNodes() + { + MockNodesFixture nodes = new MockNodesFixture(); + createdNodes.add(nodes.aNode); + createdNodes.add(nodes.abNode); + createdNodes.add(nodes.abcNode); + result[1] = nodes.abcNode; + + expect(container.createNodes(testFqn)).andReturn(result); + replay(container); + assert nodes.abcNode == command.perform(ctx); + assert command.getNewlyCreated().size() == 3; + assert command.getNewlyCreated().contains(nodes.a); + assert command.getNewlyCreated().contains(nodes.ab); + assert command.getNewlyCreated().contains(nodes.abc); + } + + public void testRollback() + { + MockNodesFixture nodes = new MockNodesFixture(); + createdNodes.add(nodes.aNode); + createdNodes.add(nodes.abNode); + createdNodes.add(nodes.abcNode); + expect(container.createNodes(testFqn)).andReturn(result); + expect(container.removeFromDataStructure(nodes.a, true)).andReturn(Boolean.TRUE); + expect(container.removeFromDataStructure(nodes.ab, true)).andReturn(Boolean.TRUE); + expect(container.removeFromDataStructure(nodes.abc, true)).andReturn(Boolean.TRUE); + replay(container); + command.perform(ctx); + command.rollback(); + verify(container); + } + +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/PutKeyValueCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/PutKeyValueCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/PutKeyValueCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,96 +1,96 @@ -package org.jboss.cache.commands.legacy.write; - -import static org.easymock.EasyMock.expect; -import org.jboss.cache.NodeNotExistsException; -import org.jboss.cache.commands.write.AbstractVersionedDataCommand; -import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; -import org.jboss.cache.notifications.event.NodeModifiedEvent; -import org.testng.annotations.Test; - -import java.util.HashMap; -import java.util.Map; - -/** - * tester class for {@link org.jboss.cache.commands.write.PutKeyValueCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class PutKeyValueCommandTest extends AbstractVersionedDataCommandTest -{ - PessPutForExternalReadCommand command; - - public AbstractVersionedDataCommand moreSetUp() - { - command = new PessPutForExternalReadCommand(globalTransaction, fqn, "k", "v"); - return command; - } - - public void testInexistentNode() - { - expect(container.peek(fqn)).andReturn(null); // simulate node not existing. - control.replay(); - try - { - command.perform(ctx); - assert false : "exception should have been thrown as data does not exists."; - } - catch (NodeNotExistsException e) - { - //expected - } - control.verify(); - } - - public void testAddNewData() - { - nodes.adfNode.put("existingKey", "existingValue"); - expect(container.peek(fqn)).andReturn(nodes.adfNode); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, nodes.adfNode.getDataDirect(), ctx); - Map expected = new HashMap(); - expected.put("k", "v"); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.PUT_DATA, expected, ctx); - control.replay(); - assert null == command.perform(ctx) : "no pre existing value"; - assert nodes.adfNode.getData().size() == 2; - assert "v".equals(nodes.adfNode.getData().get("k")); - assert "existingValue".equals(nodes.adfNode.getData().get("existingKey")); - control.verify(); - - control.reset(); - expect(container.peek(fqn, false, false)).andReturn(nodes.adfNode); - control.replay(); - command.rollback(); - assert nodes.adfNode.getData().size() == 1; - assert "existingValue".equals(nodes.adfNode.getData().get("existingKey")); - control.verify(); - } - - public void testOverWriteData() - { - nodes.adfNode.put("k", "oldValue"); - expect(container.peek(fqn)).andReturn(nodes.adfNode); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, nodes.adfNode.getDataDirect(), ctx); - Map expected = new HashMap(); - expected.put("k", "v"); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.PUT_DATA, expected, ctx); - control.replay(); - assert "oldValue".equals(command.perform(ctx)) : "no pre existing value"; - assert nodes.adfNode.getData().size() == 1; - assert "v".equals(nodes.adfNode.getData().get("k")); - control.verify(); - - control.reset(); - expect(container.peek(fqn, false, false)).andReturn(nodes.adfNode); - control.replay(); - command.rollback(); - assert nodes.adfNode.getData().size() == 1; - assert "oldValue".equals(nodes.adfNode.getData().get("k")); - control.verify(); - } -} +package org.jboss.cache.commands.legacy.write; + +import static org.easymock.EasyMock.expect; +import org.jboss.cache.NodeNotExistsException; +import org.jboss.cache.commands.write.AbstractVersionedDataCommand; +import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; +import org.jboss.cache.notifications.event.NodeModifiedEvent; +import org.testng.annotations.Test; + +import java.util.HashMap; +import java.util.Map; + +/** + * tester class for {@link org.jboss.cache.commands.write.PutKeyValueCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.legacy.write.PutKeyValueCommandTest") +public class PutKeyValueCommandTest extends AbstractVersionedDataCommandTest +{ + PessPutForExternalReadCommand command; + + public AbstractVersionedDataCommand moreSetUp() + { + command = new PessPutForExternalReadCommand(globalTransaction, fqn, "k", "v"); + return command; + } + + public void testInexistentNode() + { + expect(container.peek(fqn)).andReturn(null); // simulate node not existing. + control.replay(); + try + { + command.perform(ctx); + assert false : "exception should have been thrown as data does not exists."; + } + catch (NodeNotExistsException e) + { + //expected + } + control.verify(); + } + + public void testAddNewData() + { + nodes.adfNode.put("existingKey", "existingValue"); + expect(container.peek(fqn)).andReturn(nodes.adfNode); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, nodes.adfNode.getDataDirect(), ctx); + Map expected = new HashMap(); + expected.put("k", "v"); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.PUT_DATA, expected, ctx); + control.replay(); + assert null == command.perform(ctx) : "no pre existing value"; + assert nodes.adfNode.getData().size() == 2; + assert "v".equals(nodes.adfNode.getData().get("k")); + assert "existingValue".equals(nodes.adfNode.getData().get("existingKey")); + control.verify(); + + control.reset(); + expect(container.peek(fqn, false, false)).andReturn(nodes.adfNode); + control.replay(); + command.rollback(); + assert nodes.adfNode.getData().size() == 1; + assert "existingValue".equals(nodes.adfNode.getData().get("existingKey")); + control.verify(); + } + + public void testOverWriteData() + { + nodes.adfNode.put("k", "oldValue"); + expect(container.peek(fqn)).andReturn(nodes.adfNode); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, nodes.adfNode.getDataDirect(), ctx); + Map expected = new HashMap(); + expected.put("k", "v"); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.PUT_DATA, expected, ctx); + control.replay(); + assert "oldValue".equals(command.perform(ctx)) : "no pre existing value"; + assert nodes.adfNode.getData().size() == 1; + assert "v".equals(nodes.adfNode.getData().get("k")); + control.verify(); + + control.reset(); + expect(container.peek(fqn, false, false)).andReturn(nodes.adfNode); + control.replay(); + command.rollback(); + assert nodes.adfNode.getData().size() == 1; + assert "oldValue".equals(nodes.adfNode.getData().get("k")); + control.verify(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveKeyCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveKeyCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveKeyCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,101 +1,101 @@ -package org.jboss.cache.commands.legacy.write; - -import static org.easymock.EasyMock.expect; -import org.jboss.cache.commands.write.AbstractVersionedDataCommand; -import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; -import org.jboss.cache.notifications.event.NodeModifiedEvent; -import org.testng.annotations.Test; - -import java.util.HashMap; -import java.util.Map; - -/** - * tester class for {@link org.jboss.cache.commands.write.RemoveKeyCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class RemoveKeyCommandTest extends AbstractVersionedDataCommandTest -{ - PessRemoveKeyCommand command; - private String key; - - public AbstractVersionedDataCommand moreSetUp() - { - key = "key"; - command = new PessRemoveKeyCommand(globalTransaction, fqn, key); - return command; - } - - public void testNonexistentNode() - { - expect(container.peek(fqn)).andReturn(null); - control.replay(); - assert null == command.perform(ctx); - control.verify(); - } - - public void testRemoveNonexistentPair() - { - Map expected = new HashMap(); - expected.put("newKey", "newValue"); - nodes.adfgNode.putAll(expected); - expect(container.peek(fqn)).andReturn(nodes.adfgNode); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); - expected = new HashMap(); - expected.put(key, null); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); - control.replay(); - assert null == command.perform(ctx); - assert nodes.adfgNode.getData().size() == 1; - assert "newValue".equals(nodes.adfgNode.getData().get("newKey")); - control.verify(); - - control.reset(); - // won't do the peek if the oldValue was null. Nothing to set anyway, why peek. -// expect(container.peek(fqn, false, true)).andReturn(nodes.adfgNode); - control.replay(); - command.rollback(); - assert nodes.adfgNode.getData().size() == 1; - assert "newValue".equals(nodes.adfgNode.getData().get("newKey")); - control.verify(); - } - - public void testRemoveExistentPair() - { - Map expected = new HashMap(); - expected.put(key, "newValue"); - nodes.adfgNode.putAll(expected); - expect(container.peek(fqn)).andReturn(nodes.adfgNode); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); - expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); - notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); - control.replay(); - assert "newValue" == command.perform(ctx); - assert nodes.adfgNode.getData().get(key) == null; - control.verify(); - - control.reset(); - expect(container.peek(fqn, false, true)).andReturn(nodes.adfgNode); - control.replay(); - command.rollback(); - assert nodes.adfgNode.getData().size() == 1; - assert "newValue".equals(nodes.adfgNode.getData().get(key)); - control.verify(); - } - - /** - * On an no-op scenario the user will try to remove a key on an unexisting node. - * When rollback is being called, the node might not exist in the cache and we should know how to handle that. - */ - public void testRollbackOnNoOp() - { - expect(container.peek(fqn, false, true)).andReturn(null); - control.replay(); - command.rollback(); - } -} +package org.jboss.cache.commands.legacy.write; + +import static org.easymock.EasyMock.expect; +import org.jboss.cache.commands.write.AbstractVersionedDataCommand; +import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; +import org.jboss.cache.notifications.event.NodeModifiedEvent; +import org.testng.annotations.Test; + +import java.util.HashMap; +import java.util.Map; + +/** + * tester class for {@link org.jboss.cache.commands.write.RemoveKeyCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.legacy.write.RemoveKeyCommandTest") +public class RemoveKeyCommandTest extends AbstractVersionedDataCommandTest +{ + PessRemoveKeyCommand command; + private String key; + + public AbstractVersionedDataCommand moreSetUp() + { + key = "key"; + command = new PessRemoveKeyCommand(globalTransaction, fqn, key); + return command; + } + + public void testNonexistentNode() + { + expect(container.peek(fqn)).andReturn(null); + control.replay(); + assert null == command.perform(ctx); + control.verify(); + } + + public void testRemoveNonexistentPair() + { + Map expected = new HashMap(); + expected.put("newKey", "newValue"); + nodes.adfgNode.putAll(expected); + expect(container.peek(fqn)).andReturn(nodes.adfgNode); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); + expected = new HashMap(); + expected.put(key, null); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); + control.replay(); + assert null == command.perform(ctx); + assert nodes.adfgNode.getData().size() == 1; + assert "newValue".equals(nodes.adfgNode.getData().get("newKey")); + control.verify(); + + control.reset(); + // won't do the peek if the oldValue was null. Nothing to set anyway, why peek. +// expect(container.peek(fqn, false, true)).andReturn(nodes.adfgNode); + control.replay(); + command.rollback(); + assert nodes.adfgNode.getData().size() == 1; + assert "newValue".equals(nodes.adfgNode.getData().get("newKey")); + control.verify(); + } + + public void testRemoveExistentPair() + { + Map expected = new HashMap(); + expected.put(key, "newValue"); + nodes.adfgNode.putAll(expected); + expect(container.peek(fqn)).andReturn(nodes.adfgNode); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); + expect(notifier.shouldNotifyOnNodeModified()).andReturn(true); + notifier.notifyNodeModified(fqn, false, NodeModifiedEvent.ModificationType.REMOVE_DATA, expected, ctx); + control.replay(); + assert "newValue" == command.perform(ctx); + assert nodes.adfgNode.getData().get(key) == null; + control.verify(); + + control.reset(); + expect(container.peek(fqn, false, true)).andReturn(nodes.adfgNode); + control.replay(); + command.rollback(); + assert nodes.adfgNode.getData().size() == 1; + assert "newValue".equals(nodes.adfgNode.getData().get(key)); + control.verify(); + } + + /** + * On an no-op scenario the user will try to remove a key on an unexisting node. + * When rollback is being called, the node might not exist in the cache and we should know how to handle that. + */ + public void testRollbackOnNoOp() + { + expect(container.peek(fqn, false, true)).andReturn(null); + control.replay(); + command.rollback(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveNodeCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveNodeCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/legacy/write/RemoveNodeCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,96 +1,96 @@ -package org.jboss.cache.commands.legacy.write; - -import static org.easymock.EasyMock.expect; -import org.jboss.cache.commands.write.AbstractVersionedDataCommand; -import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; -import org.jboss.cache.transaction.GlobalTransaction; -import org.testng.annotations.Test; - -/** - * tester for {@link org.jboss.cache.commands.write.RemoveNodeCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class RemoveNodeCommandTest extends AbstractVersionedDataCommandTest -{ - PessRemoveNodeCommand command; - - public AbstractVersionedDataCommand moreSetUp() - { - command = new PessRemoveNodeCommand(globalTransaction, fqn); - command.setDataVersion(dataVersion); - return command; - } - - public void testNonExistentNode() - { - expect(container.peek(fqn)).andReturn(null); - // again - expect(container.peek(fqn)).andReturn(null); - control.replay(); - assert Boolean.FALSE == command.perform(ctx) : "nonexistent node was not remove; false expected"; - } - - public void testRemovalNoNotificationsValidNode() - { - //aditional setup - command.setSkipSendingNodeEvents(true); //no notification - nodes.adfNode.put("akey", "avalue"); - nodes.adfNode.setVersion(dataVersion); - ctx.setGlobalTransaction(new GlobalTransaction()); - - //check perform - expect(container.peek(fqn)).andReturn(nodes.adfNode); - // again - expect(container.peek(fqn)).andReturn(nodes.adfNode); - control.replay(); - assert Boolean.TRUE == command.perform(ctx); - assert nodes.adfgNode.isDeleted(); - assert nodes.adfhNode.isDeleted(); - assert command.originalData != null; - control.verify(); - - //check rollback - control.reset(); - nodes.adNode.removeChild("f"); - expect(container.peek(nodes.ad)).andReturn(nodes.adNode); - control.replay(); - command.rollback(); - assert nodes.adNode.hasChild("f"); - } - - public void testRemovalNoNotificationsInvalidNode() - { - command.setSkipSendingNodeEvents(true); //no notification - nodes.adfNode.setValid(false, false); //invalid node - nodes.adfNode.setVersion(dataVersion); - - expect(container.peek(fqn)).andReturn(nodes.adfNode); - // again - expect(container.peek(fqn)).andReturn(nodes.adfNode); - control.replay(); - assert Boolean.FALSE == command.perform(ctx); - assert nodes.adfgNode.isDeleted(); - assert nodes.adfhNode.isDeleted(); - control.verify(); - } - - public void testRemovalWithNotificationsInvalidNode() - { - nodes.adfNode.setValid(false, false); //invalid node - nodes.adfNode.setVersion(dataVersion); - - expect(container.peek(fqn)).andReturn(nodes.adfNode); - // again - expect(container.peek(fqn)).andReturn(nodes.adfNode); - notifier.notifyNodeRemoved(fqn, true, nodes.adfNode.getDataDirect(), ctx); - notifier.notifyNodeRemoved(fqn, false, null, ctx); - control.replay(); - assert Boolean.FALSE == command.perform(ctx); - assert nodes.adfgNode.isDeleted(); - assert nodes.adfhNode.isDeleted(); - control.verify(); - } -} +package org.jboss.cache.commands.legacy.write; + +import static org.easymock.EasyMock.expect; +import org.jboss.cache.commands.write.AbstractVersionedDataCommand; +import org.jboss.cache.commands.write.AbstractVersionedDataCommandTest; +import org.jboss.cache.transaction.GlobalTransaction; +import org.testng.annotations.Test; + +/** + * tester for {@link org.jboss.cache.commands.write.RemoveNodeCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.legacy.write.RemoveNodeCommandTest") +public class RemoveNodeCommandTest extends AbstractVersionedDataCommandTest +{ + PessRemoveNodeCommand command; + + public AbstractVersionedDataCommand moreSetUp() + { + command = new PessRemoveNodeCommand(globalTransaction, fqn); + command.setDataVersion(dataVersion); + return command; + } + + public void testNonExistentNode() + { + expect(container.peek(fqn)).andReturn(null); + // again + expect(container.peek(fqn)).andReturn(null); + control.replay(); + assert Boolean.FALSE == command.perform(ctx) : "nonexistent node was not remove; false expected"; + } + + public void testRemovalNoNotificationsValidNode() + { + //aditional setup + command.setSkipSendingNodeEvents(true); //no notification + nodes.adfNode.put("akey", "avalue"); + nodes.adfNode.setVersion(dataVersion); + ctx.setGlobalTransaction(new GlobalTransaction()); + + //check perform + expect(container.peek(fqn)).andReturn(nodes.adfNode); + // again + expect(container.peek(fqn)).andReturn(nodes.adfNode); + control.replay(); + assert Boolean.TRUE == command.perform(ctx); + assert nodes.adfgNode.isDeleted(); + assert nodes.adfhNode.isDeleted(); + assert command.originalData != null; + control.verify(); + + //check rollback + control.reset(); + nodes.adNode.removeChild("f"); + expect(container.peek(nodes.ad)).andReturn(nodes.adNode); + control.replay(); + command.rollback(); + assert nodes.adNode.hasChild("f"); + } + + public void testRemovalNoNotificationsInvalidNode() + { + command.setSkipSendingNodeEvents(true); //no notification + nodes.adfNode.setValid(false, false); //invalid node + nodes.adfNode.setVersion(dataVersion); + + expect(container.peek(fqn)).andReturn(nodes.adfNode); + // again + expect(container.peek(fqn)).andReturn(nodes.adfNode); + control.replay(); + assert Boolean.FALSE == command.perform(ctx); + assert nodes.adfgNode.isDeleted(); + assert nodes.adfhNode.isDeleted(); + control.verify(); + } + + public void testRemovalWithNotificationsInvalidNode() + { + nodes.adfNode.setValid(false, false); //invalid node + nodes.adfNode.setVersion(dataVersion); + + expect(container.peek(fqn)).andReturn(nodes.adfNode); + // again + expect(container.peek(fqn)).andReturn(nodes.adfNode); + notifier.notifyNodeRemoved(fqn, true, nodes.adfNode.getDataDirect(), ctx); + notifier.notifyNodeRemoved(fqn, false, null, ctx); + control.replay(); + assert Boolean.FALSE == command.perform(ctx); + assert nodes.adfgNode.isDeleted(); + assert nodes.adfhNode.isDeleted(); + control.verify(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/read/ExistsCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/read/ExistsCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/read/ExistsCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,35 +1,35 @@ -package org.jboss.cache.commands.read; - -import org.jboss.cache.InvocationContext; -import org.jboss.cache.invocation.MVCCInvocationContext; -import org.jboss.cache.mock.NodeSpiMock; -import org.testng.annotations.Test; - -/** - * Tester class for {@link org.jboss.cache.commands.read.ExistsCommand} - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit") -public class ExistsCommandTest extends AbstractDataCommandTest -{ - private ExistsCommand command; - - protected void moreSetup() - { - command = new ExistsCommand(testFqn); - command.initialize(container); - } - - public void testPerform() - { - InvocationContext ctx = new MVCCInvocationContext(); - ctx.putLookedUpNode(testFqn, null); - assert !((Boolean) command.perform(ctx)); - - ctx.putLookedUpNode(testFqn, new NodeSpiMock(testFqn)); - - assert Boolean.TRUE == command.perform(ctx); - } -} +package org.jboss.cache.commands.read; + +import org.jboss.cache.InvocationContext; +import org.jboss.cache.invocation.MVCCInvocationContext; +import org.jboss.cache.mock.NodeSpiMock; +import org.testng.annotations.Test; + +/** + * Tester class for {@link org.jboss.cache.commands.read.ExistsCommand} + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", testName = "commands.read.ExistsCommandTest") +public class ExistsCommandTest extends AbstractDataCommandTest +{ + private ExistsCommand command; + + protected void moreSetup() + { + command = new ExistsCommand(testFqn); + command.initialize(container); + } + + public void testPerform() + { + InvocationContext ctx = new MVCCInvocationContext(); + ctx.putLookedUpNode(testFqn, null); + assert !((Boolean) command.perform(ctx)); + + ctx.putLookedUpNode(testFqn, new NodeSpiMock(testFqn)); + + assert Boolean.TRUE == command.perform(ctx); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/read/GetChildrenNamesCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/read/GetChildrenNamesCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/read/GetChildrenNamesCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,67 +1,67 @@ -package org.jboss.cache.commands.read; - -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import org.jboss.cache.commands.legacy.read.PessGetChildrenNamesCommand; -import org.jboss.cache.mock.MockNodesFixture; -import org.jboss.cache.mock.NodeSpiMock; -import org.testng.annotations.Test; - -import java.util.Set; - -/** - * Tester class for {@link org.jboss.cache.commands.read.GetChildrenNamesCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class GetChildrenNamesCommandTest extends AbstractDataCommandTest -{ - private GetChildrenNamesCommand command; - private MockNodesFixture nodes; - - protected void moreSetup() - { - nodes = new MockNodesFixture(); - command = new PessGetChildrenNamesCommand(testFqn); - command.initialize(container); - } - - public void testPerformNoChildren() - { - NodeSpiMock node = new NodeSpiMock(testFqn); - expect(container.peek(testFqn)).andReturn(node); - replay(container); - Set result = (Set) command.perform(ctx); - assert result.isEmpty() : "empty result expected"; - } - - public void testPerformInexistingNode() - { - expect(container.peek(testFqn)).andReturn(null); - replay(container); - Set result = (Set) command.perform(ctx); - assert result == null : "empty result expected"; - } - - public void testNodeWithChildren() - { - expect(container.peek(testFqn)).andReturn(nodes.adfNode); - replay(container); - Set result = (Set) command.perform(ctx); - assert result.size() == 2; - assert result.contains("h"); - assert result.contains("g"); - } - - public void testNodeInvalidChildren() - { - nodes.adfgNode.markAsDeleted(true); - expect(container.peek(testFqn)).andReturn(nodes.adfNode); - replay(container); - Set result = (Set) command.perform(ctx); - assert result.size() == 1; - assert result.contains("h"); - } -} +package org.jboss.cache.commands.read; + +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import org.jboss.cache.commands.legacy.read.PessGetChildrenNamesCommand; +import org.jboss.cache.mock.MockNodesFixture; +import org.jboss.cache.mock.NodeSpiMock; +import org.testng.annotations.Test; + +import java.util.Set; + +/** + * Tester class for {@link org.jboss.cache.commands.read.GetChildrenNamesCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.read.GetChildrenNamesCommandTest") +public class GetChildrenNamesCommandTest extends AbstractDataCommandTest +{ + private GetChildrenNamesCommand command; + private MockNodesFixture nodes; + + protected void moreSetup() + { + nodes = new MockNodesFixture(); + command = new PessGetChildrenNamesCommand(testFqn); + command.initialize(container); + } + + public void testPerformNoChildren() + { + NodeSpiMock node = new NodeSpiMock(testFqn); + expect(container.peek(testFqn)).andReturn(node); + replay(container); + Set result = (Set) command.perform(ctx); + assert result.isEmpty() : "empty result expected"; + } + + public void testPerformInexistingNode() + { + expect(container.peek(testFqn)).andReturn(null); + replay(container); + Set result = (Set) command.perform(ctx); + assert result == null : "empty result expected"; + } + + public void testNodeWithChildren() + { + expect(container.peek(testFqn)).andReturn(nodes.adfNode); + replay(container); + Set result = (Set) command.perform(ctx); + assert result.size() == 2; + assert result.contains("h"); + assert result.contains("g"); + } + + public void testNodeInvalidChildren() + { + nodes.adfgNode.markAsDeleted(true); + expect(container.peek(testFqn)).andReturn(nodes.adfNode); + replay(container); + Set result = (Set) command.perform(ctx); + assert result.size() == 1; + assert result.contains("h"); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/read/GetDataMapCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/read/GetDataMapCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/read/GetDataMapCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,56 +1,56 @@ -package org.jboss.cache.commands.read; - -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import org.jboss.cache.mock.NodeSpiMock; -import org.testng.annotations.Test; - -import java.util.Map; - -/** - * Tester class for {@link GetDataMapCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class GetDataMapCommandTest extends AbstractDataCommandTest -{ - GetDataMapCommand command; - - protected void moreSetup() - { - command = new GetDataMapCommand(testFqn); - command.initialize(container); - } - - public void testForNonexistentNode() - { - expect(container.peek(testFqn)).andReturn(null); - replay(container); - assert null == command.perform(ctx); - } - - public void testForExistingNode() - { - NodeSpiMock node = new NodeSpiMock(testFqn); - node.putDirect("k1", "v1"); - node.putDirect("k2", "v2"); - expect(container.peek(testFqn)).andReturn(node); - replay(container); - Map result = (Map) command.perform(ctx); - assert 2 == result.entrySet().size(); - assert result.get("k1").equals("v1"); - assert result.get("k2").equals("v2"); - - try - { - result.put("k3", "v3"); - assert false : "map should be immutable"; - } - catch (RuntimeException ex) - { - //expected - } - } -} +package org.jboss.cache.commands.read; + +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import org.jboss.cache.mock.NodeSpiMock; +import org.testng.annotations.Test; + +import java.util.Map; + +/** + * Tester class for {@link GetDataMapCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.read.GetDataMapCommandTest") +public class GetDataMapCommandTest extends AbstractDataCommandTest +{ + GetDataMapCommand command; + + protected void moreSetup() + { + command = new GetDataMapCommand(testFqn); + command.initialize(container); + } + + public void testForNonexistentNode() + { + expect(container.peek(testFqn)).andReturn(null); + replay(container); + assert null == command.perform(ctx); + } + + public void testForExistingNode() + { + NodeSpiMock node = new NodeSpiMock(testFqn); + node.putDirect("k1", "v1"); + node.putDirect("k2", "v2"); + expect(container.peek(testFqn)).andReturn(node); + replay(container); + Map result = (Map) command.perform(ctx); + assert 2 == result.entrySet().size(); + assert result.get("k1").equals("v1"); + assert result.get("k2").equals("v2"); + + try + { + result.put("k3", "v3"); + assert false : "map should be immutable"; + } + catch (RuntimeException ex) + { + //expected + } + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeyValueCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeyValueCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeyValueCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,87 +1,87 @@ -package org.jboss.cache.commands.read; - -import static org.easymock.EasyMock.createStrictControl; -import static org.easymock.EasyMock.expect; -import org.easymock.IMocksControl; -import org.jboss.cache.DataContainer; -import org.jboss.cache.Fqn; -import org.jboss.cache.InvocationContext; -import org.jboss.cache.commands.TestContextBase; -import org.jboss.cache.mock.NodeSpiMock; -import org.jboss.cache.notifications.Notifier; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Tester class for {@link GetKeyValueCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class GetKeyValueCommandTest extends TestContextBase -{ - private IMocksControl control; - Notifier notifierMock; - DataContainer containerMock; - GetKeyValueCommand command; - Fqn fqn = Fqn.fromString("/dummy"); - String key = "key"; - InvocationContext ctx; - - @BeforeMethod - protected void setUup() - { - control = createStrictControl(); - containerMock = control.createMock(DataContainer.class); - notifierMock = control.createMock(Notifier.class); - command = new GetKeyValueCommand(fqn, key, false); - command.initialize(containerMock, notifierMock); - ctx = createLegacyInvocationContext(containerMock); - } - - public void testNonexistentNodeNoNotifications() - { - expect(containerMock.peek(fqn)).andReturn(null); - control.replay(); - assert null == command.perform(ctx); - } - - public void testExistentNodeNoNotifications() - { - NodeSpiMock node = new NodeSpiMock(fqn); - String value = "vvv"; - node.put(key, value); - expect(containerMock.peek(fqn)).andReturn(node); - control.replay(); - assert value.equals(command.perform(ctx)); - } - - /** - * Notification should only be triggered if the node exists. - */ - public void testNonexistentNodeWithNotifications() - { - command.sendNodeEvent = true; - expect(containerMock.peek(fqn)).andReturn(null); - control.replay(); - assert null == command.perform(ctx); - } - - public void testExistentNodeWithNotifications() - { - command.sendNodeEvent = true; - NodeSpiMock node = new NodeSpiMock(fqn); - String value = "vvv"; - node.put(key, value); - //not ordred because the peek hapens before notification - that is to make sure that no notification - // is sent for an nonexistent node. - control.checkOrder(false); - notifierMock.notifyNodeVisited(fqn, true, ctx); - expect(containerMock.peek(fqn)).andReturn(node); - notifierMock.notifyNodeVisited(fqn, false, ctx); - control.replay(); - assert value.equals(command.perform(ctx)); - control.verify(); - } -} +package org.jboss.cache.commands.read; + +import static org.easymock.EasyMock.createStrictControl; +import static org.easymock.EasyMock.expect; +import org.easymock.IMocksControl; +import org.jboss.cache.DataContainer; +import org.jboss.cache.Fqn; +import org.jboss.cache.InvocationContext; +import org.jboss.cache.commands.TestContextBase; +import org.jboss.cache.mock.NodeSpiMock; +import org.jboss.cache.notifications.Notifier; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Tester class for {@link GetKeyValueCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.read.GetKeyValueCommandTest") +public class GetKeyValueCommandTest extends TestContextBase +{ + private IMocksControl control; + Notifier notifierMock; + DataContainer containerMock; + GetKeyValueCommand command; + Fqn fqn = Fqn.fromString("/dummy"); + String key = "key"; + InvocationContext ctx; + + @BeforeMethod + protected void setUup() + { + control = createStrictControl(); + containerMock = control.createMock(DataContainer.class); + notifierMock = control.createMock(Notifier.class); + command = new GetKeyValueCommand(fqn, key, false); + command.initialize(containerMock, notifierMock); + ctx = createLegacyInvocationContext(containerMock); + } + + public void testNonexistentNodeNoNotifications() + { + expect(containerMock.peek(fqn)).andReturn(null); + control.replay(); + assert null == command.perform(ctx); + } + + public void testExistentNodeNoNotifications() + { + NodeSpiMock node = new NodeSpiMock(fqn); + String value = "vvv"; + node.put(key, value); + expect(containerMock.peek(fqn)).andReturn(node); + control.replay(); + assert value.equals(command.perform(ctx)); + } + + /** + * Notification should only be triggered if the node exists. + */ + public void testNonexistentNodeWithNotifications() + { + command.sendNodeEvent = true; + expect(containerMock.peek(fqn)).andReturn(null); + control.replay(); + assert null == command.perform(ctx); + } + + public void testExistentNodeWithNotifications() + { + command.sendNodeEvent = true; + NodeSpiMock node = new NodeSpiMock(fqn); + String value = "vvv"; + node.put(key, value); + //not ordred because the peek hapens before notification - that is to make sure that no notification + // is sent for an nonexistent node. + control.checkOrder(false); + notifierMock.notifyNodeVisited(fqn, true, ctx); + expect(containerMock.peek(fqn)).andReturn(node); + notifierMock.notifyNodeVisited(fqn, false, ctx); + control.replay(); + assert value.equals(command.perform(ctx)); + control.verify(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeysCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeysCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/read/GetKeysCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,47 +1,47 @@ -package org.jboss.cache.commands.read; - -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import org.jboss.cache.mock.NodeSpiMock; -import org.testng.annotations.Test; - -import java.util.Set; - -/** - * Tester class for {@link GetKeysCommand}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class GetKeysCommandTest extends AbstractDataCommandTest -{ - - GetKeysCommand command; - - protected void moreSetup() - { - command = new GetKeysCommand(testFqn); - command.initialize(container); - } - - public void testForNonexistentNode() - { - expect(container.peek(testFqn)).andReturn(null); - replay(container); - assert null == command.perform(ctx); - } - - public void testForExistingNode() - { - NodeSpiMock node = new NodeSpiMock(testFqn); - node.putDirect("k1", "v1"); - node.putDirect("k2", "v2"); - expect(container.peek(testFqn)).andReturn(node); - replay(container); - Set result = (Set) command.perform(ctx); - assert 2 == result.size(); - assert result.contains("k1"); - assert result.contains("k2"); - } -} +package org.jboss.cache.commands.read; + +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import org.jboss.cache.mock.NodeSpiMock; +import org.testng.annotations.Test; + +import java.util.Set; + +/** + * Tester class for {@link GetKeysCommand}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.read.GetKeysCommandTest") +public class GetKeysCommandTest extends AbstractDataCommandTest +{ + + GetKeysCommand command; + + protected void moreSetup() + { + command = new GetKeysCommand(testFqn); + command.initialize(container); + } + + public void testForNonexistentNode() + { + expect(container.peek(testFqn)).andReturn(null); + replay(container); + assert null == command.perform(ctx); + } + + public void testForExistingNode() + { + NodeSpiMock node = new NodeSpiMock(testFqn); + node.putDirect("k1", "v1"); + node.putDirect("k2", "v2"); + expect(container.peek(testFqn)).andReturn(node); + replay(container); + Set result = (Set) command.perform(ctx); + assert 2 == result.size(); + assert result.contains("k1"); + assert result.contains("k2"); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,84 +1,84 @@ -package org.jboss.cache.commands.write; - -import static org.easymock.EasyMock.createStrictControl; -import static org.easymock.EasyMock.expect; -import org.easymock.IMocksControl; -import org.jboss.cache.DataContainer; -import org.jboss.cache.Fqn; -import org.jboss.cache.commands.legacy.write.LegacyEvictCommand; -import org.jboss.cache.commands.read.AbstractDataCommandTest; -import org.jboss.cache.mock.MockNodesFixture; -import org.jboss.cache.notifications.Notifier; -import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; - -/** - * tester class for {@link EvictCommand} - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class EvictCommandTest extends AbstractDataCommandTest -{ - EvictCommand command; - Notifier notifier; - IMocksControl control; - MockNodesFixture nodes; - - protected void moreSetup() - { - control = createStrictControl(); - notifier = control.createMock(Notifier.class); - container = control.createMock(DataContainer.class); - command = new LegacyEvictCommand(testFqn); - command.initialize(notifier, container); - nodes = new MockNodesFixture(); - } - - public void testResidentNodesEviction() - { - nodes.abNode.setResident(true); - expect(container.peek(testFqn, false, true)).andReturn(nodes.abNode); - control.replay(); - assert Boolean.TRUE == command.perform(ctx); - control.verify(); - } - - public void testSimpleEviction() - { - expect(container.peek(testFqn, false, true)).andReturn(nodes.abNode); - notifier.notifyNodeEvicted(testFqn, true, ctx); - notifier.notifyNodeEvicted(testFqn, false, ctx); - control.replay(); - assert Boolean.FALSE == command.perform(ctx); - control.verify(); - } - - public void testRecursiveEviction() - { - List<Fqn> nodesToEvict = new ArrayList<Fqn>(); - nodesToEvict.add(nodes.a); - nodesToEvict.add(nodes.ab); - command.setRecursive(true); - expect(container.peek(testFqn, false, true)).andReturn(nodes.aNode); - - expect(container.getNodesForEviction(testFqn, true)).andReturn(nodesToEvict); - control.checkOrder(false); - //evict a - expect(container.peek(nodes.a, false, true)).andReturn(nodes.aNode); - notifier.notifyNodeEvicted(nodes.a, true, ctx); - notifier.notifyNodeEvicted(nodes.a, false, ctx); - - //evict b - expect(container.peek(nodes.ab, false, true)).andReturn(nodes.abNode); - notifier.notifyNodeEvicted(nodes.ab, true, ctx); - notifier.notifyNodeEvicted(nodes.ab, false, ctx); - - control.replay(); - assert Boolean.TRUE == command.perform(ctx); - control.verify(); - } -} +package org.jboss.cache.commands.write; + +import static org.easymock.EasyMock.createStrictControl; +import static org.easymock.EasyMock.expect; +import org.easymock.IMocksControl; +import org.jboss.cache.DataContainer; +import org.jboss.cache.Fqn; +import org.jboss.cache.commands.legacy.write.LegacyEvictCommand; +import org.jboss.cache.commands.read.AbstractDataCommandTest; +import org.jboss.cache.mock.MockNodesFixture; +import org.jboss.cache.notifications.Notifier; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; + +/** + * tester class for {@link EvictCommand} + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.write.EvictCommandTest") +public class EvictCommandTest extends AbstractDataCommandTest +{ + EvictCommand command; + Notifier notifier; + IMocksControl control; + MockNodesFixture nodes; + + protected void moreSetup() + { + control = createStrictControl(); + notifier = control.createMock(Notifier.class); + container = control.createMock(DataContainer.class); + command = new LegacyEvictCommand(testFqn); + command.initialize(notifier, container); + nodes = new MockNodesFixture(); + } + + public void testResidentNodesEviction() + { + nodes.abNode.setResident(true); + expect(container.peek(testFqn, false, true)).andReturn(nodes.abNode); + control.replay(); + assert Boolean.TRUE == command.perform(ctx); + control.verify(); + } + + public void testSimpleEviction() + { + expect(container.peek(testFqn, false, true)).andReturn(nodes.abNode); + notifier.notifyNodeEvicted(testFqn, true, ctx); + notifier.notifyNodeEvicted(testFqn, false, ctx); + control.replay(); + assert Boolean.FALSE == command.perform(ctx); + control.verify(); + } + + public void testRecursiveEviction() + { + List<Fqn> nodesToEvict = new ArrayList<Fqn>(); + nodesToEvict.add(nodes.a); + nodesToEvict.add(nodes.ab); + command.setRecursive(true); + expect(container.peek(testFqn, false, true)).andReturn(nodes.aNode); + + expect(container.getNodesForEviction(testFqn, true)).andReturn(nodesToEvict); + control.checkOrder(false); + //evict a + expect(container.peek(nodes.a, false, true)).andReturn(nodes.aNode); + notifier.notifyNodeEvicted(nodes.a, true, ctx); + notifier.notifyNodeEvicted(nodes.a, false, ctx); + + //evict b + expect(container.peek(nodes.ab, false, true)).andReturn(nodes.abNode); + notifier.notifyNodeEvicted(nodes.ab, true, ctx); + notifier.notifyNodeEvicted(nodes.ab, false, ctx); + + control.replay(); + assert Boolean.TRUE == command.perform(ctx); + control.verify(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/commands/write/InvalidateCommandTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/commands/write/InvalidateCommandTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/commands/write/InvalidateCommandTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,87 +1,87 @@ -package org.jboss.cache.commands.write; - -import static org.easymock.EasyMock.createStrictControl; -import static org.easymock.EasyMock.expect; -import org.easymock.IMocksControl; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.DataContainer; -import org.jboss.cache.Fqn; -import org.jboss.cache.commands.read.AbstractDataCommandTest; -import org.jboss.cache.mock.MockNodesFixture; -import org.jboss.cache.notifications.Notifier; -import org.testng.annotations.Test; - -import javax.transaction.TransactionManager; - -/** - * Tester class for {@link org.jboss.cache.commands.write.InvalidateCommand} - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class InvalidateCommandTest extends AbstractDataCommandTest -{ - InvalidateCommand command; - Notifier notifier; - IMocksControl control; - MockNodesFixture nodes; - TransactionManager tmMock; - CacheSPI spiMock; - - protected void moreSetup() - { - control = createStrictControl(); - notifier = control.createMock(Notifier.class); - container = control.createMock(DataContainer.class); - tmMock = control.createMock(TransactionManager.class); - spiMock = control.createMock(CacheSPI.class); - - command = new InvalidateCommand(testFqn); - command.initialize(spiMock, container, notifier); - nodes = new MockNodesFixture(); - } - - public void testNullNode() - { - expect(spiMock.getNode(testFqn)).andReturn(null); - control.replay(); - assert null == command.perform(ctx); - control.verify(); - } - - public void testExistingNode() - { - expect(spiMock.getNode(testFqn)).andReturn(nodes.adfNode); - notifier.notifyNodeInvalidated(testFqn, true, ctx); - expect(container.evict(testFqn)).andReturn(Boolean.TRUE); - notifier.notifyNodeInvalidated(testFqn, false, ctx); - control.replay(); - assert null == command.perform(ctx); - assert !nodes.adfNode.isValid() : "node should had been invalidated"; - assert !nodes.adfgNode.isValid() : "child should had been invalidated"; - assert !nodes.adfhNode.isValid() : "child should had been invalidated"; - control.verify(); - } - - public void testRootNodeInvalidation() - { - command.setFqn(Fqn.ROOT); - nodes.adfgNode.put("key", "value"); - expect(spiMock.getNode(Fqn.ROOT)).andReturn(nodes.root); - notifier.notifyNodeInvalidated(Fqn.ROOT, true, ctx); - expect(container.evict(Fqn.ROOT)).andReturn(Boolean.TRUE); - notifier.notifyNodeInvalidated(Fqn.ROOT, false, ctx); - control.replay(); - assert null == command.perform(ctx); - assert nodes.root.isValid() : "root should NOT had been invalidated"; - assert !nodes.adfgNode.isValid() : "node should had been invalidated"; - control.verify(); - } - - public void testInvalidateResidentNode() - { - nodes.adfNode.setResident(true); - testExistingNode(); - } -} +package org.jboss.cache.commands.write; + +import static org.easymock.EasyMock.createStrictControl; +import static org.easymock.EasyMock.expect; +import org.easymock.IMocksControl; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.DataContainer; +import org.jboss.cache.Fqn; +import org.jboss.cache.commands.read.AbstractDataCommandTest; +import org.jboss.cache.mock.MockNodesFixture; +import org.jboss.cache.notifications.Notifier; +import org.testng.annotations.Test; + +import javax.transaction.TransactionManager; + +/** + * Tester class for {@link org.jboss.cache.commands.write.InvalidateCommand} + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "commands.write.InvalidateCommandTest") +public class InvalidateCommandTest extends AbstractDataCommandTest +{ + InvalidateCommand command; + Notifier notifier; + IMocksControl control; + MockNodesFixture nodes; + TransactionManager tmMock; + CacheSPI spiMock; + + protected void moreSetup() + { + control = createStrictControl(); + notifier = control.createMock(Notifier.class); + container = control.createMock(DataContainer.class); + tmMock = control.createMock(TransactionManager.class); + spiMock = control.createMock(CacheSPI.class); + + command = new InvalidateCommand(testFqn); + command.initialize(spiMock, container, notifier); + nodes = new MockNodesFixture(); + } + + public void testNullNode() + { + expect(spiMock.getNode(testFqn)).andReturn(null); + control.replay(); + assert null == command.perform(ctx); + control.verify(); + } + + public void testExistingNode() + { + expect(spiMock.getNode(testFqn)).andReturn(nodes.adfNode); + notifier.notifyNodeInvalidated(testFqn, true, ctx); + expect(container.evict(testFqn)).andReturn(Boolean.TRUE); + notifier.notifyNodeInvalidated(testFqn, false, ctx); + control.replay(); + assert null == command.perform(ctx); + assert !nodes.adfNode.isValid() : "node should had been invalidated"; + assert !nodes.adfgNode.isValid() : "child should had been invalidated"; + assert !nodes.adfhNode.isValid() : "child should had been invalidated"; + control.verify(); + } + + public void testRootNodeInvalidation() + { + command.setFqn(Fqn.ROOT); + nodes.adfgNode.put("key", "value"); + expect(spiMock.getNode(Fqn.ROOT)).andReturn(nodes.root); + notifier.notifyNodeInvalidated(Fqn.ROOT, true, ctx); + expect(container.evict(Fqn.ROOT)).andReturn(Boolean.TRUE); + notifier.notifyNodeInvalidated(Fqn.ROOT, false, ctx); + control.replay(); + assert null == command.perform(ctx); + assert nodes.root.isValid() : "root should NOT had been invalidated"; + assert !nodes.adfgNode.isValid() : "node should had been invalidated"; + control.verify(); + } + + public void testInvalidateResidentNode() + { + nodes.adfNode.setResident(true); + testExistingNode(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "config.ChannelInjectionTest") public class ChannelInjectionTest { private Set<Cache<String, String>> caches = new HashSet<Cache<String, String>>(); Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author Brian Stansberry */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "config.ConfigurationCloningTest") public class ConfigurationCloningTest { /** Modified: core/trunk/src/test/java/org/jboss/cache/config/EvictionRegionConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/EvictionRegionConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/EvictionRegionConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ /** * @author <a href="mailto:brian.stansberry@jboss.org">Brian Stansberry</a> */ -@Test(groups = {"functional", "jgroups", "transaction"}) +@Test(groups = {"functional", "jgroups", "transaction"}, testName = "config.EvictionRegionConfigurationTest") public class EvictionRegionConfigurationTest { /** Modified: core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/StringPropertyReplacementTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * * @author Brian Stansberry */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "config.StringPropertyReplacementTest") public class StringPropertyReplacementTest { public static final String STRING_REPLACED_FILE = "configs/string-property-replaced.xml"; Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,75 +1,75 @@ -package org.jboss.cache.config.parsing; - -import org.testng.annotations.Test; -import org.w3c.dom.Element; -import org.jboss.cache.config.BuddyReplicationConfig; -import org.jboss.cache.config.parsing.element.BuddyElementParser; -import org.jboss.cache.buddyreplication.NextMemberBuddyLocator; - -/** - * Tester class for {@link org.jboss.cache.config.parsing.element.BuddyElementParser}. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "unit", sequential = true) -public class BuddyElementParserTest -{ - - /** one instance per all tests as it is stateless */ - BuddyElementParser parser = new BuddyElementParser(); - - - /** - * Test default values for unspecified elements. - */ - public void testDefaultValues() throws Exception - { - String xmlConfig = "<buddyReplication enabled=\"true\"/>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig); - BuddyReplicationConfig brConfig = parser.parseBuddyElement(element); - assert brConfig.getBuddyLocatorConfig().getClassName().equals(NextMemberBuddyLocator.class.getName()) : "default buddy locator class is NextMemberBuddyLocator"; - assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().isEmpty(); - assert brConfig.isDataGravitationRemoveOnFind() : "default to true"; - assert brConfig.isDataGravitationSearchBackupTrees() : "default to true"; - assert brConfig.isAutoDataGravitation() : "default to false"; - } - - /** - * If NextMemberBuddyLocator is set as buddy locator, but no params are being specified for it, make sure that - * default values for numBudies and ignoreColocatedBuddies are present. - */ - public void testDefaultParamsForNextMemberBuddyLocator() throws Exception - { - String xmlConfig = - " <buddyReplication enabled=\"true\" poolName=\"groupOne\">\n" + - " <locator>\n" + - " <properties>\n" + - " numBuddies = 3\n" + - " </properties>\n" + - " </locator>\n" + - " </buddyReplication>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig); - BuddyReplicationConfig brConfig = parser.parseBuddyElement(element); - assert brConfig.getBuddyLocatorConfig().getClassName().equals(NextMemberBuddyLocator.class.getName()) : "default buddy locator class is NextMemberBuddyLocator"; - assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().get("numBuddies").equals("3"); - assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().size() == 1; - } - - public void testNormalConfig() throws Exception - { - String xmlConfig = - " <buddyReplication enabled=\"true\" poolName=\"groupOne\">\n" + - " <locator>\n" + - " <properties>\n" + - " numBuddies = 3\n" + - " </properties>\n" + - " </locator>\n" + - " </buddyReplication>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig); - BuddyReplicationConfig brConfig = parser.parseBuddyElement(element); - assert brConfig.isEnabled(); - assert brConfig.getBuddyPoolName().equals("groupOne"); - assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().get("numBuddies").equals("3"); - } -} +package org.jboss.cache.config.parsing; + +import org.testng.annotations.Test; +import org.w3c.dom.Element; +import org.jboss.cache.config.BuddyReplicationConfig; +import org.jboss.cache.config.parsing.element.BuddyElementParser; +import org.jboss.cache.buddyreplication.NextMemberBuddyLocator; + +/** + * Tester class for {@link org.jboss.cache.config.parsing.element.BuddyElementParser}. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "unit", sequential = true, testName = "config.parsing.BuddyElementParserTest") +public class BuddyElementParserTest +{ + + /** one instance per all tests as it is stateless */ + BuddyElementParser parser = new BuddyElementParser(); + + + /** + * Test default values for unspecified elements. + */ + public void testDefaultValues() throws Exception + { + String xmlConfig = "<buddyReplication enabled=\"true\"/>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig); + BuddyReplicationConfig brConfig = parser.parseBuddyElement(element); + assert brConfig.getBuddyLocatorConfig().getClassName().equals(NextMemberBuddyLocator.class.getName()) : "default buddy locator class is NextMemberBuddyLocator"; + assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().isEmpty(); + assert brConfig.isDataGravitationRemoveOnFind() : "default to true"; + assert brConfig.isDataGravitationSearchBackupTrees() : "default to true"; + assert brConfig.isAutoDataGravitation() : "default to false"; + } + + /** + * If NextMemberBuddyLocator is set as buddy locator, but no params are being specified for it, make sure that + * default values for numBudies and ignoreColocatedBuddies are present. + */ + public void testDefaultParamsForNextMemberBuddyLocator() throws Exception + { + String xmlConfig = + " <buddyReplication enabled=\"true\" poolName=\"groupOne\">\n" + + " <locator>\n" + + " <properties>\n" + + " numBuddies = 3\n" + + " </properties>\n" + + " </locator>\n" + + " </buddyReplication>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig); + BuddyReplicationConfig brConfig = parser.parseBuddyElement(element); + assert brConfig.getBuddyLocatorConfig().getClassName().equals(NextMemberBuddyLocator.class.getName()) : "default buddy locator class is NextMemberBuddyLocator"; + assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().get("numBuddies").equals("3"); + assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().size() == 1; + } + + public void testNormalConfig() throws Exception + { + String xmlConfig = + " <buddyReplication enabled=\"true\" poolName=\"groupOne\">\n" + + " <locator>\n" + + " <properties>\n" + + " numBuddies = 3\n" + + " </properties>\n" + + " </locator>\n" + + " </buddyReplication>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig); + BuddyReplicationConfig brConfig = parser.parseBuddyElement(element); + assert brConfig.isEnabled(); + assert brConfig.getBuddyPoolName().equals("groupOne"); + assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().get("numBuddies").equals("3"); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 3.0 */ -@Test(groups = "unit") +@Test(groups = "unit", testName = "config.parsing.CacheConfigsTest") public class CacheConfigsTest { public void testNewFormat() throws CloneNotSupportedException Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,145 +1,145 @@ -package org.jboss.cache.config.parsing; - -import org.testng.annotations.Test; -import org.w3c.dom.Element; -import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.config.parsing.element.LoadersElementParser; - -import java.util.List; - -/** - * Tester class for {@link org.jboss.cache.config.parsing.element.LoadersElementParser} - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "unit") -public class CacheLoadersElementParserTest -{ - LoadersElementParser parser = new LoadersElementParser(); - - - public void simpleParse() throws Exception - { - String xmlStr = " " + - " <loaders passivation=\"false\" shared=\"false\">\n" + - " <preload>\n" + - " <node fqn=\"/\"/>\n" + - " </preload>\n" + - " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"false\"\n" + - " ignoreModifications=\"false\" purgeOnStartup=\"false\">\n" + - " <properties>\n" + - " cache.jdbc.table.name=jbosscache\n" + - " cache.jdbc.table.create=true\n" + - " cache.jdbc.table.drop=true\n" + - " </properties>\n" + - " </loader>\n" + - " </loaders>"; - CacheLoaderConfig config = getCacheLoaderConfig(xmlStr); - assert !config.isPassivation(); - assert !config.isShared(); - assert config.getPreload().equals("/"); - assert config.getFirstCacheLoaderConfig().getClassName().equals("org.jboss.cache.loader.JDBCCacheLoader"); - assert config.getFirstCacheLoaderConfig().isAsync(); - assert !config.getFirstCacheLoaderConfig().isFetchPersistentState(); - assert !config.getFirstCacheLoaderConfig().isIgnoreModifications(); - assert !config.getFirstCacheLoaderConfig().isPurgeOnStartup(); - } - - - /** - * Tests that if no values are specified the parser sets default config values. - */ - public void testDefaultValues() throws Exception - { - String xmlStr = - " <loaders passivation=\"false\">\n" + - " <preload/>\n" + - " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\">" + - " <singletonStore/>\n" + - " </loader>"+ - " </loaders>"; - CacheLoaderConfig config = getCacheLoaderConfig(xmlStr); - assert config.getPreload().equals("/") : "the default value for preload is root"; - assert !config.getFirstCacheLoaderConfig().isAsync() : "by default CL are sync"; - assert !config.isShared() : "by default the cl are not sared"; - assert !config.getFirstCacheLoaderConfig().isIgnoreModifications(); - assert !config.getFirstCacheLoaderConfig().isPurgeOnStartup(); - assert !config.getFirstCacheLoaderConfig().getSingletonStoreConfig().isSingletonStoreEnabled(); - assert config.getFirstCacheLoaderConfig().getSingletonStoreConfig().getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); - assert config.getFirstCacheLoaderConfig().getSingletonStoreConfig().getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); - } - - public void testMultiplePreloadNodes() throws Exception - { - String xmlStr = " " + - " <loaders passivation=\"false\" shared=\"false\">\n" + - " <preload>\n" + - " <node fqn=\"/\"/>\n" + - " <node fqn=\"/a\"/>\n" + - " <node fqn=\"/a/b\"/>\n" + - " </preload>\n" + - " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"false\"\n" + - " ignoreModifications=\"false\" purgeOnStartup=\"false\">\n" + - " </loader>" + - "</loaders>"; - CacheLoaderConfig config = getCacheLoaderConfig(xmlStr); - assert config.getPreload().equals("/,/a,/a/b"); - assert config.getFirstCacheLoaderConfig().getSingletonStoreConfig() == null; - } - - public void testMultipleCacheLoaders() throws Exception - { - String xml = - " <loaders passivation=\"false\" shared=\"false\">\n" + - " <preload/>\n" + - " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + - " ignoreModifications=\"true\" purgeOnStartup=\"true\"/>\n" + - " <loader class=\"org.jboss.cache.loader.bdbje.BdbjeCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + - " ignoreModifications=\"true\" purgeOnStartup=\"true\"/>\n" + - " <loader class=\"org.jboss.cache.loader.FileCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + - " ignoreModifications=\"true\" purgeOnStartup=\"true\"/>\n" + - " </loaders>"; - CacheLoaderConfig clConfig = getCacheLoaderConfig(xml); - List<CacheLoaderConfig.IndividualCacheLoaderConfig> indClConfigs = clConfig.getIndividualCacheLoaderConfigs(); - assert indClConfigs.size() == 3; - assert indClConfigs.get(0).getClassName().equals("org.jboss.cache.loader.JDBCCacheLoader"); - assert indClConfigs.get(1).getClassName().equals("org.jboss.cache.loader.bdbje.BdbjeCacheLoader"); - assert indClConfigs.get(2).getClassName().equals("org.jboss.cache.loader.FileCacheLoader"); - - } - - public void testSingletonStoreDisaled() throws Exception - { - String xml = - " <loaders passivation=\"true\" shared=\"true\">\n" + - " <preload/>\n" + - " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + - " ignoreModifications=\"true\" purgeOnStartup=\"true\">\n" + - " <singletonStore enabled=\"false\" class=\"org.jboss.cache.loader.SingletonStoreCacheLoader\">\n" + - " <properties>\n" + - " pushStateWhenCoordinator=some\n" + - " pushStateWhenCoordinatorTimeout=cus\n" + - " </properties>\n" + - " </singletonStore>\n" + - " </loader>\n" + - " </loaders>"; - CacheLoaderConfig clc = getCacheLoaderConfig(xml); - CacheLoaderConfig.IndividualCacheLoaderConfig icl = clc.getFirstCacheLoaderConfig(); - CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig singletonStoreConfig = icl.getSingletonStoreConfig(); - assert singletonStoreConfig != null; - assert !singletonStoreConfig.isSingletonStoreEnabled(); - assert singletonStoreConfig.getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); - assert singletonStoreConfig.getProperties().size() == 2; - assert singletonStoreConfig.getProperties().get("pushStateWhenCoordinator").equals("some"); - assert singletonStoreConfig.getProperties().get("pushStateWhenCoordinatorTimeout").equals("cus"); - - } - - private CacheLoaderConfig getCacheLoaderConfig(String xmlStr) - throws Exception - { - Element element = XmlConfigHelper.stringToElementInCoreNS(xmlStr); - return parser.parseLoadersElement(element); - } -} +package org.jboss.cache.config.parsing; + +import org.testng.annotations.Test; +import org.w3c.dom.Element; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.parsing.element.LoadersElementParser; + +import java.util.List; + +/** + * Tester class for {@link org.jboss.cache.config.parsing.element.LoadersElementParser} + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "unit", testName = "config.parsing.CacheLoadersElementParserTest") +public class CacheLoadersElementParserTest +{ + LoadersElementParser parser = new LoadersElementParser(); + + + public void simpleParse() throws Exception + { + String xmlStr = " " + + " <loaders passivation=\"false\" shared=\"false\">\n" + + " <preload>\n" + + " <node fqn=\"/\"/>\n" + + " </preload>\n" + + " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"false\"\n" + + " ignoreModifications=\"false\" purgeOnStartup=\"false\">\n" + + " <properties>\n" + + " cache.jdbc.table.name=jbosscache\n" + + " cache.jdbc.table.create=true\n" + + " cache.jdbc.table.drop=true\n" + + " </properties>\n" + + " </loader>\n" + + " </loaders>"; + CacheLoaderConfig config = getCacheLoaderConfig(xmlStr); + assert !config.isPassivation(); + assert !config.isShared(); + assert config.getPreload().equals("/"); + assert config.getFirstCacheLoaderConfig().getClassName().equals("org.jboss.cache.loader.JDBCCacheLoader"); + assert config.getFirstCacheLoaderConfig().isAsync(); + assert !config.getFirstCacheLoaderConfig().isFetchPersistentState(); + assert !config.getFirstCacheLoaderConfig().isIgnoreModifications(); + assert !config.getFirstCacheLoaderConfig().isPurgeOnStartup(); + } + + + /** + * Tests that if no values are specified the parser sets default config values. + */ + public void testDefaultValues() throws Exception + { + String xmlStr = + " <loaders passivation=\"false\">\n" + + " <preload/>\n" + + " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\">" + + " <singletonStore/>\n" + + " </loader>"+ + " </loaders>"; + CacheLoaderConfig config = getCacheLoaderConfig(xmlStr); + assert config.getPreload().equals("/") : "the default value for preload is root"; + assert !config.getFirstCacheLoaderConfig().isAsync() : "by default CL are sync"; + assert !config.isShared() : "by default the cl are not sared"; + assert !config.getFirstCacheLoaderConfig().isIgnoreModifications(); + assert !config.getFirstCacheLoaderConfig().isPurgeOnStartup(); + assert !config.getFirstCacheLoaderConfig().getSingletonStoreConfig().isSingletonStoreEnabled(); + assert config.getFirstCacheLoaderConfig().getSingletonStoreConfig().getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); + assert config.getFirstCacheLoaderConfig().getSingletonStoreConfig().getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); + } + + public void testMultiplePreloadNodes() throws Exception + { + String xmlStr = " " + + " <loaders passivation=\"false\" shared=\"false\">\n" + + " <preload>\n" + + " <node fqn=\"/\"/>\n" + + " <node fqn=\"/a\"/>\n" + + " <node fqn=\"/a/b\"/>\n" + + " </preload>\n" + + " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"false\"\n" + + " ignoreModifications=\"false\" purgeOnStartup=\"false\">\n" + + " </loader>" + + "</loaders>"; + CacheLoaderConfig config = getCacheLoaderConfig(xmlStr); + assert config.getPreload().equals("/,/a,/a/b"); + assert config.getFirstCacheLoaderConfig().getSingletonStoreConfig() == null; + } + + public void testMultipleCacheLoaders() throws Exception + { + String xml = + " <loaders passivation=\"false\" shared=\"false\">\n" + + " <preload/>\n" + + " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + + " ignoreModifications=\"true\" purgeOnStartup=\"true\"/>\n" + + " <loader class=\"org.jboss.cache.loader.bdbje.BdbjeCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + + " ignoreModifications=\"true\" purgeOnStartup=\"true\"/>\n" + + " <loader class=\"org.jboss.cache.loader.FileCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + + " ignoreModifications=\"true\" purgeOnStartup=\"true\"/>\n" + + " </loaders>"; + CacheLoaderConfig clConfig = getCacheLoaderConfig(xml); + List<CacheLoaderConfig.IndividualCacheLoaderConfig> indClConfigs = clConfig.getIndividualCacheLoaderConfigs(); + assert indClConfigs.size() == 3; + assert indClConfigs.get(0).getClassName().equals("org.jboss.cache.loader.JDBCCacheLoader"); + assert indClConfigs.get(1).getClassName().equals("org.jboss.cache.loader.bdbje.BdbjeCacheLoader"); + assert indClConfigs.get(2).getClassName().equals("org.jboss.cache.loader.FileCacheLoader"); + + } + + public void testSingletonStoreDisaled() throws Exception + { + String xml = + " <loaders passivation=\"true\" shared=\"true\">\n" + + " <preload/>\n" + + " <loader class=\"org.jboss.cache.loader.JDBCCacheLoader\" async=\"true\" fetchPersistentState=\"true\"\n" + + " ignoreModifications=\"true\" purgeOnStartup=\"true\">\n" + + " <singletonStore enabled=\"false\" class=\"org.jboss.cache.loader.SingletonStoreCacheLoader\">\n" + + " <properties>\n" + + " pushStateWhenCoordinator=some\n" + + " pushStateWhenCoordinatorTimeout=cus\n" + + " </properties>\n" + + " </singletonStore>\n" + + " </loader>\n" + + " </loaders>"; + CacheLoaderConfig clc = getCacheLoaderConfig(xml); + CacheLoaderConfig.IndividualCacheLoaderConfig icl = clc.getFirstCacheLoaderConfig(); + CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig singletonStoreConfig = icl.getSingletonStoreConfig(); + assert singletonStoreConfig != null; + assert !singletonStoreConfig.isSingletonStoreEnabled(); + assert singletonStoreConfig.getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); + assert singletonStoreConfig.getProperties().size() == 2; + assert singletonStoreConfig.getProperties().get("pushStateWhenCoordinator").equals("some"); + assert singletonStoreConfig.getProperties().get("pushStateWhenCoordinatorTimeout").equals("cus"); + + } + + private CacheLoaderConfig getCacheLoaderConfig(String xmlStr) + throws Exception + { + Element element = XmlConfigHelper.stringToElementInCoreNS(xmlStr); + return parser.parseLoadersElement(element); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/Eviction2xto3xCompatibilityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,188 +1,188 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.cache.config.parsing; - -import org.jboss.cache.Fqn; -import org.jboss.cache.config.EvictionAlgorithmConfig; -import org.jboss.cache.config.EvictionConfig; -import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.config.parsing.element.EvictionElementParser; -import org.jboss.cache.eviction.MRUAlgorithmConfig; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import org.w3c.dom.Element; - -/** - * Eviction was internally changed from version 2.x to version 3.x. - * This is a tests to check eviction compatibility between these two versions. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "unit") -public class Eviction2xto3xCompatibilityTest -{ - private EvictionElementParser evictionElementParser; - - @BeforeMethod - public void setUp() - { - evictionElementParser = new EvictionElementParser(); - } - - public void testDefaultValues1() throws Exception - { - String oldFormat = - " <attribute name=\"EvictionPolicyConfig\">\n" + - " <config>\n" + - " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + - " <attribute name=\"eventQueueSize\">200000</attribute>\n" + - " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + - " <region name=\"/_default_\" eventQueueSize=\"1234\" policyClass=\"org.jboss.cache.eviction.MRUPolicy\">\n" + - " <attribute name=\"maxNodes\">5001</attribute>\n" + - " <attribute name=\"minTimeToLiveSeconds\">1001</attribute>\n" + - " </region>\n" + - " <region name=\"/org/jboss/data\">\n" + - " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " </region>\n" + - " </config>\n" + - " </attribute>"; - Element oldEl = XmlConfigHelper.stringToElementInCoreNS(oldFormat); - EvictionConfig oldEvConfig = XmlConfigurationParser2x.parseEvictionConfig(oldEl); - //this will be transformed in root region, so make sure that the root region will be corectly set up - MRUAlgorithmConfig defaultAlgorithmConfig = (MRUAlgorithmConfig) oldEvConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig(); - assert oldEvConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == 1234; - assert defaultAlgorithmConfig.getEvictionAlgorithmClassName().equals("org.jboss.cache.eviction.MRUAlgorithm"); - assert defaultAlgorithmConfig.getMaxNodes() == 5001; - assert defaultAlgorithmConfig.getMinTimeToLive() == 1001000; - - - assert oldEvConfig.getEvictionRegionConfigs().size() == 1; - EvictionRegionConfig orgJbossData = oldEvConfig.getEvictionRegionConfigs().get(0); - assert orgJbossData.getRegionFqn().equals(Fqn.fromString("org/jboss/data")); - assert orgJbossData.getEvictionAlgorithmConfig().getEvictionAlgorithmClassName().equals("org.jboss.cache.eviction.LRUAlgorithm"); - assert orgJbossData.getEventQueueSize() == 200000; - } - - public void simpleTest() throws Exception - { - String oldFormat = - " <attribute name=\"EvictionPolicyConfig\">\n" + - " <config>\n" + - " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + - " <attribute name=\"eventQueueSize\">200000</attribute>\n" + - " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + - " <region name=\"/_default_\">\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + - " </region>\n" + - " <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LFUPolicy\">\n" + - " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " </region>\n" + - " </config>\n" + - " </attribute>"; - String newFormat = - "<eviction wakeUpInterval=\"5000\">\n" + - " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"200000\">\n" + - " <property name=\"maxNodes\" value=\"5000\"></property>\n" + - " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + - " </default>\n" + - " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\" eventQueueSize=\"200000\">\n" + - " <property name=\"minTimeToLive\" value=\"1000000\"></property>\n" + - " <property name=\"maxNodes\" value=\"5000\"></property>\n" + - " </region>\n" + - "</eviction>"; - Element oldEl = XmlConfigHelper.stringToElementInCoreNS(oldFormat); - Element newEl = XmlConfigHelper.stringToElementInCoreNS(newFormat); - EvictionConfig oldEvConfig = XmlConfigurationParser2x.parseEvictionConfig(oldEl); - EvictionConfig newEvConfig = evictionElementParser.parseEvictionElement(newEl); - assert oldEvConfig.getDefaultEvictionRegionConfig().equals(newEvConfig.getDefaultEvictionRegionConfig()); - - EvictionRegionConfig oldRegionConfig = oldEvConfig.getEvictionRegionConfigs().get(0); - EvictionRegionConfig newRegionConfig = newEvConfig.getEvictionRegionConfigs().get(0); - EvictionAlgorithmConfig oldEvictionAlgorithmConfig = oldRegionConfig.getEvictionAlgorithmConfig(); - EvictionAlgorithmConfig newEvictionAlgorithmConfig = newRegionConfig.getEvictionAlgorithmConfig(); - assert oldEvictionAlgorithmConfig.equals(newEvictionAlgorithmConfig); - - assert oldEvConfig.equals(newEvConfig); - } - - public void testFailureOnCustomEvictionPolicy() throws Exception - { - String oldFormat = - " <attribute name=\"EvictionPolicyConfig\">\n" + - " <config>\n" + - " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + - " <attribute name=\"eventQueueSize\">200000</attribute>\n" + - " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + - " <region name=\"/_default_\">\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + - " </region>\n" + - " <region name=\"/org/jboss/data\" policyClass=\"org.custom.eviction.policy.LFUPolicy\">\n" + - " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " </region>\n" + - " </config>\n" + - " </attribute>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(oldFormat); - try - { - XmlConfigurationParser2x.parseEvictionConfig(element); - assert false : "custom eviction config not supported for the old parser"; - } catch (Exception e) - { - System.out.println(e.getMessage()); - } - } - - public void testFailureOnCustomDefaultEvictionPolicy() throws Exception - { - String oldFormat = - " <attribute name=\"EvictionPolicyConfig\">\n" + - " <config>\n" + - " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + - " <attribute name=\"eventQueueSize\">200000</attribute>\n" + - " <attribute name=\"policyClass\">org.custom.eviction.policy.LFUPolicy</attribute>\n" + - " <region name=\"/_default_\">\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + - " </region>\n" + - " <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LRUPolicy\">\n" + - " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + - " <attribute name=\"maxNodes\">5000</attribute>\n" + - " </region>\n" + - " </config>\n" + - " </attribute>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(oldFormat); - try - { - XmlConfigurationParser2x.parseEvictionConfig(element); - assert false : "default custom eviction config not supported for the old parser"; - } catch (Exception e) - { - System.out.println(e.getMessage()); - } - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.cache.config.parsing; + +import org.jboss.cache.Fqn; +import org.jboss.cache.config.EvictionAlgorithmConfig; +import org.jboss.cache.config.EvictionConfig; +import org.jboss.cache.config.EvictionRegionConfig; +import org.jboss.cache.config.parsing.element.EvictionElementParser; +import org.jboss.cache.eviction.MRUAlgorithmConfig; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.w3c.dom.Element; + +/** + * Eviction was internally changed from version 2.x to version 3.x. + * This is a tests to check eviction compatibility between these two versions. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "unit", testName = "config.parsing.Eviction2xto3xCompatibilityTest") +public class Eviction2xto3xCompatibilityTest +{ + private EvictionElementParser evictionElementParser; + + @BeforeMethod + public void setUp() + { + evictionElementParser = new EvictionElementParser(); + } + + public void testDefaultValues1() throws Exception + { + String oldFormat = + " <attribute name=\"EvictionPolicyConfig\">\n" + + " <config>\n" + + " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + + " <attribute name=\"eventQueueSize\">200000</attribute>\n" + + " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + + " <region name=\"/_default_\" eventQueueSize=\"1234\" policyClass=\"org.jboss.cache.eviction.MRUPolicy\">\n" + + " <attribute name=\"maxNodes\">5001</attribute>\n" + + " <attribute name=\"minTimeToLiveSeconds\">1001</attribute>\n" + + " </region>\n" + + " <region name=\"/org/jboss/data\">\n" + + " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " </region>\n" + + " </config>\n" + + " </attribute>"; + Element oldEl = XmlConfigHelper.stringToElementInCoreNS(oldFormat); + EvictionConfig oldEvConfig = XmlConfigurationParser2x.parseEvictionConfig(oldEl); + //this will be transformed in root region, so make sure that the root region will be corectly set up + MRUAlgorithmConfig defaultAlgorithmConfig = (MRUAlgorithmConfig) oldEvConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig(); + assert oldEvConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == 1234; + assert defaultAlgorithmConfig.getEvictionAlgorithmClassName().equals("org.jboss.cache.eviction.MRUAlgorithm"); + assert defaultAlgorithmConfig.getMaxNodes() == 5001; + assert defaultAlgorithmConfig.getMinTimeToLive() == 1001000; + + + assert oldEvConfig.getEvictionRegionConfigs().size() == 1; + EvictionRegionConfig orgJbossData = oldEvConfig.getEvictionRegionConfigs().get(0); + assert orgJbossData.getRegionFqn().equals(Fqn.fromString("org/jboss/data")); + assert orgJbossData.getEvictionAlgorithmConfig().getEvictionAlgorithmClassName().equals("org.jboss.cache.eviction.LRUAlgorithm"); + assert orgJbossData.getEventQueueSize() == 200000; + } + + public void simpleTest() throws Exception + { + String oldFormat = + " <attribute name=\"EvictionPolicyConfig\">\n" + + " <config>\n" + + " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + + " <attribute name=\"eventQueueSize\">200000</attribute>\n" + + " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + + " <region name=\"/_default_\">\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + + " </region>\n" + + " <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LFUPolicy\">\n" + + " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " </region>\n" + + " </config>\n" + + " </attribute>"; + String newFormat = + "<eviction wakeUpInterval=\"5000\">\n" + + " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"200000\">\n" + + " <property name=\"maxNodes\" value=\"5000\"></property>\n" + + " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + + " </default>\n" + + " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\" eventQueueSize=\"200000\">\n" + + " <property name=\"minTimeToLive\" value=\"1000000\"></property>\n" + + " <property name=\"maxNodes\" value=\"5000\"></property>\n" + + " </region>\n" + + "</eviction>"; + Element oldEl = XmlConfigHelper.stringToElementInCoreNS(oldFormat); + Element newEl = XmlConfigHelper.stringToElementInCoreNS(newFormat); + EvictionConfig oldEvConfig = XmlConfigurationParser2x.parseEvictionConfig(oldEl); + EvictionConfig newEvConfig = evictionElementParser.parseEvictionElement(newEl); + assert oldEvConfig.getDefaultEvictionRegionConfig().equals(newEvConfig.getDefaultEvictionRegionConfig()); + + EvictionRegionConfig oldRegionConfig = oldEvConfig.getEvictionRegionConfigs().get(0); + EvictionRegionConfig newRegionConfig = newEvConfig.getEvictionRegionConfigs().get(0); + EvictionAlgorithmConfig oldEvictionAlgorithmConfig = oldRegionConfig.getEvictionAlgorithmConfig(); + EvictionAlgorithmConfig newEvictionAlgorithmConfig = newRegionConfig.getEvictionAlgorithmConfig(); + assert oldEvictionAlgorithmConfig.equals(newEvictionAlgorithmConfig); + + assert oldEvConfig.equals(newEvConfig); + } + + public void testFailureOnCustomEvictionPolicy() throws Exception + { + String oldFormat = + " <attribute name=\"EvictionPolicyConfig\">\n" + + " <config>\n" + + " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + + " <attribute name=\"eventQueueSize\">200000</attribute>\n" + + " <attribute name=\"policyClass\">org.jboss.cache.eviction.LRUPolicy</attribute>\n" + + " <region name=\"/_default_\">\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + + " </region>\n" + + " <region name=\"/org/jboss/data\" policyClass=\"org.custom.eviction.policy.LFUPolicy\">\n" + + " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " </region>\n" + + " </config>\n" + + " </attribute>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(oldFormat); + try + { + XmlConfigurationParser2x.parseEvictionConfig(element); + assert false : "custom eviction config not supported for the old parser"; + } catch (Exception e) + { + System.out.println(e.getMessage()); + } + } + + public void testFailureOnCustomDefaultEvictionPolicy() throws Exception + { + String oldFormat = + " <attribute name=\"EvictionPolicyConfig\">\n" + + " <config>\n" + + " <attribute name=\"wakeUpIntervalSeconds\">5</attribute>\n" + + " <attribute name=\"eventQueueSize\">200000</attribute>\n" + + " <attribute name=\"policyClass\">org.custom.eviction.policy.LFUPolicy</attribute>\n" + + " <region name=\"/_default_\">\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" + + " </region>\n" + + " <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LRUPolicy\">\n" + + " <attribute name=\"minTimeToLiveSeconds\">1000</attribute>\n" + + " <attribute name=\"maxNodes\">5000</attribute>\n" + + " </region>\n" + + " </config>\n" + + " </attribute>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(oldFormat); + try + { + XmlConfigurationParser2x.parseEvictionConfig(element); + assert false : "default custom eviction config not supported for the old parser"; + } catch (Exception e) + { + System.out.println(e.getMessage()); + } + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,335 +1,335 @@ -package org.jboss.cache.config.parsing; - -import org.jboss.cache.Fqn; -import org.jboss.cache.config.ConfigurationException; -import org.jboss.cache.config.EvictionConfig; -import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.config.MissingPolicyException; -import org.jboss.cache.config.parsing.element.EvictionElementParser; -import org.jboss.cache.eviction.DefaultEvictionActionPolicy; -import org.jboss.cache.eviction.FIFOAlgorithmConfig; -import org.jboss.cache.eviction.LFUAlgorithmConfig; -import org.jboss.cache.eviction.LRUAlgorithmConfig; -import org.jboss.cache.eviction.MRUAlgorithmConfig; -import org.jboss.cache.eviction.NullEvictionAlgorithm; -import org.jboss.cache.eviction.NullEvictionAlgorithmConfig; -import org.jboss.cache.eviction.RemoveOnEvictActionPolicy; -import org.testng.annotations.Test; -import org.w3c.dom.Element; - -/** - * Tester class for {@link org.jboss.cache.config.parsing.element.EvictionElementParser}. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "unit") -public class EvictionElementParserTest -{ - EvictionElementParser parser = new EvictionElementParser(); - - /** - * Test that when nodes are not specified the config defaults to certain values. - */ - public void testDefaults() - { - String xml = - " <eviction wakeUpInterval=\"5\">\n" + - " <default algorithmClass=\"org.jboss.cache.eviction.MRUAlgorithm\">\n" + - " <property name=\"maxNodes\" value=\"10\"></property>\n" + - " <property name=\"minTimeToLive\" value=\"10\"></property>\n" + - " </default>\n" + - " <region name=\"/org/jboss/xyz\" eventQueueSize=\"21\">\n" + - " <property name=\"maxNodes\" value=\"2103\"></property>\n" + - " <property name=\"minTimeToLive\" value=\"22\"></property>\n" + - " </region>\n" + - " </eviction>"; - EvictionConfig evictionConfig = getEvictionConfig(xml, false); - assert evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; - assert evictionConfig.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); - } - - public void testRegionWithNoProperties() - { - String xml = - " <eviction wakeUpInterval=\"5\">\n" + - " <default algorithmClass=\"org.jboss.cache.eviction.MRUAlgorithm\">\n" + - " <property name=\"maxNodes\" value=\"10\"></property>\n" + - " <property name=\"minTimeToLive\" value=\"10\"></property>\n" + - " </default>\n" + - " <region name=\"/org/jboss/abc\" eventQueueSize=\"21\">\n" + - " </region>\n" + - " <region name=\"/org/jboss/xyz\" algorithmClass=\"org.jboss.cache.eviction.FIFOAlgorithm\">\n" + - " </region>\n" + - " </eviction>"; - EvictionConfig evictionConfig = getEvictionConfig(xml, false); - assert evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; - assert evictionConfig.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); - EvictionRegionConfig abc = evictionConfig.getEvictionRegionConfig("/org/jboss/abc"); - EvictionRegionConfig xyz = evictionConfig.getEvictionRegionConfig("/org/jboss/xyz"); - - assert abc.getEventQueueSize() == 21; - assert abc.getEvictionAlgorithmConfig() instanceof MRUAlgorithmConfig; - assert ((MRUAlgorithmConfig) abc.getEvictionAlgorithmConfig()).getMaxNodes() == 10; - assert ((MRUAlgorithmConfig) abc.getEvictionAlgorithmConfig()).getMinTimeToLive() == 10; - - assert xyz.getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; - assert xyz.getEvictionAlgorithmConfig() instanceof FIFOAlgorithmConfig; - assert ((FIFOAlgorithmConfig) xyz.getEvictionAlgorithmConfig()).getMaxNodes() == -1; - assert ((FIFOAlgorithmConfig) xyz.getEvictionAlgorithmConfig()).getMinTimeToLive() == -1; - } - - /** - * test unnecessary propertys - */ - public void testUnnecessaryAttributes() - { - String xml = - " <eviction wakeUpInterval=\"5\" defaultPolicyClass=\"org.jboss.cache.eviction.MRUPolicy\" defaultEventQueueSize=\"123456\">\n" + - " <default>\n" + - " <property name=\"maxNodes\" value=\"6\"></property>\n" + - " <property name=\"minTimeToLive\" value=\"7\"></property>\n" + - " </default>\n" + - " </eviction>"; - try - { - EvictionConfig config = getEvictionConfig(xml, false); - assert false : "Should throw ConfigurationException!"; - } - catch (ConfigurationException good) - { - // expected - } - } - - - /** - * test an happy flow. - */ - public void testNormalConfig() - { - String xml = - " <eviction wakeUpInterval=\"5\">\n" + - " <default algorithmClass=\"org.jboss.cache.eviction.MRUAlgorithm\" eventQueueSize=\"123456\">\n" + - " <property name=\"maxNodes\" value=\"6\"></property>\n" + - " <property name=\"minTimeToLive\" value=\"7\"></property>\n" + - " </default>\n" + - " <region name=\"/org/jboss/data\">\n" + - " <property name=\"minTimeToLive\" value=\"1002\"></property>\n" + - " <property name=\"maxNodes\" value=\"2021\"></property>\n" + - " </region>\n" + - " <region name=\"/org/jboss/xyz\" algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"21\">\n" + - " <property name=\"maxNodes\" value=\"2103\"></property>\n" + - " <property name=\"timeToLive\" value=\"22\"></property>\n" + - " </region>\n" + - " </eviction>"; - EvictionConfig config = getEvictionConfig(xml, false); - //tests the defaults - assert config.getWakeupInterval() == 5; - assert config.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() instanceof MRUAlgorithmConfig; - assert config.getDefaultEvictionRegionConfig().getEventQueueSize() == 123456; - assert config.getEvictionRegionConfigs().size() == 2; - - //test first region config - EvictionRegionConfig erConfig1 = config.getDefaultEvictionRegionConfig(); - erConfig1.getRegionFqn().equals(Fqn.ROOT); - MRUAlgorithmConfig defaultPolicyConfig = (MRUAlgorithmConfig) erConfig1.getEvictionAlgorithmConfig(); - assert defaultPolicyConfig.getMaxNodes() == 6; - assert defaultPolicyConfig.getMinTimeToLive() == 7; - - //test second region config - EvictionRegionConfig erConfig2 = config.getEvictionRegionConfigs().get(0); - assert erConfig2.getEventQueueSize() == 123456 : "Got " + erConfig2.getEventQueueSize(); - assert erConfig2.getRegionFqn().equals(Fqn.fromString("/org/jboss/data")); - MRUAlgorithmConfig mruConfiguration = (MRUAlgorithmConfig) erConfig2.getEvictionAlgorithmConfig(); - assert mruConfiguration.getMinTimeToLive() == 1002; - assert mruConfiguration.getMaxNodes() == 2021; - - //test 3rd region config - EvictionRegionConfig erConfig3 = config.getEvictionRegionConfigs().get(1); - assert erConfig3.getEventQueueSize() == 21; - assert erConfig3.getRegionFqn().equals(Fqn.fromString("/org/jboss/xyz")); - LRUAlgorithmConfig lruConfiguration = (LRUAlgorithmConfig) erConfig3.getEvictionAlgorithmConfig(); - assert lruConfiguration.getTimeToLive() == 22; - assert lruConfiguration.getMaxNodes() == 2103; - - assert config.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); - } - - public void testLruConfig() - { - String xml = - " <eviction wakeUpInterval=\"45000\">\n" + - " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"4\">\n" + - " <property name=\"maxNodes\" value=\"5000\"></property>\n" + - " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + - " <property name=\"maxAge\" value=\"15000\"></property>\n" + - " </default>\n" + - " <region name=\"/fifo\">\n" + - " <property name=\"maxNodes\" value=\"5000\"></property>\n" + - " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + - " </region>\n" + - " <region name=\"/mru\">\n" + - " <property name=\"maxNodes\" value=\"10000\"></property>\n" + - " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + - " </region>\n" + - " <region name=\"/lfu\">\n" + - " <property name=\"maxNodes\" value=\"5000\"></property>\n" + - " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + - " </region>\n" + - " </eviction>"; - EvictionConfig evConfig = getEvictionConfig(xml, false); - EvictionRegionConfig evictionRegionConfig = evConfig.getDefaultEvictionRegionConfig(); - assert evictionRegionConfig.getRegionName().equals(Fqn.ROOT.toString()) : "Was " + evictionRegionConfig.getRegionName(); - assert ((LRUAlgorithmConfig) evictionRegionConfig.getEvictionAlgorithmConfig()).getTimeToLive() == 1000000; - - assert evConfig.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); - } - - /** - * This is an mandatory parameter, if it is not present then an configuration exception is expected. - */ - public void testMissingWakeUpInterval() throws Exception - { - String xml = - " <eviction>\n" + - " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"200000\">\n" + - " <property name=\"maxNodes\">5000</property>\n" + - " <property name=\"timeToLive\">1000</property>\n" + - " </default>\n" + - " <region name=\"/org/jboss/data\">\n" + - " <property name=\"timeToLive\">1002</property>\n" + - " </region>\n" + - " </eviction>"; - try - { - getEvictionConfig(xml, false); - assert false : "exception expected as wake up interval is not set"; - } - catch (ConfigurationException e) - { - //expected - } - } - - /** - * If no policy is configured at region basis, and also no policy is configured at region basis, - * exception is expected. - */ - public void testMissingPolicyOnRegion() - { - String xml = - " <eviction wakeUpInterval=\"5000\">\n" + - " <region name=\"/org/jboss/data\" eventQueueSize=\"5\">\n" + - " <property name=\"timeToLive\">1002</property>\n" + - " </region>\n" + - " </eviction>"; - try - { - getEvictionConfig(xml, false); - assert false : "missing policy in both default and region, exception expected."; - } - catch (MissingPolicyException e) - { - //expected - } - } - - /** - * Same as above, except no queue size is specified. SHould NOT fail. - */ - public void testMissingQueueSizeOnRegion() - { - String xml = - " <eviction wakeUpInterval=\"5000\">\n" + - " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\">\n" + - " <property name=\"timeToLive\">1002</property>\n" + - " </region>\n" + - " </eviction>"; - EvictionConfig ec = getEvictionConfig(xml, false); - assert ec.getEvictionRegionConfigs().get(0).getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; - } - - - private EvictionConfig getEvictionConfig(String xml, boolean validate) - { - Element el; - try - { - el = XmlConfigHelper.stringToElementInCoreNS(xml); - } - catch (Exception e) - { - throw new ConfigurationException(e); - } - EvictionConfig cfg = parser.parseEvictionElement(el); - if (validate) - { - cfg.getDefaultEvictionRegionConfig().validate(); - for (EvictionRegionConfig erc : cfg.getEvictionRegionConfigs()) erc.validate(); - } - return cfg; - } - - public void testMissingDefaultEvictionClass() throws Exception - { - String xml = - " <eviction wakeUpInterval=\"5000\">\n" + - " <default>\n" + - " <property name=\"maxNodes\">5000</property>\n" + - " <property name=\"timeToLive\">1000</property>\n" + - " </default>\n" + - " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\">\n" + - " <property name=\"maxNodes\">5000</property>\n" + - " <property name=\"minNodes\">1000</property>\n" + - " </region>\n" + - " </eviction>"; - try - { - getEvictionConfig(xml, true); - assert false : " exception expected as default element does not have a eviction policy defined"; - } - catch (MissingPolicyException e) - { - //expected - } - } - - public void testDifferentEvictionActionPolicyClasses() throws Exception - { - String xml = - " <eviction wakeUpInterval=\"5000\">\n" + - " <default algorithmClass=\"" + NullEvictionAlgorithm.class.getName() + "\" actionPolicyClass=\"" + RemoveOnEvictActionPolicy.class.getName() + "\">\n" + - " </default>\n" + - " <region name=\"/one\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\">\n" + - " <property name=\"maxNodes\">5000</property>\n" + - " <property name=\"minNodes\">1000</property>\n" + - " </region>\n" + - " <region name=\"/two\" actionPolicyClass=\"" + DefaultEvictionActionPolicy.class.getName() + "\">\n" + - " </region>\n" + - " </eviction>"; - EvictionConfig config = getEvictionConfig(xml, false); - - // default region - assert config.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() instanceof NullEvictionAlgorithmConfig; - assert config.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(RemoveOnEvictActionPolicy.class.getName()); - - // region /one - assert findRegionConfig(config, "/one").getEvictionAlgorithmConfig() instanceof LFUAlgorithmConfig; - assert findRegionConfig(config, "/one").getEvictionActionPolicyClassName().equals(RemoveOnEvictActionPolicy.class.getName()); - - // region /two - assert findRegionConfig(config, "/two").getEvictionAlgorithmConfig() instanceof NullEvictionAlgorithmConfig; - assert findRegionConfig(config, "/two").getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); - } - - private EvictionRegionConfig findRegionConfig(EvictionConfig evictionConfig, String fqn) - { - for (EvictionRegionConfig erc : evictionConfig.getEvictionRegionConfigs()) - { - if (erc.getRegionFqn().equals(Fqn.fromString(fqn))) return erc; - } - - return null; - } -} +package org.jboss.cache.config.parsing; + +import org.jboss.cache.Fqn; +import org.jboss.cache.config.ConfigurationException; +import org.jboss.cache.config.EvictionConfig; +import org.jboss.cache.config.EvictionRegionConfig; +import org.jboss.cache.config.MissingPolicyException; +import org.jboss.cache.config.parsing.element.EvictionElementParser; +import org.jboss.cache.eviction.DefaultEvictionActionPolicy; +import org.jboss.cache.eviction.FIFOAlgorithmConfig; +import org.jboss.cache.eviction.LFUAlgorithmConfig; +import org.jboss.cache.eviction.LRUAlgorithmConfig; +import org.jboss.cache.eviction.MRUAlgorithmConfig; +import org.jboss.cache.eviction.NullEvictionAlgorithm; +import org.jboss.cache.eviction.NullEvictionAlgorithmConfig; +import org.jboss.cache.eviction.RemoveOnEvictActionPolicy; +import org.testng.annotations.Test; +import org.w3c.dom.Element; + +/** + * Tester class for {@link org.jboss.cache.config.parsing.element.EvictionElementParser}. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "unit", testName = "config.parsing.EvictionElementParserTest") +public class EvictionElementParserTest +{ + EvictionElementParser parser = new EvictionElementParser(); + + /** + * Test that when nodes are not specified the config defaults to certain values. + */ + public void testDefaults() + { + String xml = + " <eviction wakeUpInterval=\"5\">\n" + + " <default algorithmClass=\"org.jboss.cache.eviction.MRUAlgorithm\">\n" + + " <property name=\"maxNodes\" value=\"10\"></property>\n" + + " <property name=\"minTimeToLive\" value=\"10\"></property>\n" + + " </default>\n" + + " <region name=\"/org/jboss/xyz\" eventQueueSize=\"21\">\n" + + " <property name=\"maxNodes\" value=\"2103\"></property>\n" + + " <property name=\"minTimeToLive\" value=\"22\"></property>\n" + + " </region>\n" + + " </eviction>"; + EvictionConfig evictionConfig = getEvictionConfig(xml, false); + assert evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; + assert evictionConfig.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); + } + + public void testRegionWithNoProperties() + { + String xml = + " <eviction wakeUpInterval=\"5\">\n" + + " <default algorithmClass=\"org.jboss.cache.eviction.MRUAlgorithm\">\n" + + " <property name=\"maxNodes\" value=\"10\"></property>\n" + + " <property name=\"minTimeToLive\" value=\"10\"></property>\n" + + " </default>\n" + + " <region name=\"/org/jboss/abc\" eventQueueSize=\"21\">\n" + + " </region>\n" + + " <region name=\"/org/jboss/xyz\" algorithmClass=\"org.jboss.cache.eviction.FIFOAlgorithm\">\n" + + " </region>\n" + + " </eviction>"; + EvictionConfig evictionConfig = getEvictionConfig(xml, false); + assert evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; + assert evictionConfig.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); + EvictionRegionConfig abc = evictionConfig.getEvictionRegionConfig("/org/jboss/abc"); + EvictionRegionConfig xyz = evictionConfig.getEvictionRegionConfig("/org/jboss/xyz"); + + assert abc.getEventQueueSize() == 21; + assert abc.getEvictionAlgorithmConfig() instanceof MRUAlgorithmConfig; + assert ((MRUAlgorithmConfig) abc.getEvictionAlgorithmConfig()).getMaxNodes() == 10; + assert ((MRUAlgorithmConfig) abc.getEvictionAlgorithmConfig()).getMinTimeToLive() == 10; + + assert xyz.getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; + assert xyz.getEvictionAlgorithmConfig() instanceof FIFOAlgorithmConfig; + assert ((FIFOAlgorithmConfig) xyz.getEvictionAlgorithmConfig()).getMaxNodes() == -1; + assert ((FIFOAlgorithmConfig) xyz.getEvictionAlgorithmConfig()).getMinTimeToLive() == -1; + } + + /** + * test unnecessary propertys + */ + public void testUnnecessaryAttributes() + { + String xml = + " <eviction wakeUpInterval=\"5\" defaultPolicyClass=\"org.jboss.cache.eviction.MRUPolicy\" defaultEventQueueSize=\"123456\">\n" + + " <default>\n" + + " <property name=\"maxNodes\" value=\"6\"></property>\n" + + " <property name=\"minTimeToLive\" value=\"7\"></property>\n" + + " </default>\n" + + " </eviction>"; + try + { + EvictionConfig config = getEvictionConfig(xml, false); + assert false : "Should throw ConfigurationException!"; + } + catch (ConfigurationException good) + { + // expected + } + } + + + /** + * test an happy flow. + */ + public void testNormalConfig() + { + String xml = + " <eviction wakeUpInterval=\"5\">\n" + + " <default algorithmClass=\"org.jboss.cache.eviction.MRUAlgorithm\" eventQueueSize=\"123456\">\n" + + " <property name=\"maxNodes\" value=\"6\"></property>\n" + + " <property name=\"minTimeToLive\" value=\"7\"></property>\n" + + " </default>\n" + + " <region name=\"/org/jboss/data\">\n" + + " <property name=\"minTimeToLive\" value=\"1002\"></property>\n" + + " <property name=\"maxNodes\" value=\"2021\"></property>\n" + + " </region>\n" + + " <region name=\"/org/jboss/xyz\" algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"21\">\n" + + " <property name=\"maxNodes\" value=\"2103\"></property>\n" + + " <property name=\"timeToLive\" value=\"22\"></property>\n" + + " </region>\n" + + " </eviction>"; + EvictionConfig config = getEvictionConfig(xml, false); + //tests the defaults + assert config.getWakeupInterval() == 5; + assert config.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() instanceof MRUAlgorithmConfig; + assert config.getDefaultEvictionRegionConfig().getEventQueueSize() == 123456; + assert config.getEvictionRegionConfigs().size() == 2; + + //test first region config + EvictionRegionConfig erConfig1 = config.getDefaultEvictionRegionConfig(); + erConfig1.getRegionFqn().equals(Fqn.ROOT); + MRUAlgorithmConfig defaultPolicyConfig = (MRUAlgorithmConfig) erConfig1.getEvictionAlgorithmConfig(); + assert defaultPolicyConfig.getMaxNodes() == 6; + assert defaultPolicyConfig.getMinTimeToLive() == 7; + + //test second region config + EvictionRegionConfig erConfig2 = config.getEvictionRegionConfigs().get(0); + assert erConfig2.getEventQueueSize() == 123456 : "Got " + erConfig2.getEventQueueSize(); + assert erConfig2.getRegionFqn().equals(Fqn.fromString("/org/jboss/data")); + MRUAlgorithmConfig mruConfiguration = (MRUAlgorithmConfig) erConfig2.getEvictionAlgorithmConfig(); + assert mruConfiguration.getMinTimeToLive() == 1002; + assert mruConfiguration.getMaxNodes() == 2021; + + //test 3rd region config + EvictionRegionConfig erConfig3 = config.getEvictionRegionConfigs().get(1); + assert erConfig3.getEventQueueSize() == 21; + assert erConfig3.getRegionFqn().equals(Fqn.fromString("/org/jboss/xyz")); + LRUAlgorithmConfig lruConfiguration = (LRUAlgorithmConfig) erConfig3.getEvictionAlgorithmConfig(); + assert lruConfiguration.getTimeToLive() == 22; + assert lruConfiguration.getMaxNodes() == 2103; + + assert config.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); + } + + public void testLruConfig() + { + String xml = + " <eviction wakeUpInterval=\"45000\">\n" + + " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"4\">\n" + + " <property name=\"maxNodes\" value=\"5000\"></property>\n" + + " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + + " <property name=\"maxAge\" value=\"15000\"></property>\n" + + " </default>\n" + + " <region name=\"/fifo\">\n" + + " <property name=\"maxNodes\" value=\"5000\"></property>\n" + + " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + + " </region>\n" + + " <region name=\"/mru\">\n" + + " <property name=\"maxNodes\" value=\"10000\"></property>\n" + + " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + + " </region>\n" + + " <region name=\"/lfu\">\n" + + " <property name=\"maxNodes\" value=\"5000\"></property>\n" + + " <property name=\"timeToLive\" value=\"1000000\"></property>\n" + + " </region>\n" + + " </eviction>"; + EvictionConfig evConfig = getEvictionConfig(xml, false); + EvictionRegionConfig evictionRegionConfig = evConfig.getDefaultEvictionRegionConfig(); + assert evictionRegionConfig.getRegionName().equals(Fqn.ROOT.toString()) : "Was " + evictionRegionConfig.getRegionName(); + assert ((LRUAlgorithmConfig) evictionRegionConfig.getEvictionAlgorithmConfig()).getTimeToLive() == 1000000; + + assert evConfig.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); + } + + /** + * This is an mandatory parameter, if it is not present then an configuration exception is expected. + */ + public void testMissingWakeUpInterval() throws Exception + { + String xml = + " <eviction>\n" + + " <default algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\" eventQueueSize=\"200000\">\n" + + " <property name=\"maxNodes\">5000</property>\n" + + " <property name=\"timeToLive\">1000</property>\n" + + " </default>\n" + + " <region name=\"/org/jboss/data\">\n" + + " <property name=\"timeToLive\">1002</property>\n" + + " </region>\n" + + " </eviction>"; + try + { + getEvictionConfig(xml, false); + assert false : "exception expected as wake up interval is not set"; + } + catch (ConfigurationException e) + { + //expected + } + } + + /** + * If no policy is configured at region basis, and also no policy is configured at region basis, + * exception is expected. + */ + public void testMissingPolicyOnRegion() + { + String xml = + " <eviction wakeUpInterval=\"5000\">\n" + + " <region name=\"/org/jboss/data\" eventQueueSize=\"5\">\n" + + " <property name=\"timeToLive\">1002</property>\n" + + " </region>\n" + + " </eviction>"; + try + { + getEvictionConfig(xml, false); + assert false : "missing policy in both default and region, exception expected."; + } + catch (MissingPolicyException e) + { + //expected + } + } + + /** + * Same as above, except no queue size is specified. SHould NOT fail. + */ + public void testMissingQueueSizeOnRegion() + { + String xml = + " <eviction wakeUpInterval=\"5000\">\n" + + " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LRUAlgorithm\">\n" + + " <property name=\"timeToLive\">1002</property>\n" + + " </region>\n" + + " </eviction>"; + EvictionConfig ec = getEvictionConfig(xml, false); + assert ec.getEvictionRegionConfigs().get(0).getEventQueueSize() == EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; + } + + + private EvictionConfig getEvictionConfig(String xml, boolean validate) + { + Element el; + try + { + el = XmlConfigHelper.stringToElementInCoreNS(xml); + } + catch (Exception e) + { + throw new ConfigurationException(e); + } + EvictionConfig cfg = parser.parseEvictionElement(el); + if (validate) + { + cfg.getDefaultEvictionRegionConfig().validate(); + for (EvictionRegionConfig erc : cfg.getEvictionRegionConfigs()) erc.validate(); + } + return cfg; + } + + public void testMissingDefaultEvictionClass() throws Exception + { + String xml = + " <eviction wakeUpInterval=\"5000\">\n" + + " <default>\n" + + " <property name=\"maxNodes\">5000</property>\n" + + " <property name=\"timeToLive\">1000</property>\n" + + " </default>\n" + + " <region name=\"/org/jboss/data\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\">\n" + + " <property name=\"maxNodes\">5000</property>\n" + + " <property name=\"minNodes\">1000</property>\n" + + " </region>\n" + + " </eviction>"; + try + { + getEvictionConfig(xml, true); + assert false : " exception expected as default element does not have a eviction policy defined"; + } + catch (MissingPolicyException e) + { + //expected + } + } + + public void testDifferentEvictionActionPolicyClasses() throws Exception + { + String xml = + " <eviction wakeUpInterval=\"5000\">\n" + + " <default algorithmClass=\"" + NullEvictionAlgorithm.class.getName() + "\" actionPolicyClass=\"" + RemoveOnEvictActionPolicy.class.getName() + "\">\n" + + " </default>\n" + + " <region name=\"/one\" algorithmClass=\"org.jboss.cache.eviction.LFUAlgorithm\">\n" + + " <property name=\"maxNodes\">5000</property>\n" + + " <property name=\"minNodes\">1000</property>\n" + + " </region>\n" + + " <region name=\"/two\" actionPolicyClass=\"" + DefaultEvictionActionPolicy.class.getName() + "\">\n" + + " </region>\n" + + " </eviction>"; + EvictionConfig config = getEvictionConfig(xml, false); + + // default region + assert config.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig() instanceof NullEvictionAlgorithmConfig; + assert config.getDefaultEvictionRegionConfig().getEvictionActionPolicyClassName().equals(RemoveOnEvictActionPolicy.class.getName()); + + // region /one + assert findRegionConfig(config, "/one").getEvictionAlgorithmConfig() instanceof LFUAlgorithmConfig; + assert findRegionConfig(config, "/one").getEvictionActionPolicyClassName().equals(RemoveOnEvictActionPolicy.class.getName()); + + // region /two + assert findRegionConfig(config, "/two").getEvictionAlgorithmConfig() instanceof NullEvictionAlgorithmConfig; + assert findRegionConfig(config, "/two").getEvictionActionPolicyClassName().equals(DefaultEvictionActionPolicy.class.getName()); + } + + private EvictionRegionConfig findRegionConfig(EvictionConfig evictionConfig, String fqn) + { + for (EvictionRegionConfig erc : evictionConfig.getEvictionRegionConfigs()) + { + if (erc.getRegionFqn().equals(Fqn.fromString(fqn))) return erc; + } + + return null; + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,84 +1,84 @@ -package org.jboss.cache.config.parsing; - -import org.testng.annotations.Test; -import org.w3c.dom.Element; - -/** - * Tester class for {@link org.jboss.cache.config.parsing.JGroupsStackParser} - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "unit") -public class JGroupsStackParserTest -{ - private JGroupsStackParser parser = new JGroupsStackParser(); - - public void testSimpleParse() throws Exception - { - String xml = - "<jgroupsConfig>\n" + - "<UDP mcast_addr=\"228.10.10.10\"\n" + - " mcast_port=\"45588\"\n" + - " tos=\"8\"\n" + - " ucast_recv_buf_size=\"20000000\"\n" + - " ucast_send_buf_size=\"640000\"\n" + - " mcast_recv_buf_size=\"25000000\"\n" + - " mcast_send_buf_size=\"640000\"\n" + - " loopback=\"false\"\n" + - " discard_incompatible_packets=\"true\"\n" + - " max_bundle_size=\"64000\"\n" + - " max_bundle_timeout=\"30\"\n" + - " use_incoming_packet_handler=\"true\"\n" + - " ip_ttl=\"2\"\n" + - " enable_bundling=\"false\"\n" + - " enable_diagnostics=\"true\"\n" + - " use_concurrent_stack=\"true\"\n" + - " thread_naming_pattern=\"pl\"\n" + - " thread_pool.enabled=\"true\"\n" + - " thread_pool.min_threads=\"1\"\n" + - " thread_pool.max_threads=\"25\"\n" + - " thread_pool.keep_alive_time=\"30000\"\n" + - " thread_pool.queue_enabled=\"true\"\n" + - " thread_pool.queue_max_size=\"10\"\n" + - " thread_pool.rejection_policy=\"Run\"\n" + - " oob_thread_pool.enabled=\"true\"\n" + - " oob_thread_pool.min_threads=\"1\"\n" + - " oob_thread_pool.max_threads=\"4\"\n" + - " oob_thread_pool.keep_alive_time=\"10000\"\n" + - " oob_thread_pool.queue_enabled=\"true\"\n" + - " oob_thread_pool.queue_max_size=\"10\"\n" + - " oob_thread_pool.rejection_policy=\"Run\"/>\n" + - " <PING timeout=\"2000\" num_initial_members=\"3\"/>\n" + - " <MERGE2 max_interval=\"30000\" min_interval=\"10000\"/>\n" + - " <FD_SOCK/>\n" + - " <FD timeout=\"10000\" max_tries=\"5\" shun=\"true\"/>\n" + - " <VERIFY_SUSPECT timeout=\"1500\"/>\n" + - " <pbcast.NAKACK max_xmit_size=\"60000\"\n" + - " use_mcast_xmit=\"false\" gc_lag=\"0\"\n" + - " retransmit_timeout=\"300,600,1200,2400,4800\"\n" + - " discard_delivered_msgs=\"true\"/>\n" + - " <UNICAST timeout=\"300,600,1200,2400,3600\"/>\n" + - " <pbcast.STABLE stability_delay=\"1000\" desired_avg_gossip=\"50000\"\n" + - " max_bytes=\"400000\"/>\n" + - " <pbcast.GMS print_local_addr=\"true\" join_timeout=\"5000\"\n" + - " join_retry_timeout=\"2000\" shun=\"false\"\n" + - " view_bundling=\"true\" view_ack_collection_timeout=\"5000\"/>\n" + - " <FRAG2 frag_size=\"60000\"/>\n" + - " <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" + - " <pbcast.FLUSH timeout=\"0\"/>\n" + - "</jgroupsConfig>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(xml); - String result = parser.parseClusterConfigXml(element); - assert result.indexOf("ucast_recv_buf_size=20000000") > 0; - assert result.indexOf("num_initial_members=3") > 0; - assert result.indexOf("min_interval=10000") > 0; - } - - public void testParsingEmptyConfig() throws Exception - { - String xml = "<jgroupsConfig/>"; - Element element = XmlConfigHelper.stringToElementInCoreNS(xml); - String result = parser.parseClusterConfigXml(element); - } -} +package org.jboss.cache.config.parsing; + +import org.testng.annotations.Test; +import org.w3c.dom.Element; + +/** + * Tester class for {@link org.jboss.cache.config.parsing.JGroupsStackParser} + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "unit", testName = "config.parsing.JGroupsStackParserTest") +public class JGroupsStackParserTest +{ + private JGroupsStackParser parser = new JGroupsStackParser(); + + public void testSimpleParse() throws Exception + { + String xml = + "<jgroupsConfig>\n" + + "<UDP mcast_addr=\"228.10.10.10\"\n" + + " mcast_port=\"45588\"\n" + + " tos=\"8\"\n" + + " ucast_recv_buf_size=\"20000000\"\n" + + " ucast_send_buf_size=\"640000\"\n" + + " mcast_recv_buf_size=\"25000000\"\n" + + " mcast_send_buf_size=\"640000\"\n" + + " loopback=\"false\"\n" + + " discard_incompatible_packets=\"true\"\n" + + " max_bundle_size=\"64000\"\n" + + " max_bundle_timeout=\"30\"\n" + + " use_incoming_packet_handler=\"true\"\n" + + " ip_ttl=\"2\"\n" + + " enable_bundling=\"false\"\n" + + " enable_diagnostics=\"true\"\n" + + " use_concurrent_stack=\"true\"\n" + + " thread_naming_pattern=\"pl\"\n" + + " thread_pool.enabled=\"true\"\n" + + " thread_pool.min_threads=\"1\"\n" + + " thread_pool.max_threads=\"25\"\n" + + " thread_pool.keep_alive_time=\"30000\"\n" + + " thread_pool.queue_enabled=\"true\"\n" + + " thread_pool.queue_max_size=\"10\"\n" + + " thread_pool.rejection_policy=\"Run\"\n" + + " oob_thread_pool.enabled=\"true\"\n" + + " oob_thread_pool.min_threads=\"1\"\n" + + " oob_thread_pool.max_threads=\"4\"\n" + + " oob_thread_pool.keep_alive_time=\"10000\"\n" + + " oob_thread_pool.queue_enabled=\"true\"\n" + + " oob_thread_pool.queue_max_size=\"10\"\n" + + " oob_thread_pool.rejection_policy=\"Run\"/>\n" + + " <PING timeout=\"2000\" num_initial_members=\"3\"/>\n" + + " <MERGE2 max_interval=\"30000\" min_interval=\"10000\"/>\n" + + " <FD_SOCK/>\n" + + " <FD timeout=\"10000\" max_tries=\"5\" shun=\"true\"/>\n" + + " <VERIFY_SUSPECT timeout=\"1500\"/>\n" + + " <pbcast.NAKACK max_xmit_size=\"60000\"\n" + + " use_mcast_xmit=\"false\" gc_lag=\"0\"\n" + + " retransmit_timeout=\"300,600,1200,2400,4800\"\n" + + " discard_delivered_msgs=\"true\"/>\n" + + " <UNICAST timeout=\"300,600,1200,2400,3600\"/>\n" + + " <pbcast.STABLE stability_delay=\"1000\" desired_avg_gossip=\"50000\"\n" + + " max_bytes=\"400000\"/>\n" + + " <pbcast.GMS print_local_addr=\"true\" join_timeout=\"5000\"\n" + + " join_retry_timeout=\"2000\" shun=\"false\"\n" + + " view_bundling=\"true\" view_ack_collection_timeout=\"5000\"/>\n" + + " <FRAG2 frag_size=\"60000\"/>\n" + + " <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" + + " <pbcast.FLUSH timeout=\"0\"/>\n" + + "</jgroupsConfig>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(xml); + String result = parser.parseClusterConfigXml(element); + assert result.indexOf("ucast_recv_buf_size=20000000") > 0; + assert result.indexOf("num_initial_members=3") > 0; + assert result.indexOf("min_interval=10000") > 0; + } + + public void testParsingEmptyConfig() throws Exception + { + String xml = "<jgroupsConfig/>"; + Element element = XmlConfigHelper.stringToElementInCoreNS(xml); + String result = parser.parseClusterConfigXml(element); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,156 +1,156 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.cache.config.parsing; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.spi.LoggingEvent; -import org.jboss.cache.Cache; -import org.jboss.cache.UnitTestCacheFactory; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.io.File; -import java.io.FilenameFilter; - -/** - * The purpose of this test is to make sure that the config files we ship are correct both according to xml schema and - * according to the used JGroups/JBossCache version. For the latter, we start a cache instance and make sure that no - * configuration warnings are being logged by both JGroups and JBossCache. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "functional") -public class SampleConfigFilesCorrectnessTest -{ - public static final String CONFIG_ROOT = "src/main/resources/config-samples"; - public static final String XSD_FILE = "src/main/resources/jbosscache-config-3.0.xsd"; - - private InMemoryAppender appender; - private Level oldLevel; - - @BeforeMethod - public void setUpTest() - { - Logger log4jLogger = Logger.getRootLogger(); - oldLevel = log4jLogger.getLevel(); - log4jLogger.setLevel(Level.WARN); - appender = new InMemoryAppender(); - log4jLogger.addAppender(appender); - File f = new File("."); - System.out.println("f = " + f.getAbsolutePath()); - } - - @AfterMethod - public void tearDownTest() - { - Logger log4jLogger = Logger.getRootLogger(); - log4jLogger.setLevel(oldLevel); - log4jLogger.removeAppender(appender); - appender.close(); - } - - public void testSchemaValidity() - { - System.setProperty("jbosscache.config.schemaLocation", XSD_FILE); - XmlConfigurationSchemaTest.ExceptionCountingErrorHandler errorHandler = new XmlConfigurationSchemaTest.ExceptionCountingErrorHandler(); - XmlConfigurationParser parser = new XmlConfigurationParser(errorHandler); - String[] configFiles = getConfigFileNames(); - for (String aConfFile : configFiles) - { - System.out.println("Processing file: " + aConfFile); - parser.parseFile(CONFIG_ROOT + "/" + aConfFile); - } - assert errorHandler.noErrors(); - } - - public void testConfigWarnings() - { - UnitTestCacheFactory ucf = new UnitTestCacheFactory(); - for (String aConfFile : getConfigFileNames()) - { - System.out.println("Processing file: " + aConfFile); - assert !appender.isFoundUnknownWarning(); - Cache cache = ucf.createCache(CONFIG_ROOT + "/" + aConfFile, false); -// cache.stop(); - assert !appender.isFoundUnknownWarning(); - } - } - - private String[] getConfigFileNames() - { - File file = new File(CONFIG_ROOT); - return file.list(new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.indexOf("xml") > 0; - } - }); - } - - - private static class InMemoryAppender extends AppenderSkeleton - { - String[] TOLERABLE_WARNINGS = {"Falling back to DummyTransactionManager"}; - boolean foundUnknownWarning = false; - - protected void append(LoggingEvent event) - { - if (event.getLevel().equals(Level.WARN)) - { - boolean skipPrinting = false; - foundUnknownWarning = true; - for (String knownWarn : TOLERABLE_WARNINGS) - { - if (event.getMessage().toString().indexOf(knownWarn) >= 0) - { - skipPrinting = true; - foundUnknownWarning = false; - } - } - if (!skipPrinting) - { - System.out.println("Unaccepted warn message :" + event.getMessage()); - } - } - } - - public boolean requiresLayout() - { - return false; - } - - public void close() - { - //do nothing - } - - public boolean isFoundUnknownWarning() - { - return foundUnknownWarning; - } - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.cache.config.parsing; + +import org.apache.log4j.AppenderSkeleton; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.spi.LoggingEvent; +import org.jboss.cache.Cache; +import org.jboss.cache.UnitTestCacheFactory; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.FilenameFilter; + +/** + * The purpose of this test is to make sure that the config files we ship are correct both according to xml schema and + * according to the used JGroups/JBossCache version. For the latter, we start a cache instance and make sure that no + * configuration warnings are being logged by both JGroups and JBossCache. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "functional", testName = "config.parsing.SampleConfigFilesCorrectnessTest") +public class SampleConfigFilesCorrectnessTest +{ + public static final String CONFIG_ROOT = "src/main/resources/config-samples"; + public static final String XSD_FILE = "src/main/resources/jbosscache-config-3.0.xsd"; + + private InMemoryAppender appender; + private Level oldLevel; + + @BeforeMethod + public void setUpTest() + { + Logger log4jLogger = Logger.getRootLogger(); + oldLevel = log4jLogger.getLevel(); + log4jLogger.setLevel(Level.WARN); + appender = new InMemoryAppender(); + log4jLogger.addAppender(appender); + File f = new File("."); + System.out.println("f = " + f.getAbsolutePath()); + } + + @AfterMethod + public void tearDownTest() + { + Logger log4jLogger = Logger.getRootLogger(); + log4jLogger.setLevel(oldLevel); + log4jLogger.removeAppender(appender); + appender.close(); + } + + public void testSchemaValidity() + { + System.setProperty("jbosscache.config.schemaLocation", XSD_FILE); + XmlConfigurationSchemaTest.ExceptionCountingErrorHandler errorHandler = new XmlConfigurationSchemaTest.ExceptionCountingErrorHandler(); + XmlConfigurationParser parser = new XmlConfigurationParser(errorHandler); + String[] configFiles = getConfigFileNames(); + for (String aConfFile : configFiles) + { + System.out.println("Processing file: " + aConfFile); + parser.parseFile(CONFIG_ROOT + "/" + aConfFile); + } + assert errorHandler.noErrors(); + } + + public void testConfigWarnings() + { + UnitTestCacheFactory ucf = new UnitTestCacheFactory(); + for (String aConfFile : getConfigFileNames()) + { + System.out.println("Processing file: " + aConfFile); + assert !appender.isFoundUnknownWarning(); + Cache cache = ucf.createCache(CONFIG_ROOT + "/" + aConfFile, false); +// cache.stop(); + assert !appender.isFoundUnknownWarning(); + } + } + + private String[] getConfigFileNames() + { + File file = new File(CONFIG_ROOT); + return file.list(new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.indexOf("xml") > 0; + } + }); + } + + + private static class InMemoryAppender extends AppenderSkeleton + { + String[] TOLERABLE_WARNINGS = {"Falling back to DummyTransactionManager"}; + boolean foundUnknownWarning = false; + + protected void append(LoggingEvent event) + { + if (event.getLevel().equals(Level.WARN)) + { + boolean skipPrinting = false; + foundUnknownWarning = true; + for (String knownWarn : TOLERABLE_WARNINGS) + { + if (event.getMessage().toString().indexOf(knownWarn) >= 0) + { + skipPrinting = true; + foundUnknownWarning = false; + } + } + if (!skipPrinting) + { + System.out.println("Unaccepted warn message :" + event.getMessage()); + } + } + } + + public boolean requiresLayout() + { + return false; + } + + public void close() + { + //do nothing + } + + public boolean isFoundUnknownWarning() + { + return foundUnknownWarning; + } + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,293 +1,293 @@ -package org.jboss.cache.config.parsing; - -import org.jboss.cache.config.BuddyReplicationConfig; -import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.config.ConfigurationException; -import org.jboss.cache.config.CustomInterceptorConfig; -import org.jboss.cache.config.EvictionConfig; -import org.jboss.cache.config.EvictionRegionConfig; -import org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor; -import org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor; -import org.jboss.cache.eviction.LRUAlgorithmConfig; -import org.jboss.cache.eviction.MRUAlgorithmConfig; -import org.jboss.cache.lock.IsolationLevel; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; - -import java.util.List; - -/** - * Parses a 'normal' configuration file and makes sure that the resulted <b>Configuration</b> object has - * the expected state. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "functional") -public class XmlConfigurationParserTest -{ - Configuration syncConfig, asyncConfig; - - @BeforeTest - public void setUp() - { - syncConfig = new XmlConfigurationParser(false, null).parseFile("configs/parser-test.xml"); - asyncConfig = new XmlConfigurationParser(false, null).parseFile("configs/parser-test-async.xml"); - } - - public void testParseOldConfigFile() - { - System.setProperty("jbosscache.config.validate", "false"); - XmlConfigurationParser parser = new XmlConfigurationParser(); - try - { - parser.parseFile("configs/conf2x/pess-local.xml"); - assert false : "exception expected"; - } - catch (ConfigurationException e) - { - //expectd - } - finally - { - System.setProperty("jbosscache.config.validate", "true"); - } - } - - public void testTransactionManagerLookupClass() - { - assert syncConfig.getTransactionManagerLookupClass().equals("org.jboss.cache.transaction.GenericTransactionManagerLookup"); - } - - public void testIsolationLevel() - { - assert syncConfig.getIsolationLevel().equals(IsolationLevel.REPEATABLE_READ); - } - - public void testCacheMode() - { - assert syncConfig.getCacheMode().equals(Configuration.CacheMode.REPL_SYNC) : "Was " + syncConfig.getCacheMode(); - assert asyncConfig.getCacheMode().equals(Configuration.CacheMode.REPL_ASYNC): "Was " + syncConfig.getCacheMode(); - } - - public void testAsyncSerializationExecutorSize() - { - assert asyncConfig.getSerializationExecutorPoolSize() == 250; - } - - public void testUseReplQueue() - { - assert !syncConfig.isUseReplQueue(); - assert !asyncConfig.isUseReplQueue(); - } - - public void testClusterName() - { - assert syncConfig.getClusterName().equals("JBossCache-cluster"); - } - - public void testGetClusterConfig() - { - assert asyncConfig.getClusterConfig().indexOf("MERGE2") >= 0; - } - - public void testFetchInMemoryState() - { - assert syncConfig.isFetchInMemoryState(); - } - - public void testStateRetrievalTimeout() - { - assert syncConfig.getStateRetrievalTimeout() == 15124; - } - - public void testSyncReplTimeout() - { - assert syncConfig.getSyncReplTimeout() == 15421; - } - - public void testLockAcquisitionTimeout() - { - assert syncConfig.getLockAcquisitionTimeout() == 10234; - } - - public void testUseLazyDeserialization() - { - assert syncConfig.isUseLazyDeserialization(); - } - - public void testObjectInputStreamPoolSize() - { - assert 12 == syncConfig.getObjectInputStreamPoolSize(); - } - - public void testObjectOutputStreamPoolSize() - { - assert 14 == syncConfig.getObjectOutputStreamPoolSize(); - } - - public void testShutdownHookBehavior() - { - assert Configuration.ShutdownHookBehavior.REGISTER == syncConfig.getShutdownHookBehavior(); - } - - public void testSyncRollbackPhase() - { - assert syncConfig.isSyncRollbackPhase(); - } - - public void testSyncCommitPhase() - { - assert syncConfig.isSyncCommitPhase(); - } - - public void testUseReplicationVersion() - { - assert syncConfig.getReplicationVersion() == 124; - } - - public void testGetMultiplexerStack() - { - assert "file_name".equals(syncConfig.getMultiplexerStack()); - } - - public void testMarshallerClass() - { - assert "some.Clazz".equals(syncConfig.getMarshallerClass()); - } - - public void testLockParentForChildInsertRemove() - { - assert syncConfig.isLockParentForChildInsertRemove(); - } - - public void testInactiveOnStartup() - { - assert syncConfig.isInactiveOnStartup(); - } - - public void testExposeManagementStatistics() - { - assert !syncConfig.getExposeManagementStatistics(); - } - - public void testCacheLoaderConfiguration() - { - CacheLoaderConfig clc = syncConfig.getCacheLoaderConfig(); - assert null != clc; - assert clc.isPassivation(); - assert clc.isShared(); - assert "/a/b/c,/f/r/s".equals(clc.getPreload()); - CacheLoaderConfig.IndividualCacheLoaderConfig first = clc.getFirstCacheLoaderConfig(); - assert "org.jboss.cache.loader.JDBCCacheLoader".equals(first.getClassName()); - assert first.isAsync(); - assert first.isFetchPersistentState(); - assert first.isIgnoreModifications(); - assert first.isPurgeOnStartup(); - assert first.getProperties().get("cache.jdbc.table.name").equals("jbosscache"); - assert first.getProperties().get("cache.jdbc.table.create").equals("true"); - assert first.getProperties().get("cache.jdbc.table.drop").equals("true"); - } - - public void testBuddyReplicationConfig() - { - BuddyReplicationConfig brConfig = syncConfig.getBuddyReplicationConfig(); - assert brConfig.isEnabled(); - BuddyReplicationConfig.BuddyLocatorConfig locatorConfig = brConfig.getBuddyLocatorConfig(); - assert "org.jboss.cache.buddyreplication.NextMemberBuddyLocator".equals(locatorConfig.getBuddyLocatorClass()); - assert locatorConfig.getBuddyLocatorProperties().get("numBuddies").equals("1"); - assert locatorConfig.getBuddyLocatorProperties().get("ignoreColocatedBuddies").equals("true"); - assert brConfig.getBuddyPoolName().equals("myBuddyPoolReplicationGroup"); - assert brConfig.getBuddyCommunicationTimeout() == 2000; - assert brConfig.isAutoDataGravitation(); - assert brConfig.isDataGravitationRemoveOnFind(); - assert brConfig.isDataGravitationSearchBackupTrees(); - } - - public void testUseRegionBasedMarshalling() - { - assert syncConfig.isUseRegionBasedMarshalling(); - } - - public void testEvictionPolicyConfig() - { - EvictionConfig evictionConfig = syncConfig.getEvictionConfig(); - assert "org.jboss.cache.eviction.LRUAlgorithm".equals(evictionConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig().getEvictionAlgorithmClassName()); - assert 200000 == evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize(); - assert 5 == evictionConfig.getWakeupInterval(); - - List<EvictionRegionConfig> regionConfigs = evictionConfig.getEvictionRegionConfigs(); - assert regionConfigs.size() == 2; - - EvictionRegionConfig first = evictionConfig.getDefaultEvictionRegionConfig(); - assert first.getRegionName().equals("/"); - assert first.getEvictionAlgorithmConfig() instanceof LRUAlgorithmConfig; - LRUAlgorithmConfig firstConfiguration = (LRUAlgorithmConfig) first.getEvictionAlgorithmConfig(); - assert firstConfiguration.getMaxAge() <= 0; - assert firstConfiguration.getTimeToLive() == 1000; - assert firstConfiguration.getMaxNodes() == 5000; - - EvictionRegionConfig second = regionConfigs.get(0); - LRUAlgorithmConfig secondConfiguration = (LRUAlgorithmConfig) second.getEvictionAlgorithmConfig(); - assert secondConfiguration.getMaxAge() == -1; - assert secondConfiguration.getTimeToLive() == 1002; - assert secondConfiguration.getMaxNodes() == 5000; - - EvictionRegionConfig third = regionConfigs.get(1); - MRUAlgorithmConfig thirdConfiguration = (MRUAlgorithmConfig) third.getEvictionAlgorithmConfig(); - assert thirdConfiguration.getMaxNodes() == 2103; - assert thirdConfiguration.getMinTimeToLive() == 22; - assert third.getEventQueueSize() == 21; - } - - public void testCustomInterceptors() - { - List<CustomInterceptorConfig> interceptorConfigs = syncConfig.getCustomInterceptors(); - assert interceptorConfigs.size() == 5; - assert interceptorConfigs.get(0).getInterceptor() instanceof AaaCustomInterceptor; - AaaCustomInterceptor a = (AaaCustomInterceptor) interceptorConfigs.get(0).getInterceptor(); - assert a.getAttrOne().equals("value1"); - assert a.getAttrTwo().equals("value2"); - assert a.getAttrThree() == null; - assert interceptorConfigs.get(1).getInterceptor() instanceof BbbCustomInterceptor; - assert interceptorConfigs.get(2).getInterceptor() instanceof AaaCustomInterceptor; - assert interceptorConfigs.get(3).getInterceptor() instanceof BbbCustomInterceptor; - assert interceptorConfigs.get(4).getInterceptor() instanceof AaaCustomInterceptor; - assert interceptorConfigs.get(0).isFirst(); - assert !interceptorConfigs.get(0).isLast(); - assert interceptorConfigs.get(1).isLast(); - assert interceptorConfigs.get(2).getIndex() == 3; - assert interceptorConfigs.get(3).getBeforeClass().equals("org.jboss.cache.interceptors.CallInterceptor"); - assert interceptorConfigs.get(4).getAfterClass().equals("org.jboss.cache.interceptors.CallInterceptor"); - } - - public void testSingletonStore() - { - CacheLoaderConfig.IndividualCacheLoaderConfig clc = syncConfig.getCacheLoaderConfig().getFirstCacheLoaderConfig(); - assert clc != null; - CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig singlStoreConf = clc.getSingletonStoreConfig(); - assert singlStoreConf != null; - assert singlStoreConf.isSingletonStoreEnabled(); - assert singlStoreConf.getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); - assert singlStoreConf.getProperties().size() == 2; - assert singlStoreConf.getProperties().get("pushStateWhenCoordinator").equals("true"); - assert singlStoreConf.getProperties().get("pushStateWhenCoordinatorTimeout").equals("20000"); - } - - public void testMvccAttributes() - { - assert !syncConfig.isWriteSkewCheck(); - assert syncConfig.getConcurrencyLevel() == 21; - } - - public void testListenerAsyncThreads() - { - assert syncConfig.getListenerAsyncPoolSize() == 5; - } - - public void testInvocationBatching() - { - assert syncConfig.isInvocationBatchingEnabled(); - } -} +package org.jboss.cache.config.parsing; + +import org.jboss.cache.config.BuddyReplicationConfig; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.ConfigurationException; +import org.jboss.cache.config.CustomInterceptorConfig; +import org.jboss.cache.config.EvictionConfig; +import org.jboss.cache.config.EvictionRegionConfig; +import org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor; +import org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor; +import org.jboss.cache.eviction.LRUAlgorithmConfig; +import org.jboss.cache.eviction.MRUAlgorithmConfig; +import org.jboss.cache.lock.IsolationLevel; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + +import java.util.List; + +/** + * Parses a 'normal' configuration file and makes sure that the resulted <b>Configuration</b> object has + * the expected state. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "functional", testName = "config.parsing.XmlConfigurationParserTest") +public class XmlConfigurationParserTest +{ + Configuration syncConfig, asyncConfig; + + @BeforeTest + public void setUp() + { + syncConfig = new XmlConfigurationParser(false, null).parseFile("configs/parser-test.xml"); + asyncConfig = new XmlConfigurationParser(false, null).parseFile("configs/parser-test-async.xml"); + } + + public void testParseOldConfigFile() + { + System.setProperty("jbosscache.config.validate", "false"); + XmlConfigurationParser parser = new XmlConfigurationParser(); + try + { + parser.parseFile("configs/conf2x/pess-local.xml"); + assert false : "exception expected"; + } + catch (ConfigurationException e) + { + //expectd + } + finally + { + System.setProperty("jbosscache.config.validate", "true"); + } + } + + public void testTransactionManagerLookupClass() + { + assert syncConfig.getTransactionManagerLookupClass().equals("org.jboss.cache.transaction.GenericTransactionManagerLookup"); + } + + public void testIsolationLevel() + { + assert syncConfig.getIsolationLevel().equals(IsolationLevel.REPEATABLE_READ); + } + + public void testCacheMode() + { + assert syncConfig.getCacheMode().equals(Configuration.CacheMode.REPL_SYNC) : "Was " + syncConfig.getCacheMode(); + assert asyncConfig.getCacheMode().equals(Configuration.CacheMode.REPL_ASYNC): "Was " + syncConfig.getCacheMode(); + } + + public void testAsyncSerializationExecutorSize() + { + assert asyncConfig.getSerializationExecutorPoolSize() == 250; + } + + public void testUseReplQueue() + { + assert !syncConfig.isUseReplQueue(); + assert !asyncConfig.isUseReplQueue(); + } + + public void testClusterName() + { + assert syncConfig.getClusterName().equals("JBossCache-cluster"); + } + + public void testGetClusterConfig() + { + assert asyncConfig.getClusterConfig().indexOf("MERGE2") >= 0; + } + + public void testFetchInMemoryState() + { + assert syncConfig.isFetchInMemoryState(); + } + + public void testStateRetrievalTimeout() + { + assert syncConfig.getStateRetrievalTimeout() == 15124; + } + + public void testSyncReplTimeout() + { + assert syncConfig.getSyncReplTimeout() == 15421; + } + + public void testLockAcquisitionTimeout() + { + assert syncConfig.getLockAcquisitionTimeout() == 10234; + } + + public void testUseLazyDeserialization() + { + assert syncConfig.isUseLazyDeserialization(); + } + + public void testObjectInputStreamPoolSize() + { + assert 12 == syncConfig.getObjectInputStreamPoolSize(); + } + + public void testObjectOutputStreamPoolSize() + { + assert 14 == syncConfig.getObjectOutputStreamPoolSize(); + } + + public void testShutdownHookBehavior() + { + assert Configuration.ShutdownHookBehavior.REGISTER == syncConfig.getShutdownHookBehavior(); + } + + public void testSyncRollbackPhase() + { + assert syncConfig.isSyncRollbackPhase(); + } + + public void testSyncCommitPhase() + { + assert syncConfig.isSyncCommitPhase(); + } + + public void testUseReplicationVersion() + { + assert syncConfig.getReplicationVersion() == 124; + } + + public void testGetMultiplexerStack() + { + assert "file_name".equals(syncConfig.getMultiplexerStack()); + } + + public void testMarshallerClass() + { + assert "some.Clazz".equals(syncConfig.getMarshallerClass()); + } + + public void testLockParentForChildInsertRemove() + { + assert syncConfig.isLockParentForChildInsertRemove(); + } + + public void testInactiveOnStartup() + { + assert syncConfig.isInactiveOnStartup(); + } + + public void testExposeManagementStatistics() + { + assert !syncConfig.getExposeManagementStatistics(); + } + + public void testCacheLoaderConfiguration() + { + CacheLoaderConfig clc = syncConfig.getCacheLoaderConfig(); + assert null != clc; + assert clc.isPassivation(); + assert clc.isShared(); + assert "/a/b/c,/f/r/s".equals(clc.getPreload()); + CacheLoaderConfig.IndividualCacheLoaderConfig first = clc.getFirstCacheLoaderConfig(); + assert "org.jboss.cache.loader.JDBCCacheLoader".equals(first.getClassName()); + assert first.isAsync(); + assert first.isFetchPersistentState(); + assert first.isIgnoreModifications(); + assert first.isPurgeOnStartup(); + assert first.getProperties().get("cache.jdbc.table.name").equals("jbosscache"); + assert first.getProperties().get("cache.jdbc.table.create").equals("true"); + assert first.getProperties().get("cache.jdbc.table.drop").equals("true"); + } + + public void testBuddyReplicationConfig() + { + BuddyReplicationConfig brConfig = syncConfig.getBuddyReplicationConfig(); + assert brConfig.isEnabled(); + BuddyReplicationConfig.BuddyLocatorConfig locatorConfig = brConfig.getBuddyLocatorConfig(); + assert "org.jboss.cache.buddyreplication.NextMemberBuddyLocator".equals(locatorConfig.getBuddyLocatorClass()); + assert locatorConfig.getBuddyLocatorProperties().get("numBuddies").equals("1"); + assert locatorConfig.getBuddyLocatorProperties().get("ignoreColocatedBuddies").equals("true"); + assert brConfig.getBuddyPoolName().equals("myBuddyPoolReplicationGroup"); + assert brConfig.getBuddyCommunicationTimeout() == 2000; + assert brConfig.isAutoDataGravitation(); + assert brConfig.isDataGravitationRemoveOnFind(); + assert brConfig.isDataGravitationSearchBackupTrees(); + } + + public void testUseRegionBasedMarshalling() + { + assert syncConfig.isUseRegionBasedMarshalling(); + } + + public void testEvictionPolicyConfig() + { + EvictionConfig evictionConfig = syncConfig.getEvictionConfig(); + assert "org.jboss.cache.eviction.LRUAlgorithm".equals(evictionConfig.getDefaultEvictionRegionConfig().getEvictionAlgorithmConfig().getEvictionAlgorithmClassName()); + assert 200000 == evictionConfig.getDefaultEvictionRegionConfig().getEventQueueSize(); + assert 5 == evictionConfig.getWakeupInterval(); + + List<EvictionRegionConfig> regionConfigs = evictionConfig.getEvictionRegionConfigs(); + assert regionConfigs.size() == 2; + + EvictionRegionConfig first = evictionConfig.getDefaultEvictionRegionConfig(); + assert first.getRegionName().equals("/"); + assert first.getEvictionAlgorithmConfig() instanceof LRUAlgorithmConfig; + LRUAlgorithmConfig firstConfiguration = (LRUAlgorithmConfig) first.getEvictionAlgorithmConfig(); + assert firstConfiguration.getMaxAge() <= 0; + assert firstConfiguration.getTimeToLive() == 1000; + assert firstConfiguration.getMaxNodes() == 5000; + + EvictionRegionConfig second = regionConfigs.get(0); + LRUAlgorithmConfig secondConfiguration = (LRUAlgorithmConfig) second.getEvictionAlgorithmConfig(); + assert secondConfiguration.getMaxAge() == -1; + assert secondConfiguration.getTimeToLive() == 1002; + assert secondConfiguration.getMaxNodes() == 5000; + + EvictionRegionConfig third = regionConfigs.get(1); + MRUAlgorithmConfig thirdConfiguration = (MRUAlgorithmConfig) third.getEvictionAlgorithmConfig(); + assert thirdConfiguration.getMaxNodes() == 2103; + assert thirdConfiguration.getMinTimeToLive() == 22; + assert third.getEventQueueSize() == 21; + } + + public void testCustomInterceptors() + { + List<CustomInterceptorConfig> interceptorConfigs = syncConfig.getCustomInterceptors(); + assert interceptorConfigs.size() == 5; + assert interceptorConfigs.get(0).getInterceptor() instanceof AaaCustomInterceptor; + AaaCustomInterceptor a = (AaaCustomInterceptor) interceptorConfigs.get(0).getInterceptor(); + assert a.getAttrOne().equals("value1"); + assert a.getAttrTwo().equals("value2"); + assert a.getAttrThree() == null; + assert interceptorConfigs.get(1).getInterceptor() instanceof BbbCustomInterceptor; + assert interceptorConfigs.get(2).getInterceptor() instanceof AaaCustomInterceptor; + assert interceptorConfigs.get(3).getInterceptor() instanceof BbbCustomInterceptor; + assert interceptorConfigs.get(4).getInterceptor() instanceof AaaCustomInterceptor; + assert interceptorConfigs.get(0).isFirst(); + assert !interceptorConfigs.get(0).isLast(); + assert interceptorConfigs.get(1).isLast(); + assert interceptorConfigs.get(2).getIndex() == 3; + assert interceptorConfigs.get(3).getBeforeClass().equals("org.jboss.cache.interceptors.CallInterceptor"); + assert interceptorConfigs.get(4).getAfterClass().equals("org.jboss.cache.interceptors.CallInterceptor"); + } + + public void testSingletonStore() + { + CacheLoaderConfig.IndividualCacheLoaderConfig clc = syncConfig.getCacheLoaderConfig().getFirstCacheLoaderConfig(); + assert clc != null; + CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig singlStoreConf = clc.getSingletonStoreConfig(); + assert singlStoreConf != null; + assert singlStoreConf.isSingletonStoreEnabled(); + assert singlStoreConf.getSingletonStoreClass().equals("org.jboss.cache.loader.SingletonStoreCacheLoader"); + assert singlStoreConf.getProperties().size() == 2; + assert singlStoreConf.getProperties().get("pushStateWhenCoordinator").equals("true"); + assert singlStoreConf.getProperties().get("pushStateWhenCoordinatorTimeout").equals("20000"); + } + + public void testMvccAttributes() + { + assert !syncConfig.isWriteSkewCheck(); + assert syncConfig.getConcurrencyLevel() == 21; + } + + public void testListenerAsyncThreads() + { + assert syncConfig.getListenerAsyncPoolSize() == 5; + } + + public void testInvocationBatching() + { + assert syncConfig.isInvocationBatchingEnabled(); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,105 +1,105 @@ -package org.jboss.cache.config.parsing; - -import org.testng.annotations.Test; -import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -/** - * Tests that all the xml file used within tests are correct with respect to the schema definition. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "functional") -public class XmlConfigurationSchemaTest -{ - public static final String BASE_DIR_FOR_CONFIG = "./configs"; - - private String[] testFiles = - { - "buddy-replication-cache.xml", - "clonable-config.xml", - "local-lru-eviction.xml", - "local-passivation.xml", - "local-tx.xml", - "mixedPolicy-eviction.xml", - "mux.xml", - "parser-test.xml", - "parser-test-async.xml", - "policyPerRegion-eviction.xml", - "replSync.xml", - "string-property-replaced.xml", - "mvcc-repl-sync-br.xml" - }; - - /** - * Simple test to prove that validation works. - */ - public void testSimpleFile() - { - ExceptionCountingErrorHandler handler = new ExceptionCountingErrorHandler(); - System.setProperty("jbosscache.config.schemaLocation", "src/main/resources/jbosscache-config-3.0.xsd"); - XmlConfigurationParser parser = new XmlConfigurationParser(handler); - for (String file : testFiles) - { - System.out.println("file = " + file); - parser.parseFile(BASE_DIR_FOR_CONFIG + File.separator + file); - System.out.println("Processed file = " + file); - for (Exception e : handler.exceptionList) e.printStackTrace(); - assert handler.noErrors() : "error during parsing (file " + file + ")"; - } - } - - /** - * Test that when the jbc.config.validation is set to true the parser is not validating by default. - */ - public void testValidationDisbaledOnSystemProperty() - { - XmlConfigurationParser parser = new XmlConfigurationParser(); - assert parser.isValidating() : "by default we have a validating parser"; - - System.setProperty(RootElementBuilder.VALIDATING_SYSTEM_PROPERTY, "false"); - parser = new XmlConfigurationParser(); - assert !parser.isValidating(); - - System.setProperty(RootElementBuilder.VALIDATING_SYSTEM_PROPERTY, "true"); - parser = new XmlConfigurationParser(); - assert parser.isValidating(); - } - - public static class ExceptionCountingErrorHandler implements ErrorHandler - { - List<SAXParseException> exceptionList = new ArrayList<SAXParseException>(); - - public void warning(SAXParseException exception) throws SAXException - { - handleDefault(exception); - } - - public void error(SAXParseException exception) throws SAXException - { - handleDefault(exception); - } - - public void fatalError(SAXParseException exception) throws SAXException - { - handleDefault(exception); - } - - private void handleDefault(SAXParseException exception) - { - System.out.println("Error :" + exception.getMessage()); - exceptionList.add(exception); - } - - public boolean noErrors() - { - return exceptionList.isEmpty(); - } - } -} +package org.jboss.cache.config.parsing; + +import org.testng.annotations.Test; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * Tests that all the xml file used within tests are correct with respect to the schema definition. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "functional", testName = "config.parsing.XmlConfigurationSchemaTest") +public class XmlConfigurationSchemaTest +{ + public static final String BASE_DIR_FOR_CONFIG = "./configs"; + + private String[] testFiles = + { + "buddy-replication-cache.xml", + "clonable-config.xml", + "local-lru-eviction.xml", + "local-passivation.xml", + "local-tx.xml", + "mixedPolicy-eviction.xml", + "mux.xml", + "parser-test.xml", + "parser-test-async.xml", + "policyPerRegion-eviction.xml", + "replSync.xml", + "string-property-replaced.xml", + "mvcc-repl-sync-br.xml" + }; + + /** + * Simple test to prove that validation works. + */ + public void testSimpleFile() + { + ExceptionCountingErrorHandler handler = new ExceptionCountingErrorHandler(); + System.setProperty("jbosscache.config.schemaLocation", "src/main/resources/jbosscache-config-3.0.xsd"); + XmlConfigurationParser parser = new XmlConfigurationParser(handler); + for (String file : testFiles) + { + System.out.println("file = " + file); + parser.parseFile(BASE_DIR_FOR_CONFIG + File.separator + file); + System.out.println("Processed file = " + file); + for (Exception e : handler.exceptionList) e.printStackTrace(); + assert handler.noErrors() : "error during parsing (file " + file + ")"; + } + } + + /** + * Test that when the jbc.config.validation is set to true the parser is not validating by default. + */ + public void testValidationDisbaledOnSystemProperty() + { + XmlConfigurationParser parser = new XmlConfigurationParser(); + assert parser.isValidating() : "by default we have a validating parser"; + + System.setProperty(RootElementBuilder.VALIDATING_SYSTEM_PROPERTY, "false"); + parser = new XmlConfigurationParser(); + assert !parser.isValidating(); + + System.setProperty(RootElementBuilder.VALIDATING_SYSTEM_PROPERTY, "true"); + parser = new XmlConfigurationParser(); + assert parser.isValidating(); + } + + public static class ExceptionCountingErrorHandler implements ErrorHandler + { + List<SAXParseException> exceptionList = new ArrayList<SAXParseException>(); + + public void warning(SAXParseException exception) throws SAXException + { + handleDefault(exception); + } + + public void error(SAXParseException exception) throws SAXException + { + handleDefault(exception); + } + + public void fatalError(SAXParseException exception) throws SAXException + { + handleDefault(exception); + } + + private void handleDefault(SAXParseException exception) + { + System.out.println("Error :" + exception.getMessage()); + exceptionList.add(exception); + } + + public boolean noErrors() + { + return exceptionList.isEmpty(); + } + } +} Modified: core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -50,7 +50,7 @@ * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "eviction.BaseEvictionAlgorithmTest") public class BaseEvictionAlgorithmTest { private static final Log log = LogFactory.getLog(BaseEvictionAlgorithmTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ConcurrentEvictionTest") public class ConcurrentEvictionTest { private Cache<Integer, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/DisabledEvictionThreadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "eviction.DisabledEvictionThreadTest") public class DisabledEvictionThreadTest { public void testDisabledEvictionTimer() Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ * @author Daniel Huang * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ElementSizeAlgorithmTest") public class ElementSizeAlgorithmTest extends EvictionTestsBase { RegionManager regionManager; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ * @author Daniel Huang * @version $Revision$ */ -@Test(groups = "unit", sequential = false) +@Test(groups = "unit", sequential = false, testName = "eviction.ElementSizeConfigurationTest") public class ElementSizeConfigurationTest { public void testXMLParse1() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -32,7 +32,7 @@ * @author Daniel Huang * @version $Revison: $ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ElementSizePolicyTest") public class ElementSizePolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * @author Daniel Huang * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ElementSizeQueueTest") public class ElementSizeQueueTest { private ElementSizeQueue queue; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = "unit", sequential = false) +@Test(groups = "unit", sequential = false, testName = "eviction.EvictionConfigurationTest") public class EvictionConfigurationTest { public void testPolicyPerRegion() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.EvictionQueueListTest") public class EvictionQueueListTest { EvictionQueueList list; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * @author Elias Ross * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ExpirationPolicyTest") public class ExpirationPolicyTest extends EvictionTestsBase { private static final Log log = LogFactory.getLog(ExpirationPolicyTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.FIFOAlgorithmTest") public class FIFOAlgorithmTest extends EvictionTestsBase { Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = "unit", sequential = false) +@Test(groups = "unit", sequential = false, testName = "eviction.FIFOConfigurationTest") public class FIFOConfigurationTest { public void testXMLParse() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.FIFOPolicyTest") public class FIFOPolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.FIFOQueueTest") public class FIFOQueueTest { private static final int CAPACITY = EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author Daniel Huang - dhuang(a)jboss.org - 10/2005 * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.LFUAlgorithmTest") public class LFUAlgorithmTest extends EvictionTestsBase { RegionManager regionManager; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = "unit", sequential = false) +@Test(groups = "unit", sequential = false, testName = "eviction.LFUConfigurationTest") public class LFUConfigurationTest { Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, testName = "eviction.LFUPolicyTest") public class LFUPolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUQueueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LFUQueueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUQueueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.LFUQueueTest") public class LFUQueueTest { private LFUQueue queue; @@ -271,4 +271,4 @@ } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * @author Ben Wang, Feb 11, 2004 * @author Daniel Huang (dhuang(a)jboss.org) */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "eviction.LRUAlgorithmTest") public class LRUAlgorithmTest extends EvictionTestsBase { Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = "unit", sequential = false) +@Test(groups = "unit", sequential = false, testName = "eviction.LRUConfigurationTest") public class LRUConfigurationTest { Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * @author Daniel Huang - dhuang(a)jboss.org * @version $Revision$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "eviction.LRUPolicyTest") public class LRUPolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUQueueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/LRUQueueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUQueueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.LRUQueueTest") public class LRUQueueTest { private LRUQueue queue; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.MRUAlgorithmTest") public class MRUAlgorithmTest extends EvictionTestsBase { MRUAlgorithm algorithm; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = "unit", sequential = true) +@Test(groups = "unit", sequential = true, testName = "eviction.MRUConfigurationTest") public class MRUConfigurationTest { MRUAlgorithmConfig config = null; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.MRUPolicyTest") public class MRUPolicyTest { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUQueueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/MRUQueueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUQueueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.MRUQueueTest") public class MRUQueueTest { private MRUQueue queue; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -17,7 +17,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision: 4444 $ */ -@Test(groups = "unit", sequential = false) +@Test(groups = "unit", sequential = false, testName = "eviction.NullEvictionConfigTest") public class NullEvictionConfigTest { /** Modified: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.NullEvictionPolicyTest") public class NullEvictionPolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ * * @author fhenning */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.OptimisticEvictionTest") public class OptimisticEvictionTest extends EvictionTestsBase { private CacheSPI<Object, Object> cache; @@ -57,13 +57,13 @@ cache = null; } + @Test(invocationCount = 10) public void testEvictionOccurence() throws Exception { cache.put("/timeBased/test", "key", "value"); assertTrue(cache.exists("/timeBased/test")); - TestingUtil.sleepThread(1); + TestingUtil.sleepThread(100); new EvictionController(cache).startEviction(); -// assert waitForEviction(cache, 30, TimeUnit.SECONDS, Fqn.fromString("/timeBased/test")); assertTrue(!cache.exists("/timeBased/test")); } Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -48,7 +48,7 @@ * @author Ben Wang, Oct, 2006 * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ProgrammaticLRUPolicyTest") public class ProgrammaticLRUPolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author Daniel Huang (dhuang(a)jboss.org) * @version $Revision$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "eviction.RegionManagerTest") public class RegionManagerTest { private final Fqn DEFAULT_REGION = Fqn.ROOT; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author Ben Wang, Feb 11, 2004 * @author Daniel Huang (dhuang(a)jboss.org) */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.RegionTest") public class RegionTest { RegionManager regionManager; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ /** * @author Ben Wang, Feb 11, 2004 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "eviction.ReplicatedLRUPolicyTest") public class ReplicatedLRUPolicyTest extends EvictionTestsBase { CacheSPI<Object, Object> cache1, cache2, cache3; Modified: core/trunk/src/test/java/org/jboss/cache/eviction/legacy/BackwardCompatibilityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/legacy/BackwardCompatibilityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/legacy/BackwardCompatibilityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -@Test(groups = "functional", sequential = false) +@Test(groups = "functional", sequential = false, testName = "eviction.legacy.BackwardCompatibilityTest") public class BackwardCompatibilityTest { Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "eviction.minttl.FIFOMinTTLTest") public class FIFOMinTTLTest extends MinTTLTestBase { private Fqn fqn2 = Fqn.fromRelativeElements(region, "b"); Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LFUMinTTLTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "eviction.minttl.LFUMinTTLTest") public class LFUMinTTLTest extends MinTTLTestBase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/LRUMinTTLTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "eviction.minttl.LRUMinTTLTest") public class LRUMinTTLTest extends MinTTLTestBase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MRUMinTTLTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "eviction.minttl.MRUMinTTLTest") public class MRUMinTTLTest extends MinTTLTestBase { private Fqn fqn2 = Fqn.fromRelativeElements(region, "b"); Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryFunctionalTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "factories.ComponentRegistryFunctionalTest") public class ComponentRegistryFunctionalTest { // private ComponentRegistry cr; Modified: core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/ComponentRegistryUnitTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "factories.ComponentRegistryUnitTest") public class ComponentRegistryUnitTest { public void testConstruction() Modified: core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorChainTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "factories.CustomInterceptorChainTest") public class CustomInterceptorChainTest extends InterceptorChainTestBase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,170 +1,170 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.cache.factories; - -import org.jboss.cache.CacheFactory; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.config.CustomInterceptorConfig; -import org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor; -import org.jboss.cache.interceptors.MVCCLockingInterceptor; -import org.jboss.cache.interceptors.base.CommandInterceptor; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; - -import java.util.Collections; -import java.util.List; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; - -/** - * Tests how custom interceptor construction is handled. - * - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "functional", sequential = true) -public class CustomInterceptorConstructionTest -{ - CacheSPI cache; - int defaultInterceptroCount; - - @AfterMethod - public void tearDown() - { - if (cache != null) - { - TestingUtil.killCaches(cache); - } - cache = null; - } - - public void testAddFirst() - { - AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); - CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); - config.setFirst(true); - buildCache(config); - assert cache.getInterceptorChain().get(0).equals(interceptor); - assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; - } - - public void testAddLast() - { - AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); - CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); - config.setLast(true); - buildCache(config); - List chain = cache.getInterceptorChain(); - assert chain.get(chain.size() - 1).equals(interceptor); - assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; - } - - public void testAddAfter() - { - AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); - CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); - config.setAfterClass(MVCCLockingInterceptor.class.getName()); - buildCache(config); - List<CommandInterceptor> chain = cache.getInterceptorChain(); - int occurenceCount = 0; - for (CommandInterceptor ci : chain) - { - if (ci instanceof MVCCLockingInterceptor) - { - assert ci.getNext().equals(interceptor); - occurenceCount++; - } - } - assert occurenceCount == 1; - assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; - } - - public void testAddBefore() - { - AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); - CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); - config.setBeforeClass(MVCCLockingInterceptor.class.getName()); - buildCache(config); - List<CommandInterceptor> chain = cache.getInterceptorChain(); - int occurenceCount = 0; - for (CommandInterceptor ci : chain) - { - if (ci instanceof AaaCustomInterceptor) - { - assert ci.getNext() instanceof MVCCLockingInterceptor; - occurenceCount++; - } - } - assert occurenceCount == 1; - assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; - } - - @Test(enabled = true) - public void testAddAtIndex() - { - AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); - CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); - config.setIndex(1); - buildCache(config); - List<CommandInterceptor> chain = cache.getInterceptorChain(); - assert chain.get(1).equals(interceptor); - assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; - } - - public void testAddAtInvalidIndex() - { - AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); - CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); - config.setIndex(1000); - try - { - buildCache(config); - assert false : "exception expected here"; - } - catch (Exception e) - { - //expected - } - } - - private void buildCache(CustomInterceptorConfig interceptorConfig) - { - buildCache(Collections.singletonList(interceptorConfig)); - } - - private void buildCache(List<CustomInterceptorConfig> interceptorConfig) - { - Configuration config = new Configuration(); - config.setCacheMode(Configuration.CacheMode.LOCAL); - config.setNodeLockingScheme(Configuration.NodeLockingScheme.MVCC); - CacheFactory cacheFactory2 = new UnitTestCacheFactory<Object, Object>(); - CacheSPI tmpCacheSPI = (CacheSPI) cacheFactory2.createCache(config); - defaultInterceptroCount = tmpCacheSPI.getInterceptorChain().size(); - tmpCacheSPI.stop(); - - CacheFactory cacheFactory = new UnitTestCacheFactory<Object, Object>(); - config.setCustomInterceptors(interceptorConfig); - cache = (CacheSPI) cacheFactory.createCache(config, true); - } -} - +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.cache.factories; + +import org.jboss.cache.CacheFactory; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.CustomInterceptorConfig; +import org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor; +import org.jboss.cache.interceptors.MVCCLockingInterceptor; +import org.jboss.cache.interceptors.base.CommandInterceptor; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.Test; + +import java.util.Collections; +import java.util.List; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.util.TestingUtil; + +/** + * Tests how custom interceptor construction is handled. + * + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "functional", sequential = true, testName = "factories.CustomInterceptorConstructionTest") +public class CustomInterceptorConstructionTest +{ + CacheSPI cache; + int defaultInterceptroCount; + + @AfterMethod + public void tearDown() + { + if (cache != null) + { + TestingUtil.killCaches(cache); + } + cache = null; + } + + public void testAddFirst() + { + AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); + CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); + config.setFirst(true); + buildCache(config); + assert cache.getInterceptorChain().get(0).equals(interceptor); + assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; + } + + public void testAddLast() + { + AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); + CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); + config.setLast(true); + buildCache(config); + List chain = cache.getInterceptorChain(); + assert chain.get(chain.size() - 1).equals(interceptor); + assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; + } + + public void testAddAfter() + { + AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); + CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); + config.setAfterClass(MVCCLockingInterceptor.class.getName()); + buildCache(config); + List<CommandInterceptor> chain = cache.getInterceptorChain(); + int occurenceCount = 0; + for (CommandInterceptor ci : chain) + { + if (ci instanceof MVCCLockingInterceptor) + { + assert ci.getNext().equals(interceptor); + occurenceCount++; + } + } + assert occurenceCount == 1; + assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; + } + + public void testAddBefore() + { + AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); + CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); + config.setBeforeClass(MVCCLockingInterceptor.class.getName()); + buildCache(config); + List<CommandInterceptor> chain = cache.getInterceptorChain(); + int occurenceCount = 0; + for (CommandInterceptor ci : chain) + { + if (ci instanceof AaaCustomInterceptor) + { + assert ci.getNext() instanceof MVCCLockingInterceptor; + occurenceCount++; + } + } + assert occurenceCount == 1; + assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; + } + + @Test(enabled = true) + public void testAddAtIndex() + { + AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); + CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); + config.setIndex(1); + buildCache(config); + List<CommandInterceptor> chain = cache.getInterceptorChain(); + assert chain.get(1).equals(interceptor); + assert cache.getInterceptorChain().size() == defaultInterceptroCount + 1; + } + + public void testAddAtInvalidIndex() + { + AaaCustomInterceptor interceptor = new AaaCustomInterceptor(); + CustomInterceptorConfig config = new CustomInterceptorConfig(interceptor); + config.setIndex(1000); + try + { + buildCache(config); + assert false : "exception expected here"; + } + catch (Exception e) + { + //expected + } + } + + private void buildCache(CustomInterceptorConfig interceptorConfig) + { + buildCache(Collections.singletonList(interceptorConfig)); + } + + private void buildCache(List<CustomInterceptorConfig> interceptorConfig) + { + Configuration config = new Configuration(); + config.setCacheMode(Configuration.CacheMode.LOCAL); + config.setNodeLockingScheme(Configuration.NodeLockingScheme.MVCC); + CacheFactory cacheFactory2 = new UnitTestCacheFactory<Object, Object>(); + CacheSPI tmpCacheSPI = (CacheSPI) cacheFactory2.createCache(config); + defaultInterceptroCount = tmpCacheSPI.getInterceptorChain().size(); + tmpCacheSPI.stop(); + + CacheFactory cacheFactory = new UnitTestCacheFactory<Object, Object>(); + config.setCustomInterceptors(interceptorConfig); + cache = (CacheSPI) cacheFactory.createCache(config, true); + } +} + Modified: core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/InterceptorChainFactoryTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; -@Test(groups = "unit", sequential = true) +@Test(groups = "unit", sequential = true, testName = "factories.InterceptorChainFactoryTest") public class InterceptorChainFactoryTest extends InterceptorChainTestBase { CacheSPI cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/LateConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "factories.LateConfigurationTest") public class LateConfigurationTest { CacheSPI c; Modified: core/trunk/src/test/java/org/jboss/cache/factories/LifeCycleTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/LifeCycleTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/LifeCycleTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -32,7 +32,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "factories.LifeCycleTest") public class LifeCycleTest { private CacheSPI<Object, Object>[] c; Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,6 +21,8 @@ import java.io.InputStream; import java.net.URL; +import java.util.Properties; + import org.jgroups.conf.ConfiguratorFactory; /** @@ -96,6 +98,24 @@ 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 { Modified: core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * * @author Brian Stansberry */ -@Test(groups = "integration", sequential = true) +@Test(groups = "integration", sequential = true, testName = "integration.hibernate.UpdateTimestampsCachingTest") public class UpdateTimestampsCachingTest { private static final Log log = LogFactory.getLog(UpdateTimestampsCachingTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/interceptors/LegacyInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,6 +5,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.InvocationContext; import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.marshall.MethodCall; import org.jboss.cache.commands.write.PutKeyValueCommand; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; @@ -21,7 +22,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.2.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "interceptors.LegacyInterceptorTest") public class LegacyInterceptorTest { Cache cache; @@ -62,20 +63,20 @@ interceptorInvokedLatch.await(); // check that the context on the test interceptor is correct. - InvocationContext ctx = testInterceptor.ctx; + MethodCall methodCall = testInterceptor.methodCall; interceptorResumeLatch.countDown(); - assert ctx.getMethodCall().getMethodId() == PutKeyValueCommand.METHOD_ID; - assert ctx.getMethodCall().getArgs()[0] == null; // gtx - assert ctx.getMethodCall().getArgs()[1].equals(Fqn.fromString("/a")); // fqn - assert ctx.getMethodCall().getArgs()[2].equals("k"); // key - assert ctx.getMethodCall().getArgs()[3].equals("v"); // value - assert ctx.getMethodCall().getArgs()[4] == Boolean.FALSE; //last boolean value + assert methodCall.getMethodId() == PutKeyValueCommand.METHOD_ID; + assert methodCall.getArgs()[0] == null; // gtx + assert methodCall.getArgs()[1].equals(Fqn.fromString("/a")); // fqn + assert methodCall.getArgs()[2].equals("k"); // key + assert methodCall.getArgs()[3].equals("v"); // value + assert methodCall.getArgs()[4] == Boolean.FALSE; //last boolean value } public static class TestInterceptor extends Interceptor { - InvocationContext ctx; + MethodCall methodCall; @Override public Object invoke(InvocationContext ctx) throws Throwable @@ -83,7 +84,7 @@ if (ctx.isOriginLocal()) { // copy the context so tests can inspect it - this.ctx = ctx; + this.methodCall = ctx.getMethodCall(); // signal to the test that this has been invoked. interceptorInvokedLatch.countDown(); @@ -92,7 +93,7 @@ interceptorResumeLatch.await(); // wipe class-level context variable - this.ctx = null; + this.methodCall = null; } // the "old-style" of passing up the interceptor chain Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/interceptors/MarshalledValueInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "interceptors.MarshalledValueInterceptorTest") public class MarshalledValueInterceptorTest { CacheSPI c; Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -36,7 +36,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}, sequential = true) +@Test(groups = {"functional", "jgroups"}, testName = "invalidation.InvalidationInterceptorTest") public class InvalidationInterceptorTest { private static Log log = LogFactory.getLog(InvalidationInterceptorTest.class); @@ -907,7 +907,7 @@ protected CacheLoaderConfig getCacheLoaderConfig() throws Exception { return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", - "org.jboss.cache.loader.DummySharedInMemoryCacheLoader", "", false, false, false, false, false); + "org.jboss.cache.loader.DummySharedInMemoryCacheLoader", "bin=" + getClass(), false, false, false, false, false); } protected void assertHasBeenInvalidated(Node n, String message) Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, testName = "invalidation.TombstoneEvictionTest") public class TombstoneEvictionTest { private CacheSPI c1, c2; Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/invalidation/VersionInconsistencyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, testName = "invalidation.VersionInconsistencyTest") public class VersionInconsistencyTest { private Cache cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author Mircea.Markus(a)jboss.com * @since 2.2 */ -@Test(groups = {"unit"}, sequential = true) +@Test(groups = {"unit"}, testName = "invocation.InterceptorChainTest") public class InterceptorChainTest { private CommandInterceptor icInterceptor; Modified: core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/invocationcontext/TransactionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, testName = "invocationcontext.TransactionTest") public class TransactionTest { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -45,7 +45,7 @@ * @author Mircea.Markus(a)jboss.com * @since 3.0 */ -@Test (groups = "functional", sequential = true) +@Test (groups = "functional", testName = "jmx.JmxRegistrationManagerTest") public class JmxRegistrationManagerTest { private UnitTestCacheFactory cacheFactory = new UnitTestCacheFactory(); Modified: core/trunk/src/test/java/org/jboss/cache/jmx/ResourceDMBeanTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/ResourceDMBeanTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/ResourceDMBeanTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ * @author Mircea.Markus(a)jboss.com * @since 3.0 */ -@Test (groups = "unit") +@Test (groups = "unit", testName = "jmx.ResourceDMBeanTest") public class ResourceDMBeanTest { Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -32,7 +32,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @author Brian Stansberry */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "jmx.deprecated.CacheJmxWrapperTestBase") public class CacheJmxWrapperTest extends CacheJmxWrapperTestBase { public void testCacheMBeanBinding() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @author Brian Stansberry */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "jmx.deprecated.CacheJmxWrapperTestBase") public abstract class CacheJmxWrapperTestBase { public static final String CLUSTER_NAME_BASE = "CacheMBeanTest"; Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/InterceptorRegistrationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/InterceptorRegistrationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/InterceptorRegistrationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -34,7 +34,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "jmx.deprecated.CacheJmxWrapperTestBase") public class InterceptorRegistrationTest extends CacheJmxWrapperTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -70,7 +70,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "jmx.deprecated.CacheJmxWrapperTestBase") public class LegacyConfigurationTest extends CacheJmxWrapperTestBase { public void testLocalCache() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LifecycleNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LifecycleNotificationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LifecycleNotificationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,6 +24,7 @@ import static org.testng.AssertJUnit.assertEquals; import org.testng.AssertJUnit; +import org.testng.annotations.Test; import org.jboss.cache.jmx.CacheJmxWrapper; import org.jboss.cache.jmx.CacheJmxWrapperMBean; @@ -39,6 +40,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ +@Test (groups = "functional", testName = "jmx.deprecated.CacheJmxWrapperTestBase") public class LifecycleNotificationTest extends CacheJmxWrapperTestBase { public void testGetStateAndStateNotification() throws Exception 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/NotificationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -32,7 +32,7 @@ * @author Jerry Gauthier * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, testName = "jmx.deprecated.NotificationTest") public class NotificationTest { protected static final String CLUSTER_NAME = "NotificationTestCluster"; Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/OptimisticNotificationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,10 +6,13 @@ */ package org.jboss.cache.jmx.deprecated; +import org.testng.annotations.Test; + /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ +@Test (groups = "functional", testName = "jmx.deprecated.NotificationTest") public class OptimisticNotificationTest extends NotificationTest { public OptimisticNotificationTest() Modified: core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/AbstractCacheLoaderTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,30 +12,34 @@ import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; import org.testng.annotations.Test; +import java.util.Properties; + /** * Very basic test case that provides methods to create a cache loader config. * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "loader.AbstractCacheLoaderTestBase") public abstract class AbstractCacheLoaderTestBase { protected final Log log = LogFactory.getLog(getClass()); + @Deprecated protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared) throws Exception { return getSingleCacheLoaderConfig(preload, cacheloaderClass, properties, async, fetchPersistentState, shared, false); } + @Deprecated protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared, boolean purgeOnStartup) throws Exception { - return getSingleCacheLoaderConfig(false, preload, cacheloaderClass, properties, async, fetchPersistentState, shared, purgeOnStartup); + return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, preload, cacheloaderClass, + properties, async, fetchPersistentState, shared, purgeOnStartup, false); } - protected CacheLoaderConfig getSingleCacheLoaderConfig(boolean passivation, String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared, boolean purgeOnStartup) throws Exception + protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, Properties properties, boolean async, boolean fetchPersistentState, boolean shared) throws Exception { - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(passivation, preload, cacheloaderClass, - properties, async, fetchPersistentState, shared, purgeOnStartup, false); + return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, preload, cacheloaderClass, properties, async, fetchPersistentState, shared, 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,6 +7,7 @@ import org.jboss.cache.marshall.NodeData; import org.jboss.cache.statetransfer.DefaultStateTransferManager; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; import org.jboss.util.stream.MarshalledValueInputStream; import org.jboss.util.stream.MarshalledValueOutputStream; import static org.testng.AssertJUnit.*; @@ -19,6 +20,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Properties; + import org.jboss.cache.UnitTestCacheFactory; /** @@ -29,7 +31,7 @@ * @author Mircea.Markus(a)iquestint.com * @version 1.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.AdjListJDBCCacheLoaderCompatibilityTest") @SuppressWarnings("deprecation") public class AdjListJDBCCacheLoaderCompatibilityTest { @@ -49,8 +51,9 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - newImpl = getNewCacheLoader(); - oldImpl = getOldLoader(); + Properties props = TestDbPropertiesFactory.getTestDbProperties(); + newImpl = getNewCacheLoader((Properties) props.clone()); + oldImpl = getOldLoader((Properties) props.clone()); cache = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(); cache2 = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(); newImpl.setCache(cache);//this is needed for marshaller @@ -202,70 +205,30 @@ } - protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties) throws Exception - { - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, preload, cacheloaderClass, properties, false, true, false, false, false); - } - protected Properties getProperties() throws Exception { - Properties prop = new Properties(); - try - { - prop.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); - return prop; - } - catch (Exception e) - { - throw new Exception("Error loading jdbc properties ", e); - } + return TestDbPropertiesFactory.getTestDbProperties(); } - private JDBCCacheLoader getNewCacheLoader() throws Exception + private JDBCCacheLoader getNewCacheLoader(Properties prop) throws Exception { - Properties prop = getProperties(); - - String tablePrefix = prop.getProperty("cache.jdbc.table.name", "jbosscache"); String tablePkPrefix = prop.getProperty("cache.jdbc.table.primarykey", "jbosscache_pk"); - prop.setProperty("cache.jdbc.table.name", tablePrefix + TestingUtil.getThreadId()); - prop.setProperty("cache.jdbc.table.primarykey", tablePkPrefix + TestingUtil.getThreadId()); + prop.setProperty("cache.jdbc.table.primarykey", (tablePkPrefix + 1)); - String props = "cache.jdbc.driver =" + prop.getProperty("cache.jdbc.driver") + "\n" + - "cache.jdbc.url=" + prop.getProperty("cache.jdbc.url") + "\n" + - "cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" + - "cache.jdbc.password=" + prop.getProperty("cache.jdbc.password") + "\n" + - "cache.jdbc.node.type=" + prop.getProperty("cache.jdbc.node.type") + "\n" + - "cache.jdbc.sql-concat=" + prop.getProperty("cache.jdbc.sql-concat") + "\n" + - "cache.jdbc.table.name=" + prop.getProperty("cache.jdbc.table.name") + "\n" + - "cache.jdbc.table.primarykey=" + prop.getProperty("cache.jdbc.table.primarykey"); - - - CacheLoaderConfig.IndividualCacheLoaderConfig base = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props).getFirstCacheLoaderConfig(); - + CacheLoaderConfig.IndividualCacheLoaderConfig base = + UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", JDBCCacheLoader.class.getName(), + prop, false, true, false, false, false).getFirstCacheLoaderConfig(); JDBCCacheLoader jdbcCacheLoader = new JDBCCacheLoader(); jdbcCacheLoader.setConfig(base); return jdbcCacheLoader; } - private JDBCCacheLoaderOld getOldLoader() throws Exception + private JDBCCacheLoaderOld getOldLoader(Properties prop) throws Exception { - Properties prop = getProperties(); - - String tablePrefix = prop.getProperty("cache.jdbc.table.name", "jbosscache"); - prop.setProperty("cache.jdbc.table.name", tablePrefix + TestingUtil.getThreadId()); - - String props = "cache.jdbc.driver =" + prop.getProperty("cache.jdbc.driver") + "\n" + - "cache.jdbc.url=" + prop.getProperty("cache.jdbc.url") + "\n" + - "cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" + - "cache.jdbc.password=" + prop.getProperty("cache.jdbc.password") + "\n" + - "cache.jdbc.node.type=" + prop.getProperty("cache.jdbc.node.type") + "\n" + - "cache.jdbc.sql-concat=" + prop.getProperty("cache.jdbc.sql-concat") + "\n" + - "cache.jdbc.table.name=" + prop.getProperty("cache.jdbc.table.name"); -// "cache.jdbc.connection.factory=org.jboss.cache.manualtests.cacheloader.OneConnectionFactory"; - - - CacheLoaderConfig.IndividualCacheLoaderConfig base = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props).getFirstCacheLoaderConfig(); + CacheLoaderConfig.IndividualCacheLoaderConfig base = + UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "", + "org.jboss.cache.loader.JDBCCacheLoader", prop, false, true, false, false, false).getFirstCacheLoaderConfig(); JDBCCacheLoaderOld jdbcCacheLoader = new JDBCCacheLoaderOld(); jdbcCacheLoader.setConfig(base); return jdbcCacheLoader; Modified: core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.AsyncFileCacheLoaderTest") public class AsyncFileCacheLoaderTest extends AbstractCacheLoaderTestBase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "loader.BdbjeCacheLoaderTest") public class BdbjeCacheLoaderTest extends CacheLoaderTestsBase { Modified: core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -38,7 +38,7 @@ * * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, testName = "loader.BdbjeTest") public class BdbjeTest { @@ -949,10 +949,8 @@ /** * Test load/store state. */ - public void testLoadAndStore() - throws Exception + public void testLoadAndStore() throws Exception { - startLoader(false, null); /* Empty state. */ Modified: core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,25 +6,23 @@ */ package org.jboss.cache.loader; +import com.mchange.v2.c3p0.PooledDataSource; +import org.jboss.cache.util.TestDbPropertiesFactory; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.fail; - -import java.sql.Connection; -import java.util.Properties; - import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import com.mchange.v2.c3p0.PooledDataSource; -import org.jboss.cache.util.TestingUtil; +import java.sql.Connection; +import java.util.Properties; /** * Unit test for C3p0ConnectionFactory * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.C3p0ConnectionFactoryTest") public class C3p0ConnectionFactoryTest { private C3p0ConnectionFactory cf; @@ -33,14 +31,7 @@ @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { - Properties prop = load("cache-jdbc.properties"); - - String tablePrefix = prop.getProperty("cache.jdbc.table.name", "jbosscache"); - prop.setProperty("cache.jdbc.table.name", tablePrefix + TestingUtil.getThreadId()); - - String pkPrefix = prop.getProperty("cache.jdbc.table.primarykey", "jbosscache_pk"); - prop.setProperty("cache.jdbc.table.primarykey", pkPrefix + TestingUtil.getThreadId()); - + Properties prop = TestDbPropertiesFactory.getTestDbProperties(); config = new AdjListJDBCCacheLoaderConfig(); config.setProperties(prop); } @@ -111,24 +102,4 @@ Thread.sleep(100); assertEquals("There should be no connections checked out", 0, internalDs.getNumBusyConnectionsDefaultUser()); } - - private Properties load(String resource) throws Exception - { - Properties prop = new Properties(); - try - { - prop.load(this.getClass().getClassLoader().getResourceAsStream(resource)); - return prop; - } - catch (Exception e) - { - log("Error loading jdbc properties "); - throw (e); - } - } - - private void log(Object o) - { - System.out.println(o); - } } Modified: core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/C3p0JDBCCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,6 +9,8 @@ import java.util.Properties; import org.jboss.cache.CacheSPI; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; +import org.testng.annotations.Test; /** * Unit test that runs the the tests defined JDBCCacheLoaderTest using a standalone @@ -16,26 +18,16 @@ * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ +@Test(groups = "functional", testName = "loader.JDBCCacheLoaderTest") public class C3p0JDBCCacheLoaderTest extends JDBCCacheLoaderTest { private static final String CF_CLASS = "org.jboss.cache.loader.C3p0ConnectionFactory"; protected void configureCache() throws Exception { - Properties prop = getProperties(); - - String props = "cache.jdbc.driver =" + prop.getProperty("cache.jdbc.driver") + "\n" + - "cache.jdbc.url=" + prop.getProperty("cache.jdbc.url") + "\n" + - "cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" + - "cache.jdbc.password=" + prop.getProperty("cache.jdbc.password") + "\n" + - "cache.jdbc.node.type=" + prop.getProperty("cache.jdbc.node.type") + "\n" + - "cache.jdbc.sql-concat=" + prop.getProperty("cache.jdbc.sql-concat") + "\n" + - "cache.jdbc.connection.factory=" + CF_CLASS + "\n" + - "cache.jdbc.table.name=jbosscache" + TestingUtil.getThreadId() + "\n" + - "cache.jdbc.table.primarykey=jbosscache_pk" + TestingUtil.getThreadId(); - + Properties prop = TestDbPropertiesFactory.getTestDbProperties(); + prop.put("cache.jdbc.connection.factory", CF_CLASS); CacheSPI<Object, Object> cache = cacheTL.get(); - cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", - "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false)); + cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", prop, false, true, false)); } } Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.CacheLoaderManagerTest") public class CacheLoaderManagerTest extends AbstractCacheLoaderTestBase { private LoadersElementParser loadersElementParser = new LoadersElementParser(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.CacheLoaderMethodCallCounterTest") public class CacheLoaderMethodCallCounterTest extends AbstractCacheLoaderTestBase { private CacheSPI cache; @@ -96,4 +96,4 @@ assertEquals(0, dummyLoader.getRemoveCount()); assertEquals(0, dummyLoader.getExistsCount()); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.CacheLoaderPurgingTest") public class CacheLoaderPurgingTest extends AbstractCacheLoaderTestBase { private CacheSPI<Object, Object> cache; @@ -45,7 +45,8 @@ cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(false); Configuration c = cache.getConfiguration(); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false)); + String s = "bin=" + getClass().getName(); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummySharedInMemoryCacheLoader.class.getName(), s, false, false, false)); cache.start(); cache.put(fqn, key, value); @@ -68,7 +69,8 @@ { cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(false); Configuration c = cache.getConfiguration(); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false, true)); + String s = "bin=" + getClass().getName(); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummySharedInMemoryCacheLoader.class.getName(), s, false, false, false, true)); cache.start(); cache.put(fqn, key, value); @@ -97,11 +99,11 @@ " <loaders passivation=\"false\">\n" + " <loader class=\"org.jboss.cache.loader.DummySharedInMemoryCacheLoader\" fetchPersistentState=\"true\"\n" + " purgeOnStartup=\"true\">\n" + - " <properties>bin=bin1</properties>\n" + + " <properties>bin=" + getClass() + "bin1</properties>\n" + " </loader>" + " <loader class=\"org.jboss.cache.loader.DummySharedInMemoryCacheLoader\" fetchPersistentState=\"false\"\n" + " purgeOnStartup=\"false\">\n" + - " <properties>bin=bin2</properties>\n" + + " <properties>bin=" + getClass()+ "bin2</properties>\n" + " </loader>" + " </loaders>"; LoadersElementParser parser = new LoadersElementParser(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -42,7 +42,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.CacheLoaderTestsBase") abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase { private static final Log log = LogFactory.getLog(CacheLoaderTestsBase.class); Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.CacheLoaderWithReplicationTest") public class CacheLoaderWithReplicationTest extends AbstractCacheLoaderTestBase { private Cache<Object, Object> cache1, cache2; @@ -314,4 +314,4 @@ assertEquals("value", loader2.get(fqn).get(key)); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.ChainingCacheLoaderBasicTest") public class ChainingCacheLoaderBasicTest extends CacheLoaderTestsBase { private static final String loc1 = "JBossCache-ChainingCacheLoaderBasicTest-1"; Modified: core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderFullTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.ChainingCacheLoaderFullTest") public class ChainingCacheLoaderFullTest { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderRegionBasedTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -2,7 +2,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.ClusteredCacheLoaderRegionBasedTest") public class ClusteredCacheLoaderRegionBasedTest extends ClusteredCacheLoaderTest { public ClusteredCacheLoaderRegionBasedTest() Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -34,7 +34,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.ClusteredCacheLoaderTest") public class ClusteredCacheLoaderTest extends AbstractCacheLoaderTestBase { private static Log log = LogFactory.getLog(ClusteredCacheLoaderTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.2.0 */ -@Test(groups = "functional", enabled = false) +@Test(groups = "functional", enabled = false, testName = "loader.ConcurrentPutRemoveEvictTest") // TODO: 2.2.0: Figure out why this occasionally hangs!! public class ConcurrentPutRemoveEvictTest extends AbstractCacheLoaderTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/DataSourceIntegrationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,10 +24,12 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; + import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.DataSourceIntegrationTest") public class DataSourceIntegrationTest extends AbstractCacheLoaderTestBase { //private String old_factory = null; @@ -43,11 +45,13 @@ DummyTransactionManager.getInstance(); } - protected CacheLoaderConfig getCacheLoaderConfig(String jndi) throws Exception + protected CacheLoaderConfig getCacheLoaderConfig(Properties jndi) throws Exception { - String props = "cache.jdbc.datasource=" + jndi + "\ncache.jdbc.table.create=true\ncache.jdbc.table.drop=true"; - CacheLoaderConfig cacheLoaderConfig = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, false, false); - return cacheLoaderConfig; + Properties props = new Properties(jndi); + props.put("cache.jdbc.datasource", JNDI_NAME); + props.put("cache.jdbc.table.create", true); + props.put("cache.jdbc.table.drop", true); + return getSingleCacheLoaderConfig("", "org.jboss.cache.loader.JDBCCacheLoader", props, false, false, false); } /** @@ -68,14 +72,15 @@ { // expected } + Properties props = TestDbPropertiesFactory.getTestDbProperties(); cache = (CacheSPI) new UnitTestCacheFactory<Object, Object>().createCache(false); cache.getConfiguration().setCacheMode("local"); cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup"); - cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(JNDI_NAME)); + cache.getConfiguration().setCacheLoaderConfig(getCacheLoaderConfig(props)); cache.create(); - context.bind(JNDI_NAME, new MockDataSource()); + context.bind(JNDI_NAME, new MockDataSource(props)); assertNotNull(JNDI_NAME + " bound", context.lookup(JNDI_NAME)); cache.start(); @@ -87,18 +92,6 @@ { Context ctx = new InitialContext(); ctx.unbind(JNDI_NAME); - /* - if (old_factory != null) - { - System.setProperty(Context.INITIAL_CONTEXT_FACTORY, old_factory); - } - else - { - System.getProperties().remove(Context.INITIAL_CONTEXT_FACTORY); - } - */ - - if (cache != null) { TestingUtil.killCaches(cache); @@ -112,17 +105,14 @@ private String jdbcUrl; private String jdbcPassword; - public MockDataSource() + public MockDataSource(Properties properties) { - Properties properties = new Properties(); try { - properties.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); Class.forName(properties.getProperty("cache.jdbc.driver")); - } - catch (Exception e) + } catch (ClassNotFoundException e) { - throw new IllegalStateException("Error loading jdbc properties ", e); + throw new RuntimeException(e); } userName = properties.getProperty("cache.jdbc.user"); jdbcUrl = properties.getProperty("cache.jdbc.url"); Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderPessimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ * Odd that we need a test for a test class, but if we intend to use the {@link DummyInMemoryCacheLoader} as a cache * loader stub then we need to make sure it behaves as a valid cache loader. */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.DummyInMemoryCacheLoaderPessimisticTest") public class DummyInMemoryCacheLoaderPessimisticTest extends CacheLoaderTestsBase { protected void configureCache() throws Exception @@ -17,8 +17,8 @@ // use the shared variation of the DIMCL so that state is persisted in a static variable in memory rather than an // instance one. CacheSPI<Object, Object> cache = cacheTL.get(); - CacheLoaderConfig clc = getSingleCacheLoaderConfig("", DummySharedInMemoryCacheLoader.class.getName(), "debug=true", false, true, false); + CacheLoaderConfig clc = getSingleCacheLoaderConfig("", DummySharedInMemoryCacheLoader.class.getName(), "debug=true \n bin=" + getClass().getName(), false, true, false); cache.getConfiguration().setCacheLoaderConfig(clc); cache.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ * Odd that we need a test for a test class, but if we intend to use the {@link org.jboss.cache.loader.DummyInMemoryCacheLoader} as a cache * loader stub then we need to make sure it behaves as a valid cache loader. */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.DummyInMemoryCacheLoaderTest") public class DummyInMemoryCacheLoaderTest extends CacheLoaderTestsBase { protected void configureCache() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderConfigTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderConfigTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderConfigTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups={"functional"}) +@Test(groups={"functional"}, testName = "loader.FileCacheLoaderConfigTest") public class FileCacheLoaderConfigTest { private FileCacheLoaderConfig fclc = new FileCacheLoaderConfig(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/FileCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.Test; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.FileCacheLoaderTest") public class FileCacheLoaderTest extends CacheLoaderTestsBase { protected void configureCache() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/InterceptorSynchronizationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ * * @author paulsmith */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.InterceptorSynchronizationTest") public class InterceptorSynchronizationTest { Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConfigTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConfigTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConfigTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups = {"unit"}, sequential = true) +@Test(groups = {"unit"}, sequential = true, testName = "loader.JDBCCacheLoaderConfigTest") public class JDBCCacheLoaderConfigTest { private AdjListJDBCCacheLoaderConfig cacheLoaderConfig; Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ /** * To test the closing of JDBC connections */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.JDBCCacheLoaderConnectionTest") public class JDBCCacheLoaderConnectionTest extends AbstractCacheLoaderTestBase { private Cache cache; Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderDerbyDSTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,6 +19,7 @@ import java.util.Properties; import org.jboss.cache.CacheSPI; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; /** * This test runs cache loader tests using Database as the cache loader store. @@ -32,7 +33,7 @@ * @author <a href=&quot;hmesha(a)novell.com&quot;&gt;Hany Mesha</a> * @version <tt>$Revision$</tt> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.JDBCCacheLoaderDerbyDSTest") public class JDBCCacheLoaderDerbyDSTest extends CacheLoaderTestsBase { @@ -57,17 +58,8 @@ // expected } - Properties prop = new Properties(); - try - { - prop.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); - } - catch (Exception e) - { - System.out.println("Error loading jdbc properties "); - } + Properties prop = TestDbPropertiesFactory.getTestDbProperties(); - //MysqlDataSource ds = new MysqlDataSource(); EmbeddedXADataSource ds = new EmbeddedXADataSource(); ds.setDatabaseName("jbossdb"); ds.setCreateDatabase("create"); Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,118 +1,107 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.cache.loader; - -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.transaction.GenericTransactionManagerLookup; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; - -/** - * UT for testing JDBCCacheLoader during state transfer. - * @author Mircea.Markus(a)jboss.com - * @since 3.0 - */ -@Test(groups = "functional", sequential = true) -public class JDBCCacheLoaderStateTransferTest extends AbstractCacheLoaderTestBase -{ - - CacheSPI first; - CacheSPI second; - - @AfterMethod - public void tearDown() - { - if (first != null) first.stop(); - if (second != null) second.stop(); - } - - private Configuration getConfiguration(int instance) throws Exception - { - Configuration c = new Configuration(); - c.setTransactionManagerLookupClass(GenericTransactionManagerLookup.class.getName()); - CacheLoaderConfig clc = getSingleCacheLoaderConfig("/", JDBCCacheLoader.class.getName(), "cache.jdbc.table.name=jbosscache\n" + - " cache.jdbc.table.create=true\n" + - " cache.jdbc.table.drop=true\n" + - " cache.jdbc.table.primarykey=jbosscache_pk\n" + - " cache.jdbc.fqn.column=fqn\n" + - " cache.jdbc.fqn.type=varchar(255)\n" + - " cache.jdbc.node.column=node\n" + - " cache.jdbc.node.type=blob\n" + - " cache.jdbc.parent.column=parent\n" + - " cache.jdbc.sql-concat=1 || 2\n" + - " cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver\n" + - " cache.jdbc.url=jdbc:derby:jbossdb"+instance+";create=true\n" + - " cache.jdbc.user=user1\n" + - " cache.jdbc.password=user1\n" + - " cache.jdbc.batch.enable=true\n" + - " cache.jdbc.batch.size=1000", false, true, false); - clc.setPassivation(false); - clc.getFirstCacheLoaderConfig().setPurgeOnStartup(true); - c.setCacheLoaderConfig(clc); - c.setCacheMode(CacheMode.REPL_SYNC); - return c; - } - - public void testSimpleStateTransfer() throws Exception - { - first = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration(0)); - first.put("/a/b/c", "key", "value"); - first.put("/a/b/d", "key", "value"); - first.put("/a/b/e", "key", "value"); - second = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration(2)); - assert second.get("/a/b/c","key").equals("value"); - assert second.get("/a/b/d","key").equals("value"); - assert second.get("/a/b/e","key").equals("value"); - JDBCCacheLoader cacheLoader = (JDBCCacheLoader) second.getCacheLoaderManager().getCacheLoader(); - assert cacheLoader.exists(Fqn.fromString("/a")); - assert cacheLoader.exists(Fqn.fromString("/a/b")); - } - - - public void testMoreState() throws Exception - { - long startTime = System.currentTimeMillis(); - - first = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration(0)); - long cacheStartTime = System.currentTimeMillis() - startTime; - System.out.println("cacheStartTime = " + cacheStartTime); - for (int i = 0; i < 5012; i++) - { - first.put("a/b/"+i, "k","v"); - if (i%1000 == 0) System.out.println(i + " operations executed so far"); - } - startTime = System.currentTimeMillis(); - second = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration(2)); - - long stateTranferTime = System.currentTimeMillis() - startTime - cacheStartTime; - for (int i = 0; i < 5012; i+=100) - { - second.get("a/b/"+ i, "k").equals("v"); - } - System.out.println("stateTranferTime = " + stateTranferTime); - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.cache.loader; + +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.util.TestDbPropertiesFactory; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.Configuration.CacheMode; +import org.jboss.cache.transaction.GenericTransactionManagerLookup; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.Test; + +import java.util.Properties; + +/** + * UT for testing JDBCCacheLoader during state transfer. + * @author Mircea.Markus(a)jboss.com + * @since 3.0 + */ +@Test(groups = "functional", sequential = true, testName = "loader.JDBCCacheLoaderStateTransferTest") +public class JDBCCacheLoaderStateTransferTest extends AbstractCacheLoaderTestBase +{ + + CacheSPI first; + CacheSPI second; + + @AfterMethod + public void tearDown() + { + if (first != null) first.stop(); + if (second != null) second.stop(); + } + + private Configuration getConfiguration() throws Exception + { + Configuration c = new Configuration(); + c.setTransactionManagerLookupClass(GenericTransactionManagerLookup.class.getName()); + Properties props = TestDbPropertiesFactory.getTestDbProperties(); + CacheLoaderConfig clc = getSingleCacheLoaderConfig("/", JDBCCacheLoader.class.getName(), props, false, true, false); + clc.setPassivation(false); + clc.getFirstCacheLoaderConfig().setPurgeOnStartup(true); + c.setCacheLoaderConfig(clc); + c.setCacheMode(CacheMode.REPL_SYNC); + return c; + } + + public void testSimpleStateTransfer() throws Exception + { + first = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration()); + first.put("/a/b/c", "key", "value"); + first.put("/a/b/d", "key", "value"); + first.put("/a/b/e", "key", "value"); + second = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration()); + assert second.get("/a/b/c","key").equals("value"); + assert second.get("/a/b/d","key").equals("value"); + assert second.get("/a/b/e","key").equals("value"); + JDBCCacheLoader cacheLoader = (JDBCCacheLoader) second.getCacheLoaderManager().getCacheLoader(); + assert cacheLoader.exists(Fqn.fromString("/a")); + assert cacheLoader.exists(Fqn.fromString("/a/b")); + } + + + public void testMoreState() throws Exception + { + long startTime = System.currentTimeMillis(); + + first = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration()); + long cacheStartTime = System.currentTimeMillis() - startTime; + System.out.println("cacheStartTime = " + cacheStartTime); + for (int i = 0; i < 5012; i++) + { + first.put("a/b/"+i, "k","v"); + if (i%1000 == 0) System.out.println(i + " operations executed so far"); + } + startTime = System.currentTimeMillis(); + second = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration()); + + long stateTranferTime = System.currentTimeMillis() - startTime - cacheStartTime; + for (int i = 0; i < 5012; i+=100) + { + second.get("a/b/"+ i, "k").equals("v"); + } + System.out.println("stateTranferTime = " + stateTranferTime); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,9 +11,9 @@ import org.testng.annotations.Test; import java.util.Properties; -import java.util.concurrent.atomic.AtomicInteger; + import org.jboss.cache.CacheSPI; -import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; /** * This test runs cache loader tests using Database as the cache loader store. @@ -29,13 +29,12 @@ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> * @version <tt>$Revision$</tt> */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "loader.JDBCCacheLoaderTest") public class JDBCCacheLoaderTest extends CacheLoaderTestsBase { protected void configureCache() throws Exception { - Properties prop = getProperties(); - String props = props2String(prop); + String props = props2String(TestDbPropertiesFactory.getTestDbProperties()); CacheSPI<Object, Object> cache = cacheTL.get(); cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", JDBCCacheLoader.class.getName(), props, false, true, false)); @@ -94,27 +93,6 @@ } } - protected Properties getProperties() throws Exception - { - Properties properties = new Properties(); - try - { - properties.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); - - String tablePrefix = properties.getProperty("cache.jdbc.table.name", "jbosscache"); - properties.setProperty("cache.jdbc.table.name", tablePrefix + TestingUtil.getThreadId()); - - String pkPrefix = properties.getProperty("cache.jdbc.table.primarykey", "jbosscache_pk"); - properties.setProperty("cache.jdbc.table.primarykey", pkPrefix + TestingUtil.getThreadId()); - - return properties; - } - catch (Exception e) - { - throw new Exception("Error loading jdbc properties ", e); - } - } - public void testRootIsCreated() throws Exception { CacheLoader loader = loaderTL.get(); Modified: core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/JdbmCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ * @author Elias Ross * @version $Id$ */ -@Test (groups = {"functional"}) +@Test (groups = {"functional"}, testName = "loader.JdbmCacheLoaderTest") public class JdbmCacheLoaderTest extends CacheLoaderTestsBase { protected void configureCache() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.LocalDelegatingCacheLoaderTest") public class LocalDelegatingCacheLoaderTest extends CacheLoaderTestsBase { CacheSPI delegating_cache; Modified: core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/PreloadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.PreloadTest") public class PreloadTest extends AbstractCacheLoaderTestBase { CacheSPI<Object, Object> cache; @@ -27,7 +27,8 @@ public void testPreload() throws Exception { Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/a", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false)); + String props = "bin=" + getClass().getName(); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/a", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone()); cache.put(fqn, key, value); assertExists(); @@ -41,22 +42,23 @@ public void testPreloadMultiRegions() throws Exception { Configuration c = UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.LOCAL); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/a", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false)); + String props = "bin=" + getClass().getName(); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/a", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone()); cache.put(fqn, key, value); assertExists(); cache.destroy(); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/c,/a,/b", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false)); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/c,/a,/b", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone()); assertExists(); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false)); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig("/c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone()); assertExists(); - c.setCacheLoaderConfig(getSingleCacheLoaderConfig(" /c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), "", false, false, false)); + c.setCacheLoaderConfig(getSingleCacheLoaderConfig(" /c, /a, /b", DummySharedInMemoryCacheLoader.class.getName(), props, false, false, false)); cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(c.clone()); assertExists(); } Modified: core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @version $Id: JdbmCacheLoaderTest.java 4561 2007-10-08 14:02:02Z manik.surtani(a)jboss.com $ */ @Test(groups = -{"functional"}, enabled = true) +{"functional"}, enabled = true, testName = "loader.S3CacheLoaderTest") public class S3CacheLoaderTest extends CacheLoaderTestsBase { Modified: core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/SharedCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.SharedCacheLoaderTest") public class SharedCacheLoaderTest extends AbstractCacheLoaderTestBase { private CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -36,7 +36,7 @@ * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "loader.SingletonStoreCacheLoaderTest") public class SingletonStoreCacheLoaderTest extends AbstractCacheLoaderTestBase { private static final Log log = LogFactory.getLog(SingletonStoreCacheLoaderTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = "functional", enabled = false) +@Test(groups = "functional", enabled = false, testName = "loader.TcpCacheLoaderTest") // TODO re-enable!! public class TcpCacheLoaderTest //extends CacheLoaderTestsBase { @@ -254,4 +254,4 @@ // } // } // } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author Brian Stansberry * @version $Id$ */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = false, testName = "loader.TcpCacheServerTest") // TODO Re-enable! public class TcpCacheServerTest { @@ -178,4 +178,4 @@ assertEquals("Got value from cache", "two", cache.get(fqn, "one")); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "loader.TxCacheLoaderTest") public class TxCacheLoaderTest extends AbstractCacheLoaderTestBase { CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/UnnecessaryLoadingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "loader.UnnecessaryLoadingTest") public class UnnecessaryLoadingTest { private CacheSPI<Object, Object> cache; @@ -358,4 +358,4 @@ assertEquals("v2", cache.get(parent, "k2")); verify(mockCacheLoader); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -64,7 +64,7 @@ * CacheLoader/StoreInterceptor's...</li> * </ul> */ -@Test(groups = {"functional"}, enabled = false, sequential = true) +@Test(groups = {"functional"}, enabled = false, testName = "loader.deadlock.ConcurrentCreationDeadlockTest") // Disabling since this has issues with ReadWriteWithUpgradeLock. See JBCACHE-461 public class ConcurrentCreationDeadlockTest extends AbstractCacheLoaderTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/BreakDeadMemberLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -47,7 +47,7 @@ * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.BreakDeadMemberLocksTest") public class BreakDeadMemberLocksTest { private Map<String, CacheSPI<Object, Object>> caches; Modified: core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/IdentityLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author Ben Wang * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.IdentityLockTest") public class IdentityLockTest { NodeLock lock_; Modified: core/trunk/src/test/java/org/jboss/cache/lock/LockMapTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/LockMapTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/LockMapTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ /** * @author Ben Wang */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.LockMapTest") public class LockMapTest { private LockMap map_; Modified: core/trunk/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "lock.LockParentRootFlagTest") public class LockParentRootFlagTest { // to test https://jira.jboss.org/jira/browse/JBCACHE-1420 Modified: core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.LockReleaseTest") public class LockReleaseTest { CacheSPI<Object, Object> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/lock/LockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/LockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/LockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -17,7 +17,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, testName = "lock.LockTest") public class LockTest { int value = 10; Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerNoTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerNoTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerNoTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import javax.transaction.TransactionManager; -@Test(groups = {"unit", "mvcc"}) +@Test(groups = {"unit", "mvcc"}, testName = "lock.MVCCLockManagerNoTxTest") public class MVCCLockManagerNoTxTest extends MVCCLockManagerTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerRecordingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 3.0 */ -@Test(groups = {"unit", "mvcc"}) +@Test(groups = {"unit", "mvcc"}, testName = "lock.MVCCLockManagerRecordingTest") public class MVCCLockManagerRecordingTest extends AbstractLockManagerRecordingTest { @BeforeMethod Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -@Test(groups = {"unit", "mvcc"}, sequential = true) +@Test(groups = {"unit", "mvcc"}, sequential = true, testName = "lock.MVCCLockManagerTest") public class MVCCLockManagerTest { MVCCLockManager lm; Modified: core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/NodeBasedLockManagerRecordingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -13,7 +13,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 3.0 */ -@Test(groups = "unit") +@Test(groups = "unit", testName = "lock.NodeBasedLockManagerRecordingTest") public class NodeBasedLockManagerRecordingTest extends AbstractLockManagerRecordingTest { @BeforeMethod Modified: core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/NonBlockingWriterLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -26,7 +26,7 @@ * @author <a href="mailto:cavin_song@yahoo.com">Cavin Song</a> April 22, 2004 * @version 1.0 */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = false, testName = "lock.NonBlockingWriterLockTest") // TODO: 2.2.0: This is not a very good test. There is a lot of timing related stuff with regards to the order of execution of reader and writer threads that is not taken into account, producing variable results. Needs to be rewritten. public class NonBlockingWriterLockTest { Modified: core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/PessimisticAcquireAllTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "lock.PessimisticAcquireAllTest") public class PessimisticAcquireAllTest { CacheSPI<Object, Object> cache = null, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "lock.PessimisticLockTest") public class PessimisticLockTest { private Cache<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = { "functional" }, sequential = true) +@Test(groups = { "functional" }, sequential = true, testName = "lock.ReadWriteLockTest") public class ReadWriteLockTest { ReadWriteLock lock; Modified: core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockWithUpgradeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockWithUpgradeTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/ReadWriteLockWithUpgradeTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * @author <a href="mailto:cavin_song@yahoo.com">Cavin Song</a> April 22, 2004 * @version 1.0 */ -@Test(groups = { "functional" }, sequential = true) +@Test(groups = { "functional" }, sequential = true, testName = "lock.ReadWriteLockWithUpgradeTest") public class ReadWriteLockWithUpgradeTest { static final ReadWriteLockWithUpgrade lock_ = new ReadWriteLockWithUpgrade(); Modified: core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreference2Readers1WriterLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreference2Readers1WriterLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreference2Readers1WriterLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = false, testName = "lock.ReentrantWriterPreference2Readers1WriterLockTest") // historical disabled - and wont fix. See JBCACHE-461 public class ReentrantWriterPreference2Readers1WriterLockTest { Modified: core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreferenceReadWriteLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreferenceReadWriteLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/ReentrantWriterPreferenceReadWriteLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.ReentrantWriterPreferenceReadWriteLockTest") public class ReentrantWriterPreferenceReadWriteLockTest { ReentrantReadWriteLock lock; Modified: core/trunk/src/test/java/org/jboss/cache/lock/StripedLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/StripedLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/StripedLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -13,7 +13,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = { "functional" }) +@Test(groups = { "functional" }, testName = "lock.StripedLockTest") public class StripedLockTest { private StripedLock stripedLock; Modified: core/trunk/src/test/java/org/jboss/cache/lock/UpgradeLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/UpgradeLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/UpgradeLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,7 +29,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.UpgradeLockTest") public class UpgradeLockTest { CacheSPI<Object, Object> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "lock.WriteLockOnParentTest") public class WriteLockOnParentTest { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ // The problem is in the way READ_COMMITTED is implemented, i.e., writers are not blocked by readers and this // allows a reader to hold a lock when a writer comes in and deletes the node in question. -@Test(groups = "functional", enabled = false) +@Test(groups = "functional", enabled = false, testName = "lock.pessimistic.ConcurrentPutRemoveTest") // Known issue - See JBCACHE-1164 and JBCACHE-1165 public class ConcurrentPutRemoveTest { Modified: core/trunk/src/test/java/org/jboss/cache/manager/CacheManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/manager/CacheManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/manager/CacheManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author Brian Stansberry */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "manager.CacheManagerTest") public class CacheManagerTest { /** Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/AbstractVersionAwareMarshallerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,11 +12,11 @@ */ public abstract class AbstractVersionAwareMarshallerTest { - protected ThreadLocal<ComponentRegistry> crTL = new ThreadLocal<ComponentRegistry>(); + protected ComponentRegistry cr = null; protected VersionAwareMarshaller createVAMandRestartCache(String replVersion) { - ComponentRegistry cr = crTL.get(); + ComponentRegistry cr = this.cr; Configuration c = cr.getComponent(Configuration.class); c.setReplVersionString(replVersion); return createVAMandRestartCache(new RegionManagerImpl()); @@ -24,7 +24,7 @@ protected VersionAwareMarshaller createVAMandRestartCache(RegionManager rm) { - ComponentRegistry cr = crTL.get(); + ComponentRegistry cr = this.cr; if (cr.getState() == CacheStatus.STARTED) cr.stop(); cr.registerComponent(rm, RegionManager.class); cr.create(); Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,7 +29,7 @@ * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "marshall.ActiveInactiveTest") public class ActiveInactiveTest extends AbstractVersionAwareMarshallerTest { RegionManager rman; @@ -47,8 +47,7 @@ c.setUseRegionBasedMarshalling(true); c.setFetchInMemoryState(false); cache.start(); - ComponentRegistry cr = TestingUtil.extractComponentRegistry(cache); - crTL.set(cr); + this.cr = TestingUtil.extractComponentRegistry(cache); rman = TestingUtil.extractComponentRegistry(cache).getComponent(RegionManager.class); } Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplMarshalledValuesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "marshall.AsyncReplMarshalledValuesTest") public class AsyncReplMarshalledValuesTest extends AsyncReplTest { public AsyncReplMarshalledValuesTest() Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -42,7 +42,7 @@ * @author Ben Wang * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}, sequential = true) +@Test(groups = {"functional", "jgroups"}, sequential = true, testName = "marshall.AsyncReplTest") public class AsyncReplTest extends RegionBasedMarshallingTestBase { CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingJDBCTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,9 +11,9 @@ import org.jboss.cache.eviction.LRUAlgorithmConfig; import org.jboss.cache.loader.JDBCCacheLoaderConfig; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.util.Collections; @@ -27,7 +27,7 @@ * @author <a href="mailto:brian.stansberry@jboss.org">Brian Stansberry</a> * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "marshall.CacheLoaderMarshallingJDBCTest") public class CacheLoaderMarshallingJDBCTest extends RegionBasedMarshallingTestBase { private static final String className = "org.jboss.cache.marshall.MyUUID"; @@ -92,7 +92,7 @@ private Cache createCache(boolean useRegionBased) throws Exception { - Properties prop = getProperties(); + Properties prop = TestDbPropertiesFactory.getTestDbProperties(); // ensure cleanup after each test prop.setProperty("cache.jdbc.table.drop", "true"); @@ -124,19 +124,4 @@ return cache; } - - private Properties getProperties() throws Exception - { - Properties properties = new Properties(); - try - { - properties.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); - return properties; - } - catch (Exception e) - { - throw new Exception("Error loading jdbc properties ", e); - } - } - -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheLoaderMarshallingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", testName = "marshall.CacheLoaderMarshallingTest") public class CacheLoaderMarshallingTest extends RegionBasedMarshallingTestBase { private static final String tmpDir = System.getProperty("java.io.tmpdir") + File.separatorChar + "CacheLoaderMarshallingTest"; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.factories.ComponentRegistry; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "marshall.CacheMarshaller200Test") public class CacheMarshaller200Test extends CacheMarshallerTestBase { public CacheMarshaller200Test() @@ -129,7 +129,7 @@ c.setInactiveOnStartup(false); c.setUseRegionBasedMarshalling(true); c.setCacheMarshaller(cm200); - ComponentRegistry cr = crTL.get(); + ComponentRegistry cr = this.cr; cr.registerComponent(cm200, CacheMarshaller200.class); cr.rewire(); cr.start(); Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Test.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Test.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller210Test.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "marshall.CacheMarshaller210Test") public class CacheMarshaller210Test extends CacheMarshaller200Test { public CacheMarshaller210Test() Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller300Test.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller300Test.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller300Test.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "marshall.CacheMarshaller300Test") public class CacheMarshaller300Test { public void testArrayTypes() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -@Test(groups = "functional") +@Test(groups = "functional", testName = "marshall.CacheMarshallerTestBase") public abstract class CacheMarshallerTestBase extends AbstractVersionAwareMarshallerTest { protected String currentVersion; @@ -49,7 +49,7 @@ tl.c.setInactiveOnStartup(false); tl.c.setReplVersionString(currentVersion); ComponentRegistry cr = new ComponentRegistry(tl.c, new CacheInvocationDelegate()); - crTL.set(cr); + this.cr = cr; tl.marshaller = createVAMandRestartCache(new RegionManagerImpl()); tl.regionManager = cr.getComponent(RegionManager.class); } Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/CustomCollectionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "marshall.CustomCollectionTest") public class CustomCollectionTest extends RegionBasedMarshallingTestBase implements Serializable { private transient Cache<Object, Object> cache1 = null; @@ -289,4 +289,4 @@ { return Fqn.fromString(fqn); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/InvalidRegionForStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "marshall.InvalidRegionForStateTransferTest") public class InvalidRegionForStateTransferTest { Cache<Object, Object> c1, c2; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/MarshalledValueTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -39,7 +39,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "marshall.MarshalledValueTest") public class MarshalledValueTest { private CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/MethodIdPreservationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "marshall.MethodIdPreservationTest") public class MethodIdPreservationTest { private Marshaller m; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RedeploymentEmulationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/RedeploymentEmulationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/RedeploymentEmulationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ -@Test(groups = {"functional"}, enabled = false, sequential = true) +@Test(groups = {"functional"}, enabled = false, sequential = true, testName = "marshall.RedeploymentEmulationTest") // this relies on an old project structure that no longer exists public class RedeploymentEmulationTest { Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshallingTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshallingTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/RegionBasedMarshallingTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -4,7 +4,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "marshall.RegionBasedMarshallingTestBase") public abstract class RegionBasedMarshallingTestBase { protected static final String ADDRESS_CLASSNAME = "org.jboss.cache.marshall.data.Address"; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/RegionManagerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ /** * Test on ERegionManager class, from a marshalling perspective. */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "marshall.RegionManagerTest") public class RegionManagerTest { private final Fqn DEFAULT_REGION = Fqn.ROOT; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReplicateToInactiveRegionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/ReplicateToInactiveRegionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/ReplicateToInactiveRegionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; -@Test(groups = {"functional", "jgroups"}, sequential = true) +@Test(groups = {"functional", "jgroups"}, sequential = true, testName = "marshall.ReplicateToInactiveRegionTest") public class ReplicateToInactiveRegionTest { List<CacheSPI<Object, Object>> caches; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingMarshalledValuesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "marshall.ReturnValueMarshallingMarshalledValuesTest") public class ReturnValueMarshallingMarshalledValuesTest extends ReturnValueMarshallingTest { public ReturnValueMarshallingMarshalledValuesTest() Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/ReturnValueMarshallingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "jgroups"}, sequential = true) +@Test(groups = {"functional", "jgroups"}, sequential = true, testName = "marshall.ReturnValueMarshallingTest") public class ReturnValueMarshallingTest extends RegionBasedMarshallingTestBase { protected boolean useMarshalledValues = false; Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SimpleArrayReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/SimpleArrayReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/SimpleArrayReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -12,7 +12,7 @@ import java.util.Random; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = "functional") +@Test(groups = "functional", testName = "marshall.SimpleArrayReplTest") public class SimpleArrayReplTest { public void testArrayRepl() throws CloneNotSupportedException Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplMarshalledValuesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "marshall.SyncReplMarshalledValuesTest") public class SyncReplMarshalledValuesTest extends SyncReplTest { public SyncReplMarshalledValuesTest() Modified: core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/SyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -36,7 +36,7 @@ * @author Ben Wang * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}, sequential = true) +@Test(groups = {"functional", "jgroups"}, sequential = true, testName = "marshall.SyncReplTest") public class SyncReplTest extends RegionBasedMarshallingTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/marshall/UnmarshalledReferencesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/UnmarshalledReferencesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/UnmarshalledReferencesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,52 +1,52 @@ -package org.jboss.cache.marshall; - -import org.testng.annotations.Test; -import static org.testng.Assert.*; -import static org.testng.Assert.assertEquals; - -/** - * Tester for <code>UnmarshalledReferences</code>. - * - * @author Mircea.Markus(a)jboss.com - */ -@Test(groups = {"functional"}) -public class UnmarshalledReferencesTest -{ - public void testSimpleGetPut() - { - UnmarshalledReferences refs = new UnmarshalledReferences(); - for (int i = 0; i < 100; i++) - { - refs.putReferencedObject(i, String.valueOf(i)); - } - for (int i = 0; i < 100; i++) - { - assertEquals(refs.getReferencedObject(i), String.valueOf(i)); - } - } - - public void testPutWithGap() - { - UnmarshalledReferences refs = new UnmarshalledReferences(); - refs.putReferencedObject(0, "0"); - refs.putReferencedObject(2, "2"); - assertEquals(refs.getReferencedObject(0), "0"); - assertNull(refs.getReferencedObject(1)); - assertEquals(refs.getReferencedObject(2), "2"); - } - - public void testPutBefore() - { - UnmarshalledReferences refs = new UnmarshalledReferences(); - refs.putReferencedObject(2, "2"); - refs.putReferencedObject(3, "3"); - - //when adding this make sure other positions are not shifted - refs.putReferencedObject(1, "1"); - - assertNull(refs.getReferencedObject(0)); - assertEquals("1", refs.getReferencedObject(1)); - assertEquals("2", refs.getReferencedObject(2)); - assertEquals("3", refs.getReferencedObject(3)); - } -} +package org.jboss.cache.marshall; + +import org.testng.annotations.Test; +import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; + +/** + * Tester for <code>UnmarshalledReferences</code>. + * + * @author Mircea.Markus(a)jboss.com + */ +@Test(groups = {"functional"}, testName = "marshall.UnmarshalledReferencesTest") +public class UnmarshalledReferencesTest +{ + public void testSimpleGetPut() + { + UnmarshalledReferences refs = new UnmarshalledReferences(); + for (int i = 0; i < 100; i++) + { + refs.putReferencedObject(i, String.valueOf(i)); + } + for (int i = 0; i < 100; i++) + { + assertEquals(refs.getReferencedObject(i), String.valueOf(i)); + } + } + + public void testPutWithGap() + { + UnmarshalledReferences refs = new UnmarshalledReferences(); + refs.putReferencedObject(0, "0"); + refs.putReferencedObject(2, "2"); + assertEquals(refs.getReferencedObject(0), "0"); + assertNull(refs.getReferencedObject(1)); + assertEquals(refs.getReferencedObject(2), "2"); + } + + public void testPutBefore() + { + UnmarshalledReferences refs = new UnmarshalledReferences(); + refs.putReferencedObject(2, "2"); + refs.putReferencedObject(3, "3"); + + //when adding this make sure other positions are not shifted + refs.putReferencedObject(1, "1"); + + assertNull(refs.getReferencedObject(0)); + assertEquals("1", refs.getReferencedObject(1)); + assertEquals("2", refs.getReferencedObject(2)); + assertEquals("3", refs.getReferencedObject(3)); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,20 +24,19 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "marshall.VersionAwareMarshallerTest") public class VersionAwareMarshallerTest extends AbstractVersionAwareMarshallerTest { @BeforeMethod public void setUp() { - ComponentRegistry cr = new ComponentRegistry(new Configuration(), new CacheInvocationDelegate()); - crTL.set(cr); + this.cr = new ComponentRegistry(new Configuration(), new CacheInvocationDelegate()); } @AfterMethod public void tearDown() { - crTL.set(null); + cr = null; } public void testMarshallerSelection() Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/CacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/CacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/CacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ * @author Jerry Gauthier * @version $Id$ */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "mgmt.CacheLoaderTest") public class CacheLoaderTest extends MgmtTestBase { public void testCacheLoaderMgmt() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/InvalidationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * @author Jerry Gauthier * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "mgmt.InvalidationTest") public class InvalidationTest { private static final String CLUSTER_NAME = "InvalidationTestCluster"; Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtCoreTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtCoreTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtCoreTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * @author Jerry Gauthier * @version $Id$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "mgmt.MgmtCoreTest") public class MgmtCoreTest { private static final String CAPITAL = "capital"; Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/MgmtTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.util.TestingUtil; -@Test(groups = "functional") +@Test(groups = "functional", testName = "mgmt.MgmtTestBase") public abstract class MgmtTestBase { protected static final String CAPITAL = "capital"; Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/PassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/PassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/PassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ * @author Jerry Gauthier * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "mgmt.PassivationTest") public class PassivationTest extends MgmtTestBase { public PassivationTest() Modified: core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mgmt/TxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author Jerry Gauthier * @version $Id$ */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "mgmt.TxTest") public class TxTest { private static final String CLUSTER_NAME = "TxTestCluster"; Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/AsyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "multiplexer.AsyncReplTest") public class AsyncReplTest extends org.jboss.cache.replicated.AsyncReplTest { private ThreadLocal<MultiplexerTestHelper> muxHelperTL = new ThreadLocal<MultiplexerTestHelper>(); @@ -83,4 +83,4 @@ public void testStateTransfer() { super.testStateTransfer(); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BadMuxConfigTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}, enabled = true, sequential = true) +@Test(groups = {"functional", "jgroups"}, enabled = true, sequential = true, testName = "multiplexer.BadMuxConfigTest") public class BadMuxConfigTest { private MultiplexerTestHelper muxHelper; Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyAssignmentStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(enabled = true) +@Test(enabled = true, testName = "multiplexer.BuddyAssignmentStateTransferTest") public class BuddyAssignmentStateTransferTest extends org.jboss.cache.buddyreplication.BuddyAssignmentStateTransferTest { Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyBackupActivationInactivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(enabled = true) +@Test(enabled = true, testName = "multiplexer.BuddyBackupActivationInactivationTest") public class BuddyBackupActivationInactivationTest extends org.jboss.cache.buddyreplication.BuddyBackupActivationInactivationTest { Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyGroupAssignmentTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(enabled = true) +@Test(enabled = true, testName = "multiplexer.BuddyGroupAssignmentTest") public class BuddyGroupAssignmentTest extends org.jboss.cache.buddyreplication.BuddyGroupAssignmentTest { private MultiplexerTestHelper muxHelper; Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -34,7 +34,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups={"functional", "jgroups"}, enabled = true) +@Test(groups={"functional", "jgroups"}, enabled = true, testName = "multiplexer.BuddyReplicationFailoverTest") public class BuddyReplicationFailoverTest extends org.jboss.cache.buddyreplication.BuddyReplicationFailoverTest { Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}, enabled = true, sequential = true) +@Test(groups = {"functional", "jgroups"}, enabled = true, sequential = true, testName = "multiplexer.ChannelInjectionPreferenceTest") public class ChannelInjectionPreferenceTest { private MultiplexerTestHelper muxHelper; Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/PessimisticSyncReplTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/PessimisticSyncReplTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/PessimisticSyncReplTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}, enabled = true) +@Test(groups = {"functional", "jgroups"}, enabled = true, testName = "multiplexer.PessimisticSyncReplTxTest") public class PessimisticSyncReplTxTest extends org.jboss.cache.replicated.PessimisticSyncReplTxTest { private MultiplexerTestHelper muxHelper; Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/multiplexer/StateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -34,7 +34,7 @@ * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}, enabled = true) +@Test(groups = {"functional", "jgroups"}, testName = "multiplexer.StateTransferTest") public class StateTransferTest extends StateTransfer200Test { private ThreadLocal<MultiplexerTestHelper> muxHelperTL = new ThreadLocal<MultiplexerTestHelper>(); Modified: core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/mvcc/MVCCFullStackTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 3.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "mvcc.MVCCFullStackTest") public class MVCCFullStackTest { CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/AsyncNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/AsyncNotificationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/AsyncNotificationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import java.util.concurrent.CountDownLatch; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = "functional") +@Test(groups = "functional", testName = "notifications.AsyncNotificationTest") public class AsyncNotificationTest { public void testAsyncNotification() throws InterruptedException Modified: core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "notifications.BuddyGroupChangeNotificationTest") public class BuddyGroupChangeNotificationTest extends BuddyReplicationTestsBase { Cache c1, c2, c3; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "notifications.CacheListenerOptimisticTest") public class CacheListenerOptimisticTest extends CacheListenerTest { public CacheListenerOptimisticTest() Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ import java.util.Map; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "notifications.CacheListenerPassivationTest") public class CacheListenerPassivationTest { private Cache<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -39,7 +39,7 @@ * * @since 2.0.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "notifications.CacheListenerTest") public class CacheListenerTest { protected boolean optLocking = false; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "notifications.ConcurrentNotificationTest") public class ConcurrentNotificationTest { private Cache<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NodeMapDiffTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "notifications.NodeMapDiffTest") public class NodeMapDiffTest { public void testDataAdded() Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,6 +20,7 @@ import javax.transaction.TransactionManager; import java.util.LinkedList; import java.util.List; +import java.util.Properties; /** * Tests the threading model used when calling notifications @@ -27,7 +28,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "notifications.NotificationThreadTest") public class NotificationThreadTest extends AbstractCacheLoaderTestBase { private Cache<String, String> cache1, cache2; @@ -51,7 +52,7 @@ conf2.setSyncRollbackPhase(true); conf1.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); conf2.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); - conf1.setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummyInMemoryCacheLoader.class.getName(), null, false, false, false)); + conf1.setCacheLoaderConfig(getSingleCacheLoaderConfig("", DummyInMemoryCacheLoader.class.getName(), (Properties)null, false, false, false)); cache1 = instance.createCache(conf1, false); cache2 = instance.createCache(conf2, false); @@ -227,4 +228,4 @@ } } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NotifierAnnotationsTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "notifications.NotifierAnnotationsTest") public class NotifierAnnotationsTest { private NotifierImpl n; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotifierTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NotifierTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NotifierTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,357 +1,357 @@ -package org.jboss.cache.notifications; - -import static org.easymock.EasyMock.*; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.InvocationContext; -import org.jboss.cache.buddyreplication.BuddyGroup; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.invocation.MVCCInvocationContext; -import org.jboss.cache.notifications.annotation.*; -import org.jboss.cache.notifications.event.*; -import org.jgroups.View; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import javax.transaction.Transaction; -import java.util.HashMap; -import java.util.Map; - -/** - * Tester class for {@link org.jboss.cache.notifications.NotifierImpl}. - * - * @author Mircea.Markus(a)jboss.com - * @since 2.2 - */ -@Test(groups = "unit", sequential = true) -public class NotifierTest -{ - private NotifierImpl notifier; - private InvocationContext ctx; - private AllEventsListener allEventsListener; - private Fqn fqn = Fqn.fromString("/a/b/c"); - - @BeforeMethod - public void setUp() - { - notifier = new NotifierImpl(); - CacheSPI cacheSPI = createNiceMock(CacheSPI.class); - expect(cacheSPI.getInvocationContext()).andStubReturn(new MVCCInvocationContext()); - replay(cacheSPI); - notifier.injectDependencies(cacheSPI, new Configuration()); - notifier.start(); - ctx = new MVCCInvocationContext(); - allEventsListener = new AllEventsListener(); - notifier.addCacheListener(allEventsListener); - } - - @AfterMethod - public void tearDown() - { - notifier.stop(); - notifier.destroy(); - notifier = null; - } - - public void testNotifyNodeCreated() - { - assert allEventsListener.nodeCreatedEvent == null; - notifier.notifyNodeCreated(fqn, true, ctx); - assert allEventsListener.nodeCreatedEvent != null; - assert allEventsListener.nodeCreatedEvent.getType() == Event.Type.NODE_CREATED; - } - - - public void testShouldNotifyOnNodeModified() - { - assert notifier.shouldNotifyOnNodeModified(); - notifier.destroy(); - assert !notifier.shouldNotifyOnNodeModified(); - } - - public void testNotifyNodeModified() - { - assert allEventsListener.nodeModifiedEvent == null; - Map<String, String> expected = new HashMap<String, String>(); - expected.put("k", "v"); - notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, expected, ctx); - assert allEventsListener.nodeModifiedEvent != null; - assert allEventsListener.nodeModifiedEvent.getData().equals(expected); - assert allEventsListener.nodeModifiedEvent.getModificationType() == NodeModifiedEvent.ModificationType.PUT_DATA; - } - - public void testNotifyNodeRemoved() - { - assert allEventsListener.nodeRemoveEvent == null; - Map<String, String> data = new HashMap<String, String>(); - data.put("k", "v"); - notifier.notifyNodeRemoved(fqn, true, data, ctx); - assert allEventsListener.nodeRemoveEvent != null; - assert allEventsListener.nodeRemoveEvent.getData().equals(data); - assert allEventsListener.nodeRemoveEvent.getType() == Event.Type.NODE_REMOVED; - } - - public void testNotifyNodeVisited() - { - assert allEventsListener.nodeVisistedEvent == null; - notifier.notifyNodeVisited(fqn, true, ctx); - assert allEventsListener.nodeVisistedEvent != null; - assert allEventsListener.nodeVisistedEvent.getType() == Event.Type.NODE_VISITED; - } - - public void testNotifyNodeMoved() - { - assert allEventsListener.nodeMovedEvent == null; - Fqn second = Fqn.fromString("/a/s/f"); - notifier.notifyNodeMoved(fqn, second, true, ctx); - assert allEventsListener.nodeMovedEvent != null; - assert allEventsListener.nodeMovedEvent.getFqn().equals(fqn); - assert allEventsListener.nodeMovedEvent.getTargetFqn().equals(second); - assert allEventsListener.nodeMovedEvent.getType() == Event.Type.NODE_MOVED; - } - - public void testNotifyNodeEvicted() - { - assert allEventsListener.nodeEvictedEvent == null; - notifier.notifyNodeEvicted(fqn, true, ctx); - assert allEventsListener.nodeEvictedEvent != null; - assert allEventsListener.nodeEvictedEvent.getFqn().equals(fqn); - assert allEventsListener.nodeEvictedEvent.getType() == Event.Type.NODE_EVICTED; - } - - public void testNotifyNodeLoaded() - { - assert allEventsListener.nodeLoadedEvent == null; - Map<String, String> expected = new HashMap<String, String>(); - expected.put("key", "value"); - notifier.notifyNodeLoaded(fqn, true, expected, ctx); - assert allEventsListener.nodeLoadedEvent != null; - assert allEventsListener.nodeLoadedEvent.getFqn().equals(fqn); - assert allEventsListener.nodeLoadedEvent.getData().equals(expected); - assert allEventsListener.nodeLoadedEvent.getType() == Event.Type.NODE_LOADED; - } - - public void testNotifyNodeActivated() - { - assert allEventsListener.nodeActivatedEvent == null; - Map<String, String> expected = new HashMap<String, String>(); - expected.put("key", "value"); - notifier.notifyNodeActivated(fqn, true, expected, ctx); - assert allEventsListener.nodeActivatedEvent != null; - assert allEventsListener.nodeActivatedEvent.getFqn().equals(fqn); - assert allEventsListener.nodeActivatedEvent.getData().equals(expected); - assert allEventsListener.nodeActivatedEvent.getType() == Event.Type.NODE_ACTIVATED; - } - - public void testNotifyNodePassivated() - { - assert allEventsListener.nodePassivatedEvent == null; - Map<String, String> expected = new HashMap<String, String>(); - expected.put("key", "value"); - notifier.notifyNodePassivated(fqn, true, expected, ctx); - assert allEventsListener.nodePassivatedEvent != null; - assert allEventsListener.nodePassivatedEvent.getFqn().equals(fqn); - assert allEventsListener.nodePassivatedEvent.getData().equals(expected); - assert allEventsListener.nodePassivatedEvent.getType() == Event.Type.NODE_PASSIVATED; - } - - public void testNotifyCacheStarted() - { - assert allEventsListener.cacheStartedEvent == null; - notifier.notifyCacheStarted(); - assert allEventsListener.cacheStartedEvent != null; - assert allEventsListener.cacheStartedEvent.getType() == Event.Type.CACHE_STARTED; - } - - public void testNotifyCacheStopped() - { - assert allEventsListener.cacheStoppedEvent == null; - notifier.notifyCacheStopped(); - assert allEventsListener.cacheStoppedEvent != null; - assert allEventsListener.cacheStoppedEvent.getType() == Event.Type.CACHE_STOPPED; - } - - public void testNotifyViewChange() - { - assert allEventsListener.viewChanged == null; - View view = new View(); - notifier.notifyViewChange(view, ctx); - assert allEventsListener.viewChanged != null; - assert allEventsListener.viewChanged.getNewView().equals(view); - assert allEventsListener.viewChanged.getType() == Event.Type.VIEW_CHANGED; - } - - public void testNotifyBuddyGroupChange() - { - assert allEventsListener.buddyGroupChangedEvent == null; - BuddyGroup buddyGroup = new BuddyGroup(); - notifier.notifyBuddyGroupChange(buddyGroup, true); - assert allEventsListener.buddyGroupChangedEvent != null; - assert allEventsListener.buddyGroupChangedEvent.getBuddyGroup().equals(buddyGroup); - assert allEventsListener.buddyGroupChangedEvent.getType() == Event.Type.BUDDY_GROUP_CHANGED; - } - - public void testNotifyTransactionCompleted() - { - assert allEventsListener.transactionCompleted == null; - Transaction tx = createNiceMock(Transaction.class); - notifier.notifyTransactionCompleted(tx, false, ctx); - assert allEventsListener.transactionCompleted != null; - assert allEventsListener.transactionCompleted.getTransaction() == tx; - assert !allEventsListener.transactionCompleted.isSuccessful(); - assert allEventsListener.transactionCompleted.getType() == Event.Type.TRANSACTION_COMPLETED; - } - - public void testNotifyTransactionRegistered() - { - assert allEventsListener.transactionRegistered == null; - Transaction tx = createNiceMock(Transaction.class); - notifier.notifyTransactionRegistered(tx, ctx); - assert allEventsListener.transactionRegistered != null; - assert allEventsListener.transactionRegistered.getTransaction() == tx; - assert allEventsListener.transactionRegistered.getType() == Event.Type.TRANSACTION_REGISTERED; - } - - public void testNotifyCacheBlocked() - { - assert allEventsListener.cacheBlockedEvent == null; - notifier.notifyCacheBlocked(false); - assert allEventsListener.cacheBlockedEvent != null; - assert !allEventsListener.cacheBlockedEvent.isPre(); - assert allEventsListener.cacheBlockedEvent.getType() == Event.Type.CACHE_BLOCKED; - } - - public void testNotifyCacheUnblocked() - { - assert allEventsListener.cacheUnblockedEvent == null; - notifier.notifyCacheUnblocked(false); - assert allEventsListener.cacheUnblockedEvent != null; - assert !allEventsListener.cacheUnblockedEvent.isPre(); - assert allEventsListener.cacheUnblockedEvent.getType() == Event.Type.CACHE_UNBLOCKED; - } - - @CacheListener - public static class AllEventsListener - { - CacheStartedEvent cacheStartedEvent; - CacheStoppedEvent cacheStoppedEvent; - CacheBlockedEvent cacheBlockedEvent; - CacheUnblockedEvent cacheUnblockedEvent; - NodeCreatedEvent nodeCreatedEvent; - NodeRemovedEvent nodeRemoveEvent; - NodeVisitedEvent nodeVisistedEvent; - NodeModifiedEvent nodeModifiedEvent; - NodeMovedEvent nodeMovedEvent; - NodeActivatedEvent nodeActivatedEvent; - NodePassivatedEvent nodePassivatedEvent; - NodeLoadedEvent nodeLoadedEvent; - NodeEvictedEvent nodeEvictedEvent; - TransactionRegisteredEvent transactionRegistered; - TransactionCompletedEvent transactionCompleted; - ViewChangedEvent viewChanged; - BuddyGroupChangedEvent buddyGroupChangedEvent; - - @CacheStarted - public void onCacheStarted(CacheStartedEvent event) - { - cacheStartedEvent = event; - } - - @CacheStopped - public void onCacheStopped(CacheStoppedEvent event) - { - cacheStoppedEvent = event; - } - - @CacheBlocked - public void onCacheBlocked(CacheBlockedEvent event) - { - cacheBlockedEvent = event; - } - - @CacheUnblocked - public void onCacheUnblocked(CacheUnblockedEvent event) - { - cacheUnblockedEvent = event; - } - - @NodeCreated - public void onNodeCreated(NodeCreatedEvent event) - { - nodeCreatedEvent = event; - } - - @NodeRemoved - public void onNodeRemoved(NodeRemovedEvent event) - { - nodeRemoveEvent = event; - } - - @NodeVisited - public void onNodeVisited(NodeVisitedEvent event) - { - nodeVisistedEvent = event; - } - - @NodeModified - public void onNodeModified(NodeModifiedEvent event) - { - nodeModifiedEvent = event; - } - - @NodeMoved - public void onNodeMoved(NodeMovedEvent event) - { - nodeMovedEvent = event; - } - - @NodeActivated - public void onNodeActivated(NodeActivatedEvent event) - { - nodeActivatedEvent = event; - } - - @NodePassivated - public void onNodePassivated(NodePassivatedEvent event) - { - nodePassivatedEvent = event; - } - - @NodeLoaded - public void onNodeLoaded(NodeLoadedEvent event) - { - nodeLoadedEvent = event; - } - - @NodeEvicted - public void onNodeEvicted(NodeEvictedEvent event) - { - nodeEvictedEvent = event; - } - - @TransactionRegistered - public void onTransactionRegistered(TransactionRegisteredEvent event) - { - transactionRegistered = event; - } - - @TransactionCompleted - public void onTransactionCompleted(TransactionCompletedEvent event) - { - transactionCompleted = event; - } - - @ViewChanged - public void onViewChanged(ViewChangedEvent event) - { - viewChanged = event; - } - - @BuddyGroupChanged - public void onBuddyGroupChanged(BuddyGroupChangedEvent event) - { - buddyGroupChangedEvent = event; - } - } -} +package org.jboss.cache.notifications; + +import static org.easymock.EasyMock.*; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.Fqn; +import org.jboss.cache.InvocationContext; +import org.jboss.cache.buddyreplication.BuddyGroup; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.invocation.MVCCInvocationContext; +import org.jboss.cache.notifications.annotation.*; +import org.jboss.cache.notifications.event.*; +import org.jgroups.View; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import javax.transaction.Transaction; +import java.util.HashMap; +import java.util.Map; + +/** + * Tester class for {@link org.jboss.cache.notifications.NotifierImpl}. + * + * @author Mircea.Markus(a)jboss.com + * @since 2.2 + */ +@Test(groups = "unit", sequential = true, testName = "notifications.NotifierTest") +public class NotifierTest +{ + private NotifierImpl notifier; + private InvocationContext ctx; + private AllEventsListener allEventsListener; + private Fqn fqn = Fqn.fromString("/a/b/c"); + + @BeforeMethod + public void setUp() + { + notifier = new NotifierImpl(); + CacheSPI cacheSPI = createNiceMock(CacheSPI.class); + expect(cacheSPI.getInvocationContext()).andStubReturn(new MVCCInvocationContext()); + replay(cacheSPI); + notifier.injectDependencies(cacheSPI, new Configuration()); + notifier.start(); + ctx = new MVCCInvocationContext(); + allEventsListener = new AllEventsListener(); + notifier.addCacheListener(allEventsListener); + } + + @AfterMethod + public void tearDown() + { + notifier.stop(); + notifier.destroy(); + notifier = null; + } + + public void testNotifyNodeCreated() + { + assert allEventsListener.nodeCreatedEvent == null; + notifier.notifyNodeCreated(fqn, true, ctx); + assert allEventsListener.nodeCreatedEvent != null; + assert allEventsListener.nodeCreatedEvent.getType() == Event.Type.NODE_CREATED; + } + + + public void testShouldNotifyOnNodeModified() + { + assert notifier.shouldNotifyOnNodeModified(); + notifier.destroy(); + assert !notifier.shouldNotifyOnNodeModified(); + } + + public void testNotifyNodeModified() + { + assert allEventsListener.nodeModifiedEvent == null; + Map<String, String> expected = new HashMap<String, String>(); + expected.put("k", "v"); + notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, expected, ctx); + assert allEventsListener.nodeModifiedEvent != null; + assert allEventsListener.nodeModifiedEvent.getData().equals(expected); + assert allEventsListener.nodeModifiedEvent.getModificationType() == NodeModifiedEvent.ModificationType.PUT_DATA; + } + + public void testNotifyNodeRemoved() + { + assert allEventsListener.nodeRemoveEvent == null; + Map<String, String> data = new HashMap<String, String>(); + data.put("k", "v"); + notifier.notifyNodeRemoved(fqn, true, data, ctx); + assert allEventsListener.nodeRemoveEvent != null; + assert allEventsListener.nodeRemoveEvent.getData().equals(data); + assert allEventsListener.nodeRemoveEvent.getType() == Event.Type.NODE_REMOVED; + } + + public void testNotifyNodeVisited() + { + assert allEventsListener.nodeVisistedEvent == null; + notifier.notifyNodeVisited(fqn, true, ctx); + assert allEventsListener.nodeVisistedEvent != null; + assert allEventsListener.nodeVisistedEvent.getType() == Event.Type.NODE_VISITED; + } + + public void testNotifyNodeMoved() + { + assert allEventsListener.nodeMovedEvent == null; + Fqn second = Fqn.fromString("/a/s/f"); + notifier.notifyNodeMoved(fqn, second, true, ctx); + assert allEventsListener.nodeMovedEvent != null; + assert allEventsListener.nodeMovedEvent.getFqn().equals(fqn); + assert allEventsListener.nodeMovedEvent.getTargetFqn().equals(second); + assert allEventsListener.nodeMovedEvent.getType() == Event.Type.NODE_MOVED; + } + + public void testNotifyNodeEvicted() + { + assert allEventsListener.nodeEvictedEvent == null; + notifier.notifyNodeEvicted(fqn, true, ctx); + assert allEventsListener.nodeEvictedEvent != null; + assert allEventsListener.nodeEvictedEvent.getFqn().equals(fqn); + assert allEventsListener.nodeEvictedEvent.getType() == Event.Type.NODE_EVICTED; + } + + public void testNotifyNodeLoaded() + { + assert allEventsListener.nodeLoadedEvent == null; + Map<String, String> expected = new HashMap<String, String>(); + expected.put("key", "value"); + notifier.notifyNodeLoaded(fqn, true, expected, ctx); + assert allEventsListener.nodeLoadedEvent != null; + assert allEventsListener.nodeLoadedEvent.getFqn().equals(fqn); + assert allEventsListener.nodeLoadedEvent.getData().equals(expected); + assert allEventsListener.nodeLoadedEvent.getType() == Event.Type.NODE_LOADED; + } + + public void testNotifyNodeActivated() + { + assert allEventsListener.nodeActivatedEvent == null; + Map<String, String> expected = new HashMap<String, String>(); + expected.put("key", "value"); + notifier.notifyNodeActivated(fqn, true, expected, ctx); + assert allEventsListener.nodeActivatedEvent != null; + assert allEventsListener.nodeActivatedEvent.getFqn().equals(fqn); + assert allEventsListener.nodeActivatedEvent.getData().equals(expected); + assert allEventsListener.nodeActivatedEvent.getType() == Event.Type.NODE_ACTIVATED; + } + + public void testNotifyNodePassivated() + { + assert allEventsListener.nodePassivatedEvent == null; + Map<String, String> expected = new HashMap<String, String>(); + expected.put("key", "value"); + notifier.notifyNodePassivated(fqn, true, expected, ctx); + assert allEventsListener.nodePassivatedEvent != null; + assert allEventsListener.nodePassivatedEvent.getFqn().equals(fqn); + assert allEventsListener.nodePassivatedEvent.getData().equals(expected); + assert allEventsListener.nodePassivatedEvent.getType() == Event.Type.NODE_PASSIVATED; + } + + public void testNotifyCacheStarted() + { + assert allEventsListener.cacheStartedEvent == null; + notifier.notifyCacheStarted(); + assert allEventsListener.cacheStartedEvent != null; + assert allEventsListener.cacheStartedEvent.getType() == Event.Type.CACHE_STARTED; + } + + public void testNotifyCacheStopped() + { + assert allEventsListener.cacheStoppedEvent == null; + notifier.notifyCacheStopped(); + assert allEventsListener.cacheStoppedEvent != null; + assert allEventsListener.cacheStoppedEvent.getType() == Event.Type.CACHE_STOPPED; + } + + public void testNotifyViewChange() + { + assert allEventsListener.viewChanged == null; + View view = new View(); + notifier.notifyViewChange(view, ctx); + assert allEventsListener.viewChanged != null; + assert allEventsListener.viewChanged.getNewView().equals(view); + assert allEventsListener.viewChanged.getType() == Event.Type.VIEW_CHANGED; + } + + public void testNotifyBuddyGroupChange() + { + assert allEventsListener.buddyGroupChangedEvent == null; + BuddyGroup buddyGroup = new BuddyGroup(); + notifier.notifyBuddyGroupChange(buddyGroup, true); + assert allEventsListener.buddyGroupChangedEvent != null; + assert allEventsListener.buddyGroupChangedEvent.getBuddyGroup().equals(buddyGroup); + assert allEventsListener.buddyGroupChangedEvent.getType() == Event.Type.BUDDY_GROUP_CHANGED; + } + + public void testNotifyTransactionCompleted() + { + assert allEventsListener.transactionCompleted == null; + Transaction tx = createNiceMock(Transaction.class); + notifier.notifyTransactionCompleted(tx, false, ctx); + assert allEventsListener.transactionCompleted != null; + assert allEventsListener.transactionCompleted.getTransaction() == tx; + assert !allEventsListener.transactionCompleted.isSuccessful(); + assert allEventsListener.transactionCompleted.getType() == Event.Type.TRANSACTION_COMPLETED; + } + + public void testNotifyTransactionRegistered() + { + assert allEventsListener.transactionRegistered == null; + Transaction tx = createNiceMock(Transaction.class); + notifier.notifyTransactionRegistered(tx, ctx); + assert allEventsListener.transactionRegistered != null; + assert allEventsListener.transactionRegistered.getTransaction() == tx; + assert allEventsListener.transactionRegistered.getType() == Event.Type.TRANSACTION_REGISTERED; + } + + public void testNotifyCacheBlocked() + { + assert allEventsListener.cacheBlockedEvent == null; + notifier.notifyCacheBlocked(false); + assert allEventsListener.cacheBlockedEvent != null; + assert !allEventsListener.cacheBlockedEvent.isPre(); + assert allEventsListener.cacheBlockedEvent.getType() == Event.Type.CACHE_BLOCKED; + } + + public void testNotifyCacheUnblocked() + { + assert allEventsListener.cacheUnblockedEvent == null; + notifier.notifyCacheUnblocked(false); + assert allEventsListener.cacheUnblockedEvent != null; + assert !allEventsListener.cacheUnblockedEvent.isPre(); + assert allEventsListener.cacheUnblockedEvent.getType() == Event.Type.CACHE_UNBLOCKED; + } + + @CacheListener + public static class AllEventsListener + { + CacheStartedEvent cacheStartedEvent; + CacheStoppedEvent cacheStoppedEvent; + CacheBlockedEvent cacheBlockedEvent; + CacheUnblockedEvent cacheUnblockedEvent; + NodeCreatedEvent nodeCreatedEvent; + NodeRemovedEvent nodeRemoveEvent; + NodeVisitedEvent nodeVisistedEvent; + NodeModifiedEvent nodeModifiedEvent; + NodeMovedEvent nodeMovedEvent; + NodeActivatedEvent nodeActivatedEvent; + NodePassivatedEvent nodePassivatedEvent; + NodeLoadedEvent nodeLoadedEvent; + NodeEvictedEvent nodeEvictedEvent; + TransactionRegisteredEvent transactionRegistered; + TransactionCompletedEvent transactionCompleted; + ViewChangedEvent viewChanged; + BuddyGroupChangedEvent buddyGroupChangedEvent; + + @CacheStarted + public void onCacheStarted(CacheStartedEvent event) + { + cacheStartedEvent = event; + } + + @CacheStopped + public void onCacheStopped(CacheStoppedEvent event) + { + cacheStoppedEvent = event; + } + + @CacheBlocked + public void onCacheBlocked(CacheBlockedEvent event) + { + cacheBlockedEvent = event; + } + + @CacheUnblocked + public void onCacheUnblocked(CacheUnblockedEvent event) + { + cacheUnblockedEvent = event; + } + + @NodeCreated + public void onNodeCreated(NodeCreatedEvent event) + { + nodeCreatedEvent = event; + } + + @NodeRemoved + public void onNodeRemoved(NodeRemovedEvent event) + { + nodeRemoveEvent = event; + } + + @NodeVisited + public void onNodeVisited(NodeVisitedEvent event) + { + nodeVisistedEvent = event; + } + + @NodeModified + public void onNodeModified(NodeModifiedEvent event) + { + nodeModifiedEvent = event; + } + + @NodeMoved + public void onNodeMoved(NodeMovedEvent event) + { + nodeMovedEvent = event; + } + + @NodeActivated + public void onNodeActivated(NodeActivatedEvent event) + { + nodeActivatedEvent = event; + } + + @NodePassivated + public void onNodePassivated(NodePassivatedEvent event) + { + nodePassivatedEvent = event; + } + + @NodeLoaded + public void onNodeLoaded(NodeLoadedEvent event) + { + nodeLoadedEvent = event; + } + + @NodeEvicted + public void onNodeEvicted(NodeEvictedEvent event) + { + nodeEvictedEvent = event; + } + + @TransactionRegistered + public void onTransactionRegistered(TransactionRegisteredEvent event) + { + transactionRegistered = event; + } + + @TransactionCompleted + public void onTransactionCompleted(TransactionCompletedEvent event) + { + transactionCompleted = event; + } + + @ViewChanged + public void onViewChanged(ViewChangedEvent event) + { + viewChanged = event; + } + + @BuddyGroupChanged + public void onBuddyGroupChanged(BuddyGroupChangedEvent event) + { + buddyGroupChangedEvent = event; + } + } +} Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/NotifyNodeInvalidatedTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ import java.util.List; import org.jboss.cache.UnitTestCacheFactory; -@Test(groups = "functional") +@Test(groups = "functional", testName = "notifications.NotifyNodeInvalidatedTest") public class NotifyNodeInvalidatedTest { public void testInvalidatedCallback() throws CloneNotSupportedException Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerOptimisticTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "notifications.RemoteCacheListenerOptimisticTest") public class RemoteCacheListenerOptimisticTest extends RemoteCacheListenerTest { public RemoteCacheListenerOptimisticTest() @@ -22,4 +22,4 @@ // no op } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -56,7 +56,7 @@ * * @since 2.0.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "notifications.RemoteCacheListenerTest") public class RemoteCacheListenerTest { protected boolean optLocking = false; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -45,7 +45,7 @@ /** * @author manik */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "optimistic.AbstractOptimisticTestCase") public class AbstractOptimisticTestCase { // some test data shared among all the test cases @@ -98,7 +98,12 @@ protected CacheLoaderConfig getCacheLoaderConfig(boolean shared, boolean passivation) throws Exception { String cacheLoaderClass = shared ? DummySharedInMemoryCacheLoader.class.getName() : DummyInMemoryCacheLoader.class.getName(); - return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(passivation, null, cacheLoaderClass, "", false, (!shared), shared, false, false); + String props = ""; + if (shared) + { + props = "bin = " + getClass().getName(); + } + return UnitTestCacheConfigurationFactory.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/AsyncCacheTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncCacheTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -18,7 +18,7 @@ import javax.transaction.Transaction; import javax.transaction.TransactionManager; -@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true) +@Test(groups = {"functional", "transaction", "optimistic"}, testName = "optimistic.AsyncCacheTest") public class AsyncCacheTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/AsyncFullStackInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true) +@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true, testName = "optimistic.AsyncFullStackInterceptorTest") public class AsyncFullStackInterceptorTest extends AbstractOptimisticTestCase { private int groupIncreaser = 0; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/CacheTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,7 @@ import java.util.concurrent.CountDownLatch; -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.CacheTest") public class CacheTest extends AbstractOptimisticTestCase { Log log = LogFactory.getLog(CacheTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ChildMapLazyLoadingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ChildMapLazyLoadingTest") public class ChildMapLazyLoadingTest { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ConcurrentTransactionTest") public class ConcurrentTransactionTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionPersistenceTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.DataVersionPersistenceTest") public class DataVersionPersistenceTest { private Cache cache; @@ -39,7 +39,7 @@ CacheLoaderConfig clc = new CacheLoaderConfig(); CacheLoaderConfig.IndividualCacheLoaderConfig iclc = new CacheLoaderConfig.IndividualCacheLoaderConfig(); - iclc.setProperties("debug=true"); + iclc.setProperties("debug=true \n bin=" + getClass()); iclc.setClassName(DummySharedInMemoryCacheLoader.class.getName()); clc.addIndividualCacheLoaderConfig(iclc); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/DataVersionTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.DataVersionTransferTest") public class DataVersionTransferTest { private List<Cache<Object, Object>> caches = null; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -22,7 +22,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.FullStackInterceptorTest") public class FullStackInterceptorTest extends AbstractOptimisticTestCase { Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/HasChildTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -17,7 +17,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.HasChildTest") public class HasChildTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/LockParentVersionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,7 +6,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "optimistic"}) +@Test(groups = {"functional", "optimistic"}, testName = "optimistic.LockParentVersionTest") public class LockParentVersionTest extends ParentVersionTest { public LockParentVersionTest() Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorGetChildrenNamesTest") public class NodeInterceptorGetChildrenNamesTest extends AbstractOptimisticTestCase { TestListener listener; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorGetKeyValTest") public class NodeInterceptorGetKeyValTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorGetKeysTest") public class NodeInterceptorGetKeysTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorKeyValTest") public class NodeInterceptorKeyValTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorPutEraseTest") public class NodeInterceptorPutEraseTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorPutMapTest") public class NodeInterceptorPutMapTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorRemoveDataTest") public class NodeInterceptorRemoveDataTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, testName = "optimistic.NodeInterceptorRemoveKeyValTest") public class NodeInterceptorRemoveKeyValTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorRemoveNodeTest") @SuppressWarnings("unchecked") public class NodeInterceptorRemoveNodeTest extends AbstractOptimisticTestCase { Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.NodeInterceptorTransactionTest") public class NodeInterceptorTransactionTest extends AbstractOptimisticTestCase { CacheSPI cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,7 +29,7 @@ * @author xenephon */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.OptimisticCreateIfNotExistsInterceptorTest") public class OptimisticCreateIfNotExistsInterceptorTest extends AbstractOptimisticTestCase { protected TransactionManager txManager; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticLockInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.OptimisticLockInterceptorTest") public class OptimisticLockInterceptorTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticVersioningTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,7 +29,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ @SuppressWarnings("unchecked") -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.OptimisticVersioningTest") public class OptimisticVersioningTest extends AbstractOptimisticTestCase { private static final Log log = LogFactory.getLog(OptimisticVersioningTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) */ -@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true) +@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true, testName = "optimistic.OptimisticWithCacheLoaderTest") public class OptimisticWithCacheLoaderTest extends AbstractOptimisticTestCase { Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/OptimisticWithPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.OptimisticWithPassivationTest") public class OptimisticWithPassivationTest extends AbstractOptimisticTestCase { protected CacheLoaderConfig getCacheLoaderConfig() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ParentVersionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ParentVersionTest") public class ParentVersionTest extends AbstractOptimisticTestCase { private Cache<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/PersistingTransientStateTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/PersistingTransientStateTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/PersistingTransientStateTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -3,7 +3,7 @@ import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "optimistic.PersistingTransientStateTest") public class PersistingTransientStateTest extends org.jboss.cache.statetransfer.PersistingTransientStateTest { public PersistingTransientStateTest() Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/RemoveBeforeCreateTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ /** * Tests removal of a node before the node is even created. */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.RemoveBeforeCreateTest") public class RemoveBeforeCreateTest extends AbstractOptimisticTestCase { CacheSPI<Object, Object>[] c = null; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedCacheAccessTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ThreadedCacheAccessTest") public class ThreadedCacheAccessTest extends AbstractOptimisticTestCase { private static final Log log = LogFactory.getLog(ThreadedCacheAccessTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ThreadedOptimisticCreateIfNotExistsInterceptorTest") public class ThreadedOptimisticCreateIfNotExistsInterceptorTest extends AbstractOptimisticTestCase { protected synchronized void setTransactionsInInvocationCtx(TransactionManager mgr, CacheSPI cache) throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/TxInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ import javax.transaction.TransactionManager; import java.util.List; -@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true) +@Test(groups = {"functional", "transaction", "optimistic"}, sequential = true, testName = "optimistic.TxInterceptorTest") public class TxInterceptorTest extends AbstractOptimisticTestCase { @Override Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidationFailureTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ValidationFailureTest") public class ValidationFailureTest extends AbstractOptimisticTestCase { public void testValidationFailureLockRelease() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/ValidatorInterceptorTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -40,7 +40,7 @@ /** * @author xenephon */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.ValidatorInterceptorTest") public class ValidatorInterceptorTest extends AbstractOptimisticTestCase { private CacheSPI<Object, Object> cache; Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/optimistic/VersioningOnReadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "optimistic.VersioningOnReadTest") public class VersioningOnReadTest extends AbstractOptimisticTestCase { CacheSPI cache; Modified: core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/CacheModeLocalSimpleTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "options.CacheModeLocalSimpleTest") public class CacheModeLocalSimpleTest { private CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, sequential = true, testName = "options.ExplicitVersionsReplTest") public class ExplicitVersionsReplTest { private CacheSPI<Object, Object> cache[]; Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "optimistic"}, sequential = true) +@Test(groups = {"functional", "optimistic"}, testName = "options.ExplicitVersionsTest") public class ExplicitVersionsTest { private CacheSPI<String, String> cache; @@ -202,4 +202,4 @@ assertEquals(vChild, cache.getNode("/parent/child").getVersion()); } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/ForceCacheModeTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -36,7 +36,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true, enabled = false) +@Test(groups = {"functional"}, sequential = true, enabled = false, testName = "options.ForceCacheModeTest") public class ForceCacheModeTest { private static final Log log = LogFactory.getLog(ForceCacheModeTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "pessimistic"}, sequential = true) +@Test(groups = {"functional", "pessimistic"}, sequential = true, testName = "options.ForceWriteLockTest") public class ForceWriteLockTest { protected CacheSPI<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "options.PessimisticFailSilentlyTest") public class PessimisticFailSilentlyTest { private CacheSPI cache; Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticLockAcquisitionTimeoutTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/PessimisticLockAcquisitionTimeoutTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticLockAcquisitionTimeoutTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author Brian Stansberry */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "options.PessimisticLockAcquisitionTimeoutTest") public class PessimisticLockAcquisitionTimeoutTest { private static final Log log = LogFactory.getLog(PessimisticLockAcquisitionTimeoutTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "options.PessimisticSuppressLockingTest") public class PessimisticSuppressLockingTest { private Fqn fqn = Fqn.fromString("/blah"); Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationOptLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationOptLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationOptLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,9 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.util.TestingUtil; +import org.testng.annotations.Test; +@Test (groups = "functional", testName = "cachemodelocal.AsyncInvalidationOptLocksTest") public class AsyncInvalidationOptLocksTest extends CacheModeLocalTestBase { public AsyncInvalidationOptLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "options.cachemodelocal.AsyncInvalidationPessLocksTest") public class AsyncInvalidationPessLocksTest extends CacheModeLocalTestBase { public AsyncInvalidationPessLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplOptLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplOptLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplOptLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -15,7 +15,7 @@ import javax.transaction.TransactionManager; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "options.cachemodelocal.AsyncReplOptLocksTest") public class AsyncReplOptLocksTest extends CacheModeLocalTestBase { public AsyncReplOptLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplPessLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplPessLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncReplPessLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "options.cachemodelocal.AsyncReplPessLocksTest") public class AsyncReplPessLocksTest extends CacheModeLocalTestBase { public AsyncReplPessLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "cachemodelocal.CacheModeLocalTestBase") public abstract class CacheModeLocalTestBase { // to be subclassed. Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationOptLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationOptLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationOptLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "options.cachemodelocal.SyncInvalidationOptLocksTest") public class SyncInvalidationOptLocksTest extends CacheModeLocalTestBase { public SyncInvalidationOptLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationPessLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationPessLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncInvalidationPessLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "options.cachemodelocal.SyncInvalidationPessLocksTest") public class SyncInvalidationPessLocksTest extends CacheModeLocalTestBase { public SyncInvalidationPessLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplOptLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplOptLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplOptLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ import org.jboss.cache.util.TestingUtil; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "options.cachemodelocal.SyncReplOptLocksTest") public class SyncReplOptLocksTest extends CacheModeLocalTestBase { public SyncReplOptLocksTest() Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplPessLocksTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplPessLocksTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/SyncReplPessLocksTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,7 @@ import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "options.cachemodelocal.SyncReplPessLocksTest") public class SyncReplPessLocksTest extends CacheModeLocalTestBase { public SyncReplPessLocksTest() @@ -21,4 +21,4 @@ protected void delay() { } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -28,7 +28,7 @@ * @author Ben Wang * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "passivation.BasicPassivationTest") public class BasicPassivationTest { CacheSPI cache; Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "passivation.ConcurrentPassivationTest") public class ConcurrentPassivationTest { private CacheSPI cache; Modified: core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ /** * @author Ben Wang, Feb 11, 2004 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "passivation.LocalPassivationIntegrationTest") public class LocalPassivationIntegrationTest { CacheSPI<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -37,7 +37,7 @@ * * @author Brian Stansberry */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "passivation.PassivationActivationCallbacksTestCase") public class PassivationActivationCallbacksTestCase { private static final Fqn BASE = Fqn.fromString("/base"); Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -38,7 +38,7 @@ * @author <a href="mailto:{hmesha@novell.com}">{Hany Mesha}</a> * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "passivation.PassivationTestsBase") abstract public class PassivationTestsBase extends AbstractCacheLoaderTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToBdbjeCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -14,7 +14,7 @@ * @author <a href="mailto:{hmesha@novell.com}">{Hany Mesha}</a> * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "passivation.PassivationToBdbjeCacheLoaderTest") public class PassivationToBdbjeCacheLoaderTest extends PassivationTestsBase { private String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp"); Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToDummyInMemoryCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToDummyInMemoryCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToDummyInMemoryCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -5,7 +5,7 @@ import org.jboss.cache.loader.DummyInMemoryCacheLoader; import org.testng.annotations.Test; -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "passivation.PassivationToDummyInMemoryCacheLoaderTest") public class PassivationToDummyInMemoryCacheLoaderTest extends PassivationTestsBase { protected void configureCache() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToFileCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -10,7 +10,7 @@ * @author <a href="mailto:{hmesha@novell.com}">{Hany Mesha}</a> * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "passivation.PassivationToFileCacheLoaderTest") public class PassivationToFileCacheLoaderTest extends PassivationTestsBase { protected void configureCache() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,6 +11,7 @@ import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.*; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; import org.testng.annotations.Test; /** @@ -20,20 +21,12 @@ * @author <a href="mailto:{hmesha@novell.com}">{Hany Mesha}</a> * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "passivation.PassivationToJDBCCacheLoaderTest") public class PassivationToJDBCCacheLoaderTest extends PassivationTestsBase { protected String getJDBCProps() { - Properties prop = new Properties(); - try - { - prop.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); - } - catch (Exception e) - { - System.out.println("Error loading jdbc properties "); - } + Properties prop = TestDbPropertiesFactory.getTestDbProperties(); return "cache.jdbc.driver =" + prop.getProperty("cache.jdbc.driver") + "\n" + "cache.jdbc.url=" + prop.getProperty("cache.jdbc.url") + "\n" + "cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" + Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToLocalDelegatingCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToLocalDelegatingCacheLoaderTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToLocalDelegatingCacheLoaderTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -16,7 +16,7 @@ * @author <a href="mailto:{hmesha@novell.com}">{Hany Mesha}</a> * @version $Id$ */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "passivation.PassivationToLocalDelegatingCacheLoaderTest") public class PassivationToLocalDelegatingCacheLoaderTest extends PassivationTestsBase { ThreadLocal<CacheSPI> delegating_cacheTL = new ThreadLocal<CacheSPI>(); Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplAndStateTransferWithPassivationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -44,7 +44,7 @@ import java.util.HashSet; import java.util.Set; -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "passivation.ReplAndStateTransferWithPassivationTest") public class ReplAndStateTransferWithPassivationTest extends AbstractCacheLoaderTestBase { public void testStateTransferOfPassivatedState() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -50,7 +50,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = "functional") +@Test(groups = "functional", testName = "passivation.ReplicatedPassivationIntegrationTest") public class ReplicatedPassivationIntegrationTest { private CacheSPI<String, String> cache1; Modified: core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/AbstractProfileTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,10 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -@Test(groups = "profiling") +/** + * Importnat - make sure you inly enable these tests locally! + */ +@Test(groups = "profiling",enabled = false) public abstract class AbstractProfileTest { protected Cache cache; Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/ConstructionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -6,11 +6,11 @@ /** * Profile LOCAL mode operation - * + * Importnat - make sure you inly enable these tests locally! * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.2.0 */ -@Test(groups = "profiling") +@Test(groups = "profiling", testName = "profiling.ConstructionTest", enabled = false) public class ConstructionTest { Cache cache; Modified: core/trunk/src/test/java/org/jboss/cache/profiling/MemConsumptionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/MemConsumptionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/MemConsumptionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -33,7 +33,10 @@ import java.util.Arrays; import java.util.Random; -@Test(groups = "profiling") +/** + * Importnat - make sure you inly enable these tests locally! + */ +@Test(groups = "profiling", testName = "profiling.MemConsumptionTest", enabled = false) public class MemConsumptionTest { // adjust the next 4 values Modified: core/trunk/src/test/java/org/jboss/cache/profiling/MemoryFootprintTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/MemoryFootprintTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/MemoryFootprintTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,7 +9,10 @@ import java.io.IOException; -@Test(groups = "profiling") +/** + * Importnat - make sure you inly enable these tests locally! + */ +@Test(groups = "profiling", testName = "profiling.MemoryFootprintTest", enabled = false) public class MemoryFootprintTest { int numFqns = 100000; Modified: core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/MockAsyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -17,11 +17,12 @@ import java.util.concurrent.atomic.AtomicInteger; /** - * // TODO: MANIK: Document this + *Importnat - make sure you inly enable these tests locally! * * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 3.0 */ +@Test(groups = "profiling", enabled = false) public class MockAsyncReplTest extends ProfileTest { @Override Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileMapViewTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -@Test(groups = "profiling") +/** + * Importnat - make sure you inly enable these tests locally! + */ +@Test(groups = "profiling", enabled = false) public class ProfileMapViewTest { /* Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileSlaveTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -9,11 +9,12 @@ /** * Slave to go with ProfileTest. Should be done in a different VM. Can be profiled as well to profile receiving * messages. + * Importnat - make sure you inly enable these tests locally! * * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "profiling") +@Test(groups = "profiling", testName = "profiling.ProfileSlaveTest", enabled = false) public class ProfileSlaveTest extends AbstractProfileTest { private void waitForTest() throws Exception Modified: core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/profiling/ProfileTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,10 +29,11 @@ * 3. Profile away! * <p/> * + * Importnat - make sure you inly enable these tests locally! * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "profiling") +@Test(groups = "profiling", testName = "profiling.ProfileTest", enabled = false) public class ProfileTest extends AbstractProfileTest { /* Modified: core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * * @version $Revision$ */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "replicated.AsyncReplTest") public class AsyncReplTest { private class AsyncReplTestTL { Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/replicated/ExceptionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -21,7 +21,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.1.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, testName = "replicated.ExceptionTest") public class ExceptionTest { private Cache cache1; Modified: core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -46,7 +46,7 @@ * * @version $Revision$ */ -@Test(groups = {"functional", "jgroups", "transaction"}, sequential = true) +@Test(groups = {"functional", "jgroups", "transaction"}, sequential = true, testName = "replicated.PessimisticSyncReplTxTest") public class PessimisticSyncReplTxTest { private static Log log = LogFactory.getLog(PessimisticSyncReplTxTest.class); Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -34,7 +34,7 @@ * @author Ben Wang * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "replicated.ReplicationExceptionTest") public class ReplicationExceptionTest { private CacheSPI<String, ContainerData> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -38,7 +38,7 @@ * * @version $Revision$ */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "replicated.SyncCacheListenerTest") public class SyncCacheListenerTest { private CacheSPI<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "jgroups"}) +@Test(groups = {"functional", "jgroups"}, testName = "replicated.SyncReplTest") public class SyncReplTest { private ThreadLocal<Cache<Object, Object>[]> cachesTL = new ThreadLocal<Cache<Object, Object>[]>(); Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/FailedStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -47,7 +47,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional"}, enabled=false) +@Test(groups = {"functional"}, enabled=false, testName = "statetransfer.FailedStateTransferTest") public class FailedStateTransferTest extends StateTransferTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -45,7 +45,7 @@ * @author Brian Stansberry * @version $Revision$ */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = false, testName = "statetransfer.ForcedStateTransferTest") // this has always been disabled since 1.4.x. See JBCACHE-315 public class ForcedStateTransferTest extends StateTransferTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/PersistingTransientStateTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/PersistingTransientStateTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/PersistingTransientStateTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * Pertains to JBCACHE-131 * <p/> */ -@Test(groups = "functional", enabled=false) +@Test(groups = "functional", enabled=false, testName = "statetransfer.PersistingTransientStateTest") public class PersistingTransientStateTest { protected NodeLockingScheme nls = NodeLockingScheme.PESSIMISTIC; Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -29,7 +29,7 @@ * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = false, testName = "statetransfer.StateTransfer200Test") public class StateTransfer200Test extends StateTransferTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferCompatibilityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferCompatibilityTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferCompatibilityTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -2,7 +2,7 @@ import org.testng.annotations.Test; -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = false, testName = "statetransfer.StateTransferCompatibilityTest") public class StateTransferCompatibilityTest extends StateTransferTestBase { Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -39,7 +39,7 @@ * * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> */ -@Test(groups = "functional", enabled = false) +@Test(groups = "functional", enabled = false, testName = "statetransfer.StateTransferConcurrencyTest") public class StateTransferConcurrencyTest extends StateTransferTestBase { protected String getReplicationVersion() @@ -815,4 +815,4 @@ } -} \ No newline at end of file +} Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -35,6 +35,7 @@ import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.marshall.SelectedClassnameClassLoader; import org.jboss.cache.util.TestingUtil; +import org.jboss.cache.util.TestDbPropertiesFactory; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; import org.testng.annotations.AfterMethod; @@ -55,7 +56,7 @@ * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> * @version $Revision$ */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, testName = "statetransfer.StateTransferTestBase") public abstract class StateTransferTestBase extends AbstractCacheLoaderTestBase { protected static final int SUBTREE_SIZE = 10; @@ -227,19 +228,7 @@ { if (cacheloaderClass.equals("org.jboss.cache.loader.JDBCCacheLoader")) { - Properties prop = new Properties(); - try - { - prop.load(this.getClass().getClassLoader().getResourceAsStream("cache-jdbc.properties")); - } - catch (Exception e) - { - System.out.println("Error loading jdbc properties "); - } - - String tablePrefix = prop.getProperty("cache.jdbc.table.name", "jbosscache"); - prop.setProperty("cache.jdbc.table.name", tablePrefix + Thread.currentThread().getName()); - + Properties prop = TestDbPropertiesFactory.getTestDbProperties(); String props = "cache.jdbc.driver =" + prop.getProperty("cache.jdbc.driver") + "\n" + "cache.jdbc.url=" + prop.getProperty("cache.jdbc.url") + "\n" + "cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" + "cache.jdbc.password=" Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferUnderLoadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional"}, enabled = false, description = "Disabled because this test depends on JBCACHE-315 being resolved.") +@Test(groups = {"functional"}, enabled = false, description = "Disabled because this test depends on JBCACHE-315 being resolved.", testName = "statetransfer.StateTransferUnderLoadTest") public class StateTransferUnderLoadTest { Cache<Object, Object> cache1, cache2; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -32,7 +32,7 @@ * @author Ben Wang * @version $Revision$ */ -@Test(groups = {"functional", "transaction"}, enabled = true, sequential = true) +@Test(groups = {"functional", "transaction"}, enabled = true, testName = "transaction.ConcurrentBankTest") public class ConcurrentBankTest { private CacheSPI<Object, Integer> cache; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -34,7 +34,7 @@ * * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true, enabled = false) +@Test(groups = {"functional", "transaction"}, sequential = true, enabled = false, testName = "transaction.DeadlockTest") public class DeadlockTest { CacheSPI<String, String> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.InvocationContextCleanupTest") public class InvocationContextCleanupTest { private CacheSPI[] caches; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ * @author <a href="mailto:ovidiu@jboss.org">Ovidiu Feodorov</a> * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.IsolationLevelReadCommittedNodeCreationRollbackTest") public class IsolationLevelReadCommittedNodeCreationRollbackTest { Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -27,7 +27,7 @@ * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.IsolationLevelReadCommittedTest") public class IsolationLevelReadCommittedTest { private Cache<String, String> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author <a href="mailto:ovidiu@jboss.org">Ovidiu Feodorov</a> * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.IsolationLevelRepeatableReadTest") public class IsolationLevelRepeatableReadTest { Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * @author <a href="mailto:ovidiu@jboss.org">Ovidiu Feodorov</a> * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.IsolationLevelSerializableTest") public class IsolationLevelSerializableTest { Modified: core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/PrepareCommitContentionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -38,7 +38,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "transaction.PrepareCommitContentionTest") public class PrepareCommitContentionTest { CacheSPI<Object, Object> c1; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,167 +1,167 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.cache.transaction; - -import javax.transaction.TransactionManager; -import javax.transaction.Transaction; - -import org.jboss.cache.*; -import org.jboss.cache.config.Configuration; -import org.testng.annotations.Test; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.AfterMethod; -import static org.testng.Assert.*; - -/** - * This is for checking issue: https://jira.jboss.org/jira/browse/JBCACHE-1406 - * This was an issue on 1.4 and 2.x, but didn't reproduce on 3.x. - * Anyway, the tests is here just in case... - * - * @author Mircea.Markus(a)jboss.com - */ -@Test (groups = "functional") -public class RemoveOnTxTest -{ - private CacheSPI cache; - private DataContainerImpl dataContainer; - - @BeforeMethod - protected void setUp() throws Exception - { - Configuration configuration = new Configuration(); - configuration.setCacheMode(Configuration.CacheMode.LOCAL); - configuration.setTransactionManagerLookupClass("org.jboss.cache.transaction.GenericTransactionManagerLookup"); - configuration.setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); - cache = (CacheSPI) new UnitTestCacheFactory().createCache(configuration); - dataContainer = (DataContainerImpl) cache.getComponentRegistry().getComponent(DataContainer.class); - } - - @AfterMethod - protected void tearDown() throws Exception - { - cache.stop(); - cache.destroy(); - } - - public void testFailure() throws Exception - { - - TransactionManager tm = cache.getTransactionManager(); - try - { - tm.begin(); - print("put()"); - cache.put("/a/b/c", "test", "test"); - assertTrue(cache.get("/a/b/c", "test").equals("test")); - print("remove()"); - cache.removeNode("/a/b"); - assertTrue(!cache.exists("/a/b")); - assertTrue(!cache.exists("/a/b/c")); - cache.put("/a/b/d", "test1", "test1"); - assertTrue(!cache.exists("/a/b/c")); - assertTrue(cache.exists("/a/b/d")); - print("Exists? " + cache.exists("/a/b/c")); - print("get(): " + cache.get("/a/b/c", "test")); - tm.commit(); - assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) == null); - assertTrue(!cache.exists("/a/b/c")); - assertTrue(cache.exists("/a/b/d")); - dataContainer.printLockInfo(); - } - catch (Exception ex) { - tm.rollback(); - throw ex; - } - dataContainer.printLockInfo(); - System.out.println(" lock info " + dataContainer.printLockInfo()); - try - { - tm.begin(); - print(cache.exists("/a/b/c")); - print("get(): " + cache.get("/a/b/c", "test")); - print("get(): " + cache.get("/a/b/c", "test")); - Transaction t = tm.suspend(); - try - { - cache.putForExternalRead(Fqn.fromString("/a/b/c"), "test", "test"); - } - catch (Exception ignore) { - ignore.printStackTrace(); - } - tm.resume(t); - print("get(): " + cache.get("/a/b/c", "test")); - print(cache.exists("/a/b/c")); - cache.put("/a/b/c", "test", "test"); - print(cache.exists("/a/b/c")); - tm.commit(); - } - catch (Exception ex) { - tm.rollback(); - throw ex; - } - } - - private void print(Object s) - { - System.out.println(s); - } - - private void print(boolean s) - { - System.out.println(s); - } - - public void testReal() throws Exception - { - TransactionManager tm = cache.getTransactionManager(); - tm.begin(); - print("put()"); - cache.put("/a/b/c", "test", "test"); - assertTrue(cache.get("/a/b/c", "test").equals("test")); - print("remove()"); - cache.removeNode("/a/b"); - assertTrue(!cache.exists("/a/b")); - assertTrue(!cache.exists("/a/b/c")); - cache.put("/a/b/d", "test1", "test1"); - assertTrue(!cache.exists("/a/b/c")); - assertTrue(cache.exists("/a/b/d")); - print("Exists? " + cache.exists("/a/b/c")); - print("get(): " + cache.get("/a/b/c", "test")); - tm.commit(); - assertNull(cache.peek(Fqn.fromString("/a/b/c"), true, true)); - assertTrue(!cache.exists("/a/b/c")); - assertTrue(cache.exists("/a/b/d")); - dataContainer.printLockInfo(); - } - - public void testSimplified() throws Exception - { - TransactionManager tm = cache.getTransactionManager(); - tm.begin(); - print("put()"); - cache.put("/a/b/c", "test", "test"); - assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) != null); - cache.removeNode("/a/b"); - tm.commit(); - assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) == null); - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.cache.transaction; + +import javax.transaction.TransactionManager; +import javax.transaction.Transaction; + +import org.jboss.cache.*; +import org.jboss.cache.config.Configuration; +import org.testng.annotations.Test; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.AfterMethod; +import static org.testng.Assert.*; + +/** + * This is for checking issue: https://jira.jboss.org/jira/browse/JBCACHE-1406 + * This was an issue on 1.4 and 2.x, but didn't reproduce on 3.x. + * Anyway, the tests is here just in case... + * + * @author Mircea.Markus(a)jboss.com + */ +@Test (groups = "functional", testName = "transaction.RemoveOnTxTest") +public class RemoveOnTxTest +{ + private CacheSPI cache; + private DataContainerImpl dataContainer; + + @BeforeMethod + protected void setUp() throws Exception + { + Configuration configuration = new Configuration(); + configuration.setCacheMode(Configuration.CacheMode.LOCAL); + configuration.setTransactionManagerLookupClass("org.jboss.cache.transaction.GenericTransactionManagerLookup"); + configuration.setNodeLockingScheme(Configuration.NodeLockingScheme.PESSIMISTIC); + cache = (CacheSPI) new UnitTestCacheFactory().createCache(configuration); + dataContainer = (DataContainerImpl) cache.getComponentRegistry().getComponent(DataContainer.class); + } + + @AfterMethod + protected void tearDown() throws Exception + { + cache.stop(); + cache.destroy(); + } + + public void testFailure() throws Exception + { + + TransactionManager tm = cache.getTransactionManager(); + try + { + tm.begin(); + print("put()"); + cache.put("/a/b/c", "test", "test"); + assertTrue(cache.get("/a/b/c", "test").equals("test")); + print("remove()"); + cache.removeNode("/a/b"); + assertTrue(!cache.exists("/a/b")); + assertTrue(!cache.exists("/a/b/c")); + cache.put("/a/b/d", "test1", "test1"); + assertTrue(!cache.exists("/a/b/c")); + assertTrue(cache.exists("/a/b/d")); + print("Exists? " + cache.exists("/a/b/c")); + print("get(): " + cache.get("/a/b/c", "test")); + tm.commit(); + assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) == null); + assertTrue(!cache.exists("/a/b/c")); + assertTrue(cache.exists("/a/b/d")); + dataContainer.printLockInfo(); + } + catch (Exception ex) { + tm.rollback(); + throw ex; + } + dataContainer.printLockInfo(); + System.out.println(" lock info " + dataContainer.printLockInfo()); + try + { + tm.begin(); + print(cache.exists("/a/b/c")); + print("get(): " + cache.get("/a/b/c", "test")); + print("get(): " + cache.get("/a/b/c", "test")); + Transaction t = tm.suspend(); + try + { + cache.putForExternalRead(Fqn.fromString("/a/b/c"), "test", "test"); + } + catch (Exception ignore) { + ignore.printStackTrace(); + } + tm.resume(t); + print("get(): " + cache.get("/a/b/c", "test")); + print(cache.exists("/a/b/c")); + cache.put("/a/b/c", "test", "test"); + print(cache.exists("/a/b/c")); + tm.commit(); + } + catch (Exception ex) { + tm.rollback(); + throw ex; + } + } + + private void print(Object s) + { + System.out.println(s); + } + + private void print(boolean s) + { + System.out.println(s); + } + + public void testReal() throws Exception + { + TransactionManager tm = cache.getTransactionManager(); + tm.begin(); + print("put()"); + cache.put("/a/b/c", "test", "test"); + assertTrue(cache.get("/a/b/c", "test").equals("test")); + print("remove()"); + cache.removeNode("/a/b"); + assertTrue(!cache.exists("/a/b")); + assertTrue(!cache.exists("/a/b/c")); + cache.put("/a/b/d", "test1", "test1"); + assertTrue(!cache.exists("/a/b/c")); + assertTrue(cache.exists("/a/b/d")); + print("Exists? " + cache.exists("/a/b/c")); + print("get(): " + cache.get("/a/b/c", "test")); + tm.commit(); + assertNull(cache.peek(Fqn.fromString("/a/b/c"), true, true)); + assertTrue(!cache.exists("/a/b/c")); + assertTrue(cache.exists("/a/b/d")); + dataContainer.printLockInfo(); + } + + public void testSimplified() throws Exception + { + TransactionManager tm = cache.getTransactionManager(); + tm.begin(); + print("put()"); + cache.put("/a/b/c", "test", "test"); + assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) != null); + cache.removeNode("/a/b"); + tm.commit(); + assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) == null); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -60,7 +60,7 @@ * @author $Author$ * @version $Date$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, testName = "transaction.ReplicatedTransactionDeadlockTest") public class ReplicatedTransactionDeadlockTest { Modified: core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/SimultaneousRollbackAndPutTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> */ -@Test(groups = {"functional", "transaction"}, enabled = true, sequential = true) +@Test(groups = {"functional", "transaction"}, enabled = true, sequential = true, testName = "transaction.SimultaneousRollbackAndPutTest") // Known issue - disabled because of JBCACHE-923 public class SimultaneousRollbackAndPutTest { Modified: core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -19,7 +19,7 @@ * @author otaylor(a)redhat.com * @author Manik Surtani (manik AT jboss DOT org) */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.SuspendTxTest") public class SuspendTxTest { CacheSPI<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -25,7 +25,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, testName = "isolationlevels.IsolationLevelTestBase") public abstract class IsolationLevelTestBase { protected IsolationLevel isolationLevel; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/NoneTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = {"functional", "transaction"}) +@Test(groups = {"functional", "transaction"}, testName = "transaction.isolationlevels.NoneTest") public class NoneTest extends IsolationLevelTestBase { public NoneTest() Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadCommittedTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,11 +1,13 @@ package org.jboss.cache.transaction.isolationlevels; import org.jboss.cache.lock.IsolationLevel; +import org.testng.annotations.Test; /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ +@Test(groups = "functional", testName = "transaction.isolationlevels.ReadCommittedTest") public class ReadCommittedTest extends IsolationLevelTestBase { public ReadCommittedTest() Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/ReadUncommittedTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,11 +1,13 @@ package org.jboss.cache.transaction.isolationlevels; import org.jboss.cache.lock.IsolationLevel; +import org.testng.annotations.Test; /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ +@Test(groups = "functional", testName = "transaction.isolationlevels.ReadUncommittedTest") public class ReadUncommittedTest extends IsolationLevelTestBase { public ReadUncommittedTest() Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/RepeatableReadTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,11 +1,13 @@ package org.jboss.cache.transaction.isolationlevels; import org.jboss.cache.lock.IsolationLevel; +import org.testng.annotations.Test; /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ +@Test(groups = "functional", testName = "transaction.isolationlevels.RepeatableReadTest") public class RepeatableReadTest extends IsolationLevelTestBase { public RepeatableReadTest() Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/SerializableTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -7,7 +7,7 @@ * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> * @since 2.0.0 */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "transaction.isolationlevels.SerializableTest") public class SerializableTest extends IsolationLevelTestBase { public SerializableTest() 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani (manik AT jboss DOT org)</a> */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "transaction.pessimistic.AbortionTest") public class AbortionTest { private CacheSPI cache1, cache2, cache3; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -20,7 +20,7 @@ * @author <a href="mailto:jhalat@infovide.pl">Jacek Halat</a> * @since 1.4.0 */ -@Test(groups = {"functional"}, sequential = true) +@Test(groups = {"functional"}, sequential = true, testName = "transaction.pessimistic.AsyncRollbackTxTest") public class AsyncRollbackTxTest { private CacheSPI<String, String> cache; 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 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -36,7 +36,7 @@ * * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.pessimistic.ConcurrentTransactionalTest") public class ConcurrentTransactionalTest { private CacheSPI<Integer, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/IsolationLevelNoneTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/IsolationLevelNoneTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/IsolationLevelNoneTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -24,7 +24,7 @@ * @author Bela Ban * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.pessimistic.IsolationLevelNoneTest") public class IsolationLevelNoneTest { CacheSPI<String, String> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -47,7 +47,7 @@ * * @version $Id$ */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.pessimistic.PessimisticTransactionTest") public class PessimisticTransactionTest { CacheSPI<String, Comparable> cache = null; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ * Date: Jun 9, 2004 * Time: 9:05:19 AM */ -@Test(groups = {"functional", "transaction"}, sequential = true) +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.pessimistic.PrepareTxTest") public class PrepareTxTest { CacheSPI<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/StatusUnknownTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -30,7 +30,7 @@ * * @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a> */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "transaction.pessimistic.StatusUnknownTest") public class StatusUnknownTest { private Cache<String, String> cache; Modified: core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/util/BitEncodedIntegerSetTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -8,7 +8,7 @@ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 */ -@Test(groups = "functional") +@Test(groups = "functional", testName = "util.BitEncodedIntegerSetTest") public class BitEncodedIntegerSetTest { public void testLimits() Modified: core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -23,7 +23,7 @@ /** * Tests {@link Caches}. */ -@Test(groups = "functional", sequential = true) +@Test(groups = "functional", sequential = true, testName = "util.CachesTest") public class CachesTest { String a = "a"; Modified: core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,168 +1,168 @@ -package org.jboss.cache.util; - -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.fail; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.NoSuchElementException; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; - -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -@Test(groups = {"functional", "transaction"}, sequential = true) -public class DeltaMapTest -{ - - static String Y = "y"; - - static String Z = "z"; - - static String K = "k"; - - HashMap<String, String> hm; - - HashMap<String, String> backup; - - DeltaMap<String, String> dm; - - @BeforeMethod - public void setUp() - { - hm = new HashMap<String, String>(); - hm.put(null, null); - hm.put(Y, Z); - hm.put(K, Y); - backup = new HashMap<String, String>(hm); - dm = DeltaMap.create(hm); - assertEquals(false, dm.isModified()); - assertEquals(hm, dm); - } - - @AfterMethod - public void tearDown() - { - hm = null; - backup = null; - dm = null; - } - - public void testSize() - { - assertEquals(3, dm.size()); - dm.put(Y, "HI"); - assertEquals(3, dm.size()); - dm.remove(Y); - assertEquals(2, dm.size()); - hm.clear(); - assertEquals(0, dm.size()); - dm.put(Z, Z); - dm.getRemoved().add("NOT HERE"); - assertEquals(1, dm.size()); - } - - public void testConcurrent() throws Exception - { - ConcurrentHashMap<Object, String> m = new ConcurrentHashMap<Object, String>(); - m.put(new Object(), Z); - m.put(new Object(), Y); - DeltaMap<Object, String> dm = DeltaMap.create(m); - assertEquals(m, dm); - assertEquals(m.toString(), dm.toString()); - } - - public void testChanges() throws Exception - { - assertEquals("" + dm.toDebugString(), backup, dm); - assertEquals(Z, dm.remove(Y)); - assertEquals(true, dm.isModified()); - assertEquals(null, dm.remove(Y)); - assertEquals("changes not made to underlying map", backup, hm); - assertEquals(false, dm.containsKey(Y)); - assertEquals(false, dm.containsValue(Z)); - assertEquals(null, dm.put(Y, Z)); - assertEquals(Z, dm.put(Y, Z)); - assertEquals("changes not made to underlying map", backup, hm); - assertEquals(backup.size(), dm.size()); - assertEquals(backup, dm); - dm.commit(); - assertEquals(hm, dm); - dm.commit(); - assertEquals(hm, dm); - } - - public void testAddRemove() throws Exception - { - dm.remove(K); - dm.put(K, Z); - assertEquals(Z, dm.get(K)); - assertEquals(Z, dm.remove(K)); - assertEquals(null, dm.remove(K)); - } - - public void testExclude() throws Exception - { - dm = DeltaMap.excludeKeys(hm, Y); - assertEquals(false, dm.containsKey(Y)); - } - - public void testExclude2() throws Exception - { - dm = DeltaMap.excludeKeys(hm, hm.keySet()); - assertEquals(true, dm.isModified()); - assertEquals(0, dm.size()); - } - - public void testClearedMap() throws Exception - { - dm.clear(); - assertEquals(0, dm.size()); - assertEquals(backup, hm); - assertEquals(null, dm.remove(Y)); - } - - public void testIterator() throws Exception - { - dm.remove(null); - dm.put(K, Y); - System.out.println(dm.toDebugString()); - System.out.println(dm.toString()); - Iterator<Entry<String, String>> i = dm.entrySet().iterator(); - assertEquals(true, i.hasNext()); - assertEquals(true, i.hasNext()); - i.next(); - assertEquals(true, i.hasNext()); - i.next(); - assertEquals("" + dm, false, i.hasNext()); - try - { - i.next(); - fail("no next"); - } - catch (NoSuchElementException e) - { - } - try - { - i.next(); - fail("no next"); - } - catch (NoSuchElementException e) - { - } - } - - public void testEx() { -HashMap<String, String> hm = new HashMap<String, String>(); -hm.put("a", "apple"); -DeltaMap<String, String> dm = DeltaMap.create(hm); -dm.remove("a"); -assert hm.containsKey("a"); -assert !dm.containsKey("a"); -dm.commit(); -assert !hm.containsKey("a"); - } -} +package org.jboss.cache.util; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.fail; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "util.DeltaMapTest") +public class DeltaMapTest +{ + + static String Y = "y"; + + static String Z = "z"; + + static String K = "k"; + + HashMap<String, String> hm; + + HashMap<String, String> backup; + + DeltaMap<String, String> dm; + + @BeforeMethod + public void setUp() + { + hm = new HashMap<String, String>(); + hm.put(null, null); + hm.put(Y, Z); + hm.put(K, Y); + backup = new HashMap<String, String>(hm); + dm = DeltaMap.create(hm); + assertEquals(false, dm.isModified()); + assertEquals(hm, dm); + } + + @AfterMethod + public void tearDown() + { + hm = null; + backup = null; + dm = null; + } + + public void testSize() + { + assertEquals(3, dm.size()); + dm.put(Y, "HI"); + assertEquals(3, dm.size()); + dm.remove(Y); + assertEquals(2, dm.size()); + hm.clear(); + assertEquals(0, dm.size()); + dm.put(Z, Z); + dm.getRemoved().add("NOT HERE"); + assertEquals(1, dm.size()); + } + + public void testConcurrent() throws Exception + { + ConcurrentHashMap<Object, String> m = new ConcurrentHashMap<Object, String>(); + m.put(new Object(), Z); + m.put(new Object(), Y); + DeltaMap<Object, String> dm = DeltaMap.create(m); + assertEquals(m, dm); + assertEquals(m.toString(), dm.toString()); + } + + public void testChanges() throws Exception + { + assertEquals("" + dm.toDebugString(), backup, dm); + assertEquals(Z, dm.remove(Y)); + assertEquals(true, dm.isModified()); + assertEquals(null, dm.remove(Y)); + assertEquals("changes not made to underlying map", backup, hm); + assertEquals(false, dm.containsKey(Y)); + assertEquals(false, dm.containsValue(Z)); + assertEquals(null, dm.put(Y, Z)); + assertEquals(Z, dm.put(Y, Z)); + assertEquals("changes not made to underlying map", backup, hm); + assertEquals(backup.size(), dm.size()); + assertEquals(backup, dm); + dm.commit(); + assertEquals(hm, dm); + dm.commit(); + assertEquals(hm, dm); + } + + public void testAddRemove() throws Exception + { + dm.remove(K); + dm.put(K, Z); + assertEquals(Z, dm.get(K)); + assertEquals(Z, dm.remove(K)); + assertEquals(null, dm.remove(K)); + } + + public void testExclude() throws Exception + { + dm = DeltaMap.excludeKeys(hm, Y); + assertEquals(false, dm.containsKey(Y)); + } + + public void testExclude2() throws Exception + { + dm = DeltaMap.excludeKeys(hm, hm.keySet()); + assertEquals(true, dm.isModified()); + assertEquals(0, dm.size()); + } + + public void testClearedMap() throws Exception + { + dm.clear(); + assertEquals(0, dm.size()); + assertEquals(backup, hm); + assertEquals(null, dm.remove(Y)); + } + + public void testIterator() throws Exception + { + dm.remove(null); + dm.put(K, Y); + System.out.println(dm.toDebugString()); + System.out.println(dm.toString()); + Iterator<Entry<String, String>> i = dm.entrySet().iterator(); + assertEquals(true, i.hasNext()); + assertEquals(true, i.hasNext()); + i.next(); + assertEquals(true, i.hasNext()); + i.next(); + assertEquals("" + dm, false, i.hasNext()); + try + { + i.next(); + fail("no next"); + } + catch (NoSuchElementException e) + { + } + try + { + i.next(); + fail("no next"); + } + catch (NoSuchElementException e) + { + } + } + + public void testEx() { +HashMap<String, String> hm = new HashMap<String, String>(); +hm.put("a", "apple"); +DeltaMap<String, String> dm = DeltaMap.create(hm); +dm.remove("a"); +assert hm.containsKey("a"); +assert !dm.containsKey("a"); +dm.commit(); +assert !hm.containsKey("a"); + } +} Modified: core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -11,7 +11,7 @@ import org.testng.annotations.Test; -@Test(groups = "unit") +@Test(groups = "unit", testName = "util.ImmutableListCopyTest") public class ImmutableListCopyTest { public void testImmutability() Modified: core/trunk/src/test/java/org/jboss/cache/util/MinMapUtilTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/MinMapUtilTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/util/MinMapUtilTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -1,68 +1,68 @@ -package org.jboss.cache.util; - -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertSame; - -import java.util.Collections; -import java.util.Map; -import java.util.HashMap; - -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -@Test(groups = {"functional", "transaction"}, sequential = true) -public class MinMapUtilTest -{ - - private static final Map<String, String> empty = Collections.emptyMap(); - private Map<String, String> map; - private String key = "a"; - private String key2 = "b"; - private String value = "y"; - - @BeforeMethod - public void before() { - map = empty; - } - - @AfterMethod - public void tearDown() { - map = null; - } - - public void testRemove() - { - assertSame(map, MinMapUtil.remove(map, key)); - map = MinMapUtil.put(map, key, value); - map = MinMapUtil.put(map, key2, value); - assertEquals(value, map.get(key)); - assertEquals(value, map.get(key2)); - MinMapUtil.remove(map, key2); - assertSame(map, MinMapUtil.remove(map, "not here")); - assertSame(empty, MinMapUtil.remove(map, key)); - } - - public void testPut() - { - assertSame(map, MinMapUtil.remove(map, key)); - map = MinMapUtil.put(map, key, value); - assertEquals(1, map.size()); - assertEquals(true, map.containsKey(key)); - map = MinMapUtil.put(map, key, value); - assertEquals(1, map.size()); - assertEquals(true, map.containsKey(key)); - map = MinMapUtil.put(map, key2, value); - assertEquals(2, map.size()); - } - - public void testPutAll() - { - HashMap<String, String> hm = new HashMap<String, String>(); - assertSame(empty, MinMapUtil.putAll(map, hm)); - hm.put(key, value); - assertEquals(1, MinMapUtil.putAll(map, hm).size()); - hm.put(key2, value); - assertEquals(2, MinMapUtil.putAll(map, hm).size()); - } -} +package org.jboss.cache.util; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertSame; + +import java.util.Collections; +import java.util.Map; +import java.util.HashMap; + +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +@Test(groups = {"functional", "transaction"}, sequential = true, testName = "util.MinMapUtilTest") +public class MinMapUtilTest +{ + + private static final Map<String, String> empty = Collections.emptyMap(); + private Map<String, String> map; + private String key = "a"; + private String key2 = "b"; + private String value = "y"; + + @BeforeMethod + public void before() { + map = empty; + } + + @AfterMethod + public void tearDown() { + map = null; + } + + public void testRemove() + { + assertSame(map, MinMapUtil.remove(map, key)); + map = MinMapUtil.put(map, key, value); + map = MinMapUtil.put(map, key2, value); + assertEquals(value, map.get(key)); + assertEquals(value, map.get(key2)); + MinMapUtil.remove(map, key2); + assertSame(map, MinMapUtil.remove(map, "not here")); + assertSame(empty, MinMapUtil.remove(map, key)); + } + + public void testPut() + { + assertSame(map, MinMapUtil.remove(map, key)); + map = MinMapUtil.put(map, key, value); + assertEquals(1, map.size()); + assertEquals(true, map.containsKey(key)); + map = MinMapUtil.put(map, key, value); + assertEquals(1, map.size()); + assertEquals(true, map.containsKey(key)); + map = MinMapUtil.put(map, key2, value); + assertEquals(2, map.size()); + } + + public void testPutAll() + { + HashMap<String, String> hm = new HashMap<String, String>(); + assertSame(empty, MinMapUtil.putAll(map, hm)); + hm.put(key, value); + assertEquals(1, MinMapUtil.putAll(map, hm).size()); + hm.put(key2, value); + assertEquals(2, MinMapUtil.putAll(map, hm).size()); + } +} Added: core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java (rev 0) +++ core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -0,0 +1,62 @@ +package org.jboss.cache.util; + +import java.util.Properties; +import java.util.regex.Pattern; +import java.util.regex.Matcher; +import java.io.IOException; + +/** + * @author Mircea.Markus(a)jboss.com + */ +public class TestDbPropertiesFactory +{ + private static final Properties realProps = new Properties(); + + private static int userIndex; + + static { + //so that all individual databases are created here + System.setProperty("derby.system.home","derby"); + try + { + realProps.load(TestDbPropertiesFactory.class.getClassLoader().getResourceAsStream("cache-jdbc.properties")); + } catch (IOException e) + { + e.printStackTrace(); + throw new Error("Missing property file: cache-jdbc.properties",e); + } + } + + public static Properties getTestDbProperties() + { + synchronized (realProps) + { + return returnBasedOnDifferentInstance(); + } + } + + private static Properties returnBasedOnDifferentInstance() + { + Properties toReturn = (Properties) realProps.clone(); + String jdbcUrl = toReturn.getProperty("cache.jdbc.url"); + Pattern pattern = Pattern.compile("jbossdb"); + Matcher matcher = pattern.matcher(jdbcUrl); + boolean found = matcher.find(); + assert found; + String newJdbcUrl = matcher.replaceFirst("jbossdb" + userIndex++); + System.out.println("newJdbcUrl = " + newJdbcUrl); + toReturn.put("cache.jdbc.url", newJdbcUrl); + return toReturn; + } + + private static Properties returnBasedOnDifferentTables() + { + Properties toReturn = (Properties) realProps.clone(); + String tableName = toReturn.getProperty("cache.jdbc.table.name"); + int currentIndex = userIndex++; + toReturn.setProperty("cache.jdbc.table.name", tableName + currentIndex); + String pk = toReturn.getProperty("cache.jdbc.table.primarykey"); + toReturn.setProperty("cache.jdbc.table.primarykey", pk + currentIndex); + return toReturn; + } +} Modified: core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java 2008-11-06 19:32:17 UTC (rev 7091) +++ core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java 2008-11-07 01:07:10 UTC (rev 7092) @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -@Test(groups = {"unit", "mvcc"}) +@Test(groups = {"unit", "mvcc"}, testName = "util.concurrent.locks.OwnableReentrantLockTest") public class OwnableReentrantLockTest { private InvocationContextContainer getInvocationContextContainer()