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

Author: mircea.markus Date: 2009-01-12 06:38:59 -0500 (Mon, 12 Jan 2009) New Revision: 7451 Modified: core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithoutTM.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.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/PessimisticSuppressLockingTest.java core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.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/SuspendTxTest.java core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.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 Log: removed unused import CacheFactory 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/api/batch/BatchWithoutTM.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,9 +1,8 @@ package org.jboss.cache.api.batch; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.CacheSPI; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.config.ConfigurationException; 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/LocalPessNodeValidityTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,11 +1,8 @@ package org.jboss.cache.api.nodevalidity; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.util.TestingUtil; -import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; /** 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/ReplicatedPessNodeValidityTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,7 +1,6 @@ package org.jboss.cache.api.nodevalidity; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.testng.annotations.Test; Modified: core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,8 +1,9 @@ package org.jboss.cache.config; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.util.TestingUtil; import org.jgroups.JChannel; import static org.testng.AssertJUnit.assertEquals; @@ -11,8 +12,6 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.factories.UnitTestConfigurationFactory; /** * Tests that JBC prefers an injected Channel to creating one via Modified: core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/factories/CustomInterceptorConstructionTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -21,20 +21,19 @@ */ package org.jboss.cache.factories; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; +import org.jboss.cache.UnitTestCacheFactory; 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.jboss.cache.util.TestingUtil; 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. 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -3,10 +3,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import static org.jboss.cache.integration.hibernate.HibernateIntegrationTestUtil.*; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -17,8 +18,6 @@ import javax.transaction.TransactionManager; import java.util.HashSet; import java.util.Set; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Tests that mimic the Hibernate Second Level Cache UpdateTimestamps Modified: core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/jmx/JmxRegistrationManagerTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -21,20 +21,21 @@ */ package org.jboss.cache.jmx; -import org.testng.annotations.*; -import org.jboss.cache.factories.UnitTestConfigurationFactory; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Cache; import org.jboss.cache.CacheFactory; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.factories.UnitTestConfigurationFactory; import org.jboss.cache.interceptors.CacheMgmtInterceptor; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import javax.management.ObjectName; -import org.jboss.cache.UnitTestCacheFactory; - /** * Tester class for {@link JmxRegistrationManager}. * 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/CacheJmxWrapperTestBase.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,7 +1,6 @@ package org.jboss.cache.jmx.deprecated; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.jmx.CacheJmxWrapper; @@ -13,11 +12,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.MBeanServerInvocationHandler; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; +import javax.management.*; /** * Tests the JMX wrapper class around the cache. Modified: core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/notifications/BuddyGroupChangeNotificationTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,25 +1,15 @@ package org.jboss.cache.notifications; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.buddyreplication.BuddyGroup; import org.jboss.cache.buddyreplication.BuddyReplicationTestsBase; import org.jboss.cache.config.BuddyReplicationConfig; import org.jboss.cache.config.Configuration; -import org.jboss.cache.notifications.annotation.BuddyGroupChanged; -import org.jboss.cache.notifications.annotation.CacheListener; -import org.jboss.cache.notifications.annotation.ViewChanged; -import org.jboss.cache.notifications.event.BuddyGroupChangedEvent; -import org.jboss.cache.notifications.event.ViewChangedEvent; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - /** * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>) * @since 2.1.0 Modified: core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/notifications/ConcurrentNotificationTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -3,14 +3,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.notifications.annotation.CacheListener; -import org.jboss.cache.notifications.annotation.NodeCreated; -import org.jboss.cache.notifications.annotation.NodeModified; -import org.jboss.cache.notifications.annotation.NodeRemoved; -import org.jboss.cache.notifications.annotation.NodeVisited; +import org.jboss.cache.notifications.annotation.*; import org.jboss.cache.notifications.event.Event; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -22,11 +22,7 @@ package org.jboss.cache.notifications; -import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.Node; +import org.jboss.cache.*; import org.jboss.cache.config.Configuration; import org.jboss.cache.factories.ComponentRegistry; import org.jboss.cache.lock.IsolationLevel; @@ -43,13 +39,7 @@ import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import org.jboss.cache.UnitTestCacheFactory; +import java.util.*; /** * Remote conterpart of CacheListenerTest. Main difference is event is originating as local. Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -6,12 +6,7 @@ */ package org.jboss.cache.options; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.Node; -import org.jboss.cache.NodeSPI; -import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.*; import org.jboss.cache.config.Configuration; import org.jboss.cache.optimistic.DataVersion; import org.jboss.cache.optimistic.DefaultDataVersion; Modified: core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/options/ForceWriteLockTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,6 +1,5 @@ package org.jboss.cache.options; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.NodeSPI; Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticFailSilentlyTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -6,7 +6,6 @@ */ package org.jboss.cache.options; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; Modified: core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/options/PessimisticSuppressLockingTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -6,7 +6,6 @@ */ package org.jboss.cache.options; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/CacheModeLocalTestBase.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -6,12 +6,7 @@ */ package org.jboss.cache.options.cachemodelocal; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.Node; -import org.jboss.cache.NodeSPI; -import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.*; import org.jboss.cache.commands.ReplicableCommand; import org.jboss.cache.commands.write.PutDataMapCommand; import org.jboss.cache.commands.write.PutKeyValueCommand; Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -7,11 +7,12 @@ */ package org.jboss.cache.replicated; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.transaction.DummyTransactionManager; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.fail; import org.testng.annotations.AfterMethod; @@ -25,8 +26,6 @@ import javax.transaction.TransactionManager; import java.io.NotSerializableException; import java.io.Serializable; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Teting of replication exception for a Nonerislizable object Modified: core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -11,14 +11,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.CacheException; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.TimeoutException; import org.jboss.cache.lock.UpgradeException; -import org.jboss.cache.util.CachePrinter; import org.jboss.cache.util.TestingUtil; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -27,7 +26,6 @@ import javax.transaction.NotSupportedException; import javax.transaction.SystemException; import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; /** * Tests transactional access to a local Cache, with concurrent (deadlock-prone) access. Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -6,12 +6,13 @@ */ package org.jboss.cache.transaction; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.TimeoutException; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -22,8 +23,6 @@ import javax.transaction.TransactionManager; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Tests READ_COMMITED isolation level. Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,12 +1,13 @@ package org.jboss.cache.transaction; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.TimeoutException; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -17,8 +18,6 @@ import javax.transaction.TransactionManager; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Tests READ_COMMITED isolation level. Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,10 +1,12 @@ package org.jboss.cache.transaction; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.TimeoutException; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -14,9 +16,6 @@ import javax.transaction.SystemException; import javax.transaction.TransactionManager; import java.util.concurrent.CountDownLatch; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.util.TestingUtil; /** * Tests READ_COMMITED isolation level. Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,12 +1,13 @@ package org.jboss.cache.transaction; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.TimeoutException; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -16,8 +17,6 @@ import javax.transaction.SystemException; import javax.transaction.TransactionManager; import java.util.concurrent.CountDownLatch; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Tests READ_COMMITED isolation level. Modified: core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/SuspendTxTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,6 +1,5 @@ package org.jboss.cache.transaction; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,7 +1,6 @@ package org.jboss.cache.transaction.isolationlevels; import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; import org.jboss.cache.Fqn; import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AsyncRollbackTxTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,9 +1,10 @@ package org.jboss.cache.transaction.pessimistic; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -11,8 +12,6 @@ import javax.transaction.SystemException; import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Test behaviour of async rollback timeouted transaction 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/IsolationLevelNoneTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,12 +1,13 @@ package org.jboss.cache.transaction.pessimistic; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.Node; -import org.jboss.cache.transaction.TransactionSetup; +import org.jboss.cache.UnitTestCacheFactory; import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.IsolationLevel; +import org.jboss.cache.transaction.TransactionSetup; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; import org.testng.annotations.AfterMethod; @@ -15,8 +16,6 @@ import javax.transaction.NotSupportedException; import javax.transaction.SystemException; import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Tests whether modifications within callbacks (TreeCacheListener) are handled correctly 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -8,38 +8,24 @@ package org.jboss.cache.transaction.pessimistic; -import org.jboss.cache.CacheException; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.CacheSPI; -import org.jboss.cache.Fqn; -import org.jboss.cache.Node; -import org.jboss.cache.NodeSPI; -import org.jboss.cache.transaction.TransactionSetup; -import org.jboss.cache.transaction.GlobalTransaction; +import org.jboss.cache.*; import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.lock.LockManager; import static org.jboss.cache.lock.LockType.READ; import static org.jboss.cache.lock.LockType.WRITE; -import org.jboss.cache.util.CachePrinter; +import org.jboss.cache.transaction.GlobalTransaction; +import org.jboss.cache.transaction.TransactionSetup; import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import javax.transaction.*; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.jboss.cache.UnitTestCacheFactory; /** * Tests transactional access to a local CacheImpl. 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 2009-01-11 11:33:01 UTC (rev 7450) +++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java 2009-01-12 11:38:59 UTC (rev 7451) @@ -1,11 +1,12 @@ package org.jboss.cache.transaction.pessimistic; import org.jboss.cache.CacheException; -import org.jboss.cache.CacheFactory; import org.jboss.cache.CacheSPI; +import org.jboss.cache.UnitTestCacheFactory; +import org.jboss.cache.config.Configuration; import org.jboss.cache.transaction.TransactionSetup; import org.jboss.cache.transaction.TransactionTable; -import org.jboss.cache.config.Configuration; +import org.jboss.cache.util.TestingUtil; import static org.testng.AssertJUnit.assertEquals; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -14,8 +15,6 @@ import javax.transaction.Synchronization; import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import org.jboss.cache.UnitTestCacheFactory; -import org.jboss.cache.util.TestingUtil; /** * Created by IntelliJ IDEA.