[jboss-cvs] JBoss Messaging SVN: r5926 - in trunk/tests/src/org/jboss/messaging/tests: integration/basic and 31 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 25 05:04:34 EST 2009
Author: jmesnil
Date: 2009-02-25 05:04:34 -0500 (Wed, 25 Feb 2009)
New Revision: 5926
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/AIOTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/MultiThreadWriteNativeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/SingleThreadWriteNativeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/consumer/RedeliveryConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingIntegrationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueRecoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/session/SendAcknowledgementsTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
trunk/tests/src/org/jboss/messaging/tests/soak/chunk/MessageChunkSoakTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/journal/ValidateTransactionHealthTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AIOSequentialFileTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/EasyMockJournalTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/SimpleAddressManagerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/WildcardAddressManagerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBMSecurityManagerImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBossASSecurityManagerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/RepositoryTest.java
Log:
fixed test fixture
* added calls to super methods for all setUp/tearDown
* super.tearDown() must be called *last* when overriding tearDown()
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/AIOTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/AIOTestBase.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/AIOTestBase.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -67,8 +67,9 @@
@Override
protected void tearDown() throws Exception
{
+ assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
+
super.tearDown();
- assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
}
protected void encodeBufer(final ByteBuffer buffer)
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/MultiThreadWriteNativeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/MultiThreadWriteNativeTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/MultiThreadWriteNativeTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -68,12 +68,6 @@
position.set(0);
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
public void testMultipleASynchronousWrites() throws Throwable
{
executeTest(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/SingleThreadWriteNativeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/SingleThreadWriteNativeTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/asyncio/SingleThreadWriteNativeTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -59,18 +59,6 @@
log.debug(msg);
}
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
/**
* Opening and closing a file immediately can lead to races on the native layer,
* creating crash conditions.
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -230,6 +230,7 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -78,12 +78,6 @@
// Protected -----------------------------------------------------
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
protected void testChunks(final boolean realFiles,
final boolean useFile,
final boolean preAck,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -617,9 +617,9 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
log.info("\n*********************************************************************************\nDone with " + this.getName() +
"\n*********************************************************************************");
+ super.tearDown();
}
protected void testPageOnLargeMessage(final boolean realFiles, final boolean sendBlocking) throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -101,6 +101,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl config = new ConfigurationImpl();
config.setSecurityEnabled(false);
config.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -81,12 +81,6 @@
clearData();
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
// Private -------------------------------------------------------------------------------------------------------
private static final int MAX_CONSUMERS = 100;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -265,6 +265,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupConf.setQueueActivationTimeout(ACTIVATION_TIMEOUT);
@@ -298,6 +300,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -170,6 +170,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupConf.setClustered(true);
@@ -230,6 +232,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -229,6 +229,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -261,6 +263,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -191,6 +191,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -223,6 +225,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -267,6 +267,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -299,6 +301,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -183,6 +183,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -215,6 +217,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -166,6 +166,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -198,6 +200,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -185,6 +185,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -217,6 +219,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -329,6 +329,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -364,6 +366,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -90,6 +90,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration liveConf = new ConfigurationImpl();
liveConf.setSecurityEnabled(false);
liveConf.getAcceptorConfigurations()
@@ -106,6 +108,8 @@
service.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -215,6 +215,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
setUpFileBased(100 * 1024 * 1024);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -190,12 +190,6 @@
return 500;
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
protected void fail(final ClientSession session) throws Exception
{
RemotingConnectionImpl conn = (RemotingConnectionImpl)((ClientSessionImpl)session).getConnection();
@@ -207,13 +201,7 @@
}
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -616,6 +616,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration liveConf = new ConfigurationImpl();
liveConf.setSecurityEnabled(false);
liveConf.getAcceptorConfigurations()
@@ -632,6 +634,8 @@
service.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -277,6 +277,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -310,6 +312,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -162,6 +162,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setConnectionScanPeriod(100);
backupConf.setSecurityEnabled(false);
@@ -201,6 +203,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -827,6 +827,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
startServers();
}
@@ -834,6 +836,8 @@
protected void tearDown() throws Exception
{
stopServers();
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -178,6 +178,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration server1Conf = new ConfigurationImpl();
server1Conf.setSecurityEnabled(false);
server1Params.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -202,6 +204,8 @@
server0Service.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -216,6 +216,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -248,6 +250,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -92,6 +92,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
backupMBeanServer = MBeanServerFactory.createMBeanServer();
liveMBeanServer = MBeanServerFactory.createMBeanServer();
@@ -129,7 +131,7 @@
liveService.stop();
- assertEquals(0, InVMRegistry.instance.size());
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -53,6 +53,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/consumer/RedeliveryConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/consumer/RedeliveryConsumerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/consumer/RedeliveryConsumerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -224,12 +224,6 @@
// Protected -----------------------------------------------------
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
/**
* @param persistDeliveryCountBeforeDelivery
* @throws Exception
@@ -257,11 +251,12 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
if (messagingService != null && messagingService.isStarted())
{
messagingService.stop();
}
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -355,9 +355,6 @@
i++;
}
}
- protected void setUp() throws Exception
- {
- }
@Override
protected void tearDown() throws Exception
@@ -372,6 +369,8 @@
acceptor.stop();
acceptor = null;
}
+
+ super.tearDown();
}
class SimpleBufferHandler extends AbstractBufferHandler
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -320,6 +320,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -353,6 +355,8 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -78,6 +78,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
@@ -132,6 +134,8 @@
service = null;
}
+
+ super.tearDown();
}
public void testPreCommitAcks() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -308,6 +308,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
mbeanServer = MBeanServerFactory.createMBeanServer();
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -200,7 +200,8 @@
@Override
protected void setUp() throws Exception
{
-
+ super.setUp();
+
mbeanServer = MBeanServerFactory.createMBeanServer();
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -65,12 +65,6 @@
}
@Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- @Override
protected SequentialFileFactory createFactory()
{
return new AIOSequentialFileFactory(getTestDir());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -61,12 +61,6 @@
}
@Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- @Override
protected SequentialFileFactory getFileFactory() throws Exception
{
File file = new File(getTestDir());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -205,6 +205,21 @@
// Package protected ---------------------------------------------
@Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
+
+ Set set = mbeanServer.queryNames(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null);
+
+ for (Object objectName : set)
+ {
+ mbeanServer.unregisterMBean((ObjectName)objectName);
+ }
+ }
+
+ @Override
protected void tearDown() throws Exception
{
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -176,6 +176,7 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -397,6 +397,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
mbeanServer = MBeanServerFactory.createMBeanServer();
Configuration conf = new ConfigurationImpl();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -135,12 +135,6 @@
// Protected -----------------------------------------------------
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
// Private -------------------------------------------------------
/** This method will leave garbage on paging.
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingIntegrationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingIntegrationTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingIntegrationTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -68,12 +68,6 @@
fileJournalDir.mkdirs();
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -69,12 +69,6 @@
// Public --------------------------------------------------------
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
public void testSendReceivePaging() throws Exception
{
clearData();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -238,6 +238,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -218,6 +218,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -288,6 +288,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
configuration.setMessageExpiryScanPeriod(1000);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -543,10 +543,14 @@
}
messagingService = null;
clientSession = null;
+
+ super.tearDown();
}
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueRecoveryTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueRecoveryTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -185,10 +185,14 @@
}
messagingService = null;
clientSession = null;
+
+ super.tearDown();
}
protected void setUp() throws Exception
{
+ super.setUp();
+
clearData();
configuration = createFileConfig();
configuration.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/SoloQueueTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -552,10 +552,14 @@
}
messagingService = null;
clientSession = null;
+
+ super.tearDown();
}
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -59,6 +59,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
super.clearData();
configuration = createDefaultConfig();
configuration.setSecurityEnabled(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/session/SendAcknowledgementsTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/session/SendAcknowledgementsTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/session/SendAcknowledgementsTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -68,12 +68,12 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
-
if (messagingService != null && messagingService.isStarted())
{
messagingService.stop();
}
+
+ super.tearDown();
}
public void testSendAcknowledgements() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -794,6 +794,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setWildcardRoutingEnabled(true);
configuration.setSecurityEnabled(false);
@@ -836,5 +838,7 @@
}
messagingService = null;
clientSession = null;
+
+ super.tearDown();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -72,6 +72,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
clearData();
addressSettings.clear();
configuration = createDefaultConfig();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -63,6 +63,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
clearData();
addressSettings.clear();
configuration = createDefaultConfig();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -69,6 +69,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
addressSettings.clear();
configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
@@ -112,6 +114,8 @@
}
messagingService = null;
clientSession = null;
+
+ super.tearDown();
}
public void testSimpleTimeoutOnSendOnCommit() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -62,12 +62,6 @@
// Public --------------------------------------------------------
@Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- @Override
protected void setUp() throws Exception
{
super.setUp();
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -50,8 +50,9 @@
protected void tearDown() throws Exception
{
+ assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
+
super.tearDown();
- assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
}
public void testAIO() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/soak/chunk/MessageChunkSoakTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/soak/chunk/MessageChunkSoakTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/soak/chunk/MessageChunkSoakTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -68,12 +68,6 @@
// Protected -----------------------------------------------------
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/chunk/MessageChunkStressTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -45,12 +45,7 @@
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
-
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
+
public void testMessageChunkFilePersistence1M() throws Exception
{
// testChunks(true, true, false, true, false, 1000, 262144, 120000, 0, -1, false);
@@ -61,12 +56,6 @@
// Protected -----------------------------------------------------
- @Override
- protected void tearDown() throws Exception
- {
- //super.tearDown();
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -208,19 +208,15 @@
// Protected -----------------------------------------------------
@Override
- protected void setUp()
+ protected void setUp() throws Exception
{
+ super.setUp();
+
File file = new File(getTestDir());
deleteDirectory(file);
file.mkdirs();
}
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/journal/ValidateTransactionHealthTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/journal/ValidateTransactionHealthTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/journal/ValidateTransactionHealthTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -99,14 +99,10 @@
// Protected -----------------------------------------------------
@Override
- protected void tearDown() throws Exception
+ protected void setUp() throws Exception
{
- super.tearDown();
- }
-
- @Override
- protected void setUp()
- {
+ super.setUp();
+
File file = new File(getTestDir());
deleteDirectory(file);
file.mkdir();
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -326,8 +326,9 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
clearData();
- super.setUp();
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -54,12 +54,6 @@
}
}
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
-
protected SequentialFileFactory getFileFactory() throws Exception
{
File file = new File(getTestDir());
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -62,9 +62,9 @@
public void tearDown() throws Exception
{
- super.tearDown();
+ scheduledExecutor.shutdownNow();
- scheduledExecutor.shutdownNow();
+ super.tearDown();
}
// The tests ----------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -53,6 +53,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
repository = EasyMock.createStrictMock(HierarchicalRepository.class);
DeploymentManager deploymentManager = EasyMock.createNiceMock(DeploymentManager.class);
addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, repository);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -62,6 +62,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
DeploymentManager deploymentManager = EasyMock.createNiceMock(DeploymentManager.class);
deployer = new BasicSecurityDeployer(deploymentManager);
}
@@ -69,6 +71,8 @@
protected void tearDown() throws Exception
{
deployer = null;
+
+ super.tearDown();
}
private void deploy(String xml) throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -61,6 +61,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
repository = EasyMock.createStrictMock(HierarchicalRepository.class);
DeploymentManager deploymentManager = EasyMock.createNiceMock(DeploymentManager.class);
deployer = new SecurityDeployer(deploymentManager, repository);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AIOSequentialFileTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AIOSequentialFileTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AIOSequentialFileTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -459,8 +459,10 @@
// Protected -----------------------------------------------------
@Override
- protected void setUp()
+ protected void setUp() throws Exception
{
+ super.setUp();
+
mockFile = null;
File testDir = new File(getTestDir());
testDir.mkdirs();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -1341,8 +1341,6 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
-
if (journalImpl != null)
{
try
@@ -1353,6 +1351,8 @@
{
}
}
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/EasyMockJournalTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/EasyMockJournalTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/EasyMockJournalTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -335,8 +335,6 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
-
if (journalImpl != null)
{
EasyMock.reset(mockFactory, file1, file2);
@@ -350,11 +348,14 @@
}
}
+ super.tearDown();
}
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
journalImpl = newJournal();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -34,11 +34,6 @@
*/
public class FakeSequentialFileFactoryTest extends SequentialFileFactoryTestBase
{
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- }
@Override
protected SequentialFileFactory createFactory()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalAsyncTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -330,8 +330,6 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
-
if (journalImpl != null)
{
try
@@ -342,6 +340,8 @@
{
}
}
+
+ super.tearDown();
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/JournalImplTestBase.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -89,8 +89,6 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
-
if (journal != null)
{
try
@@ -107,6 +105,8 @@
journal = null;
assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
+
+ super.tearDown();
}
protected void resetFileFactory() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -55,8 +55,9 @@
@Override
protected void tearDown() throws Exception
{
+ assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
+
super.tearDown();
- assertEquals(0, AsynchronousFileImpl.getTotalMaxIO());
}
protected abstract SequentialFileFactory createFactory();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/SimpleAddressManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/SimpleAddressManagerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/SimpleAddressManagerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -36,6 +36,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
sam = new SimpleAddressManager();
}
//
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/WildcardAddressManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/WildcardAddressManagerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/WildcardAddressManagerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -30,6 +30,8 @@
{
protected void setUp() throws Exception
{
+ super.setUp();
+
sam = new WildcardAddressManager();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -64,6 +64,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
securityManager = new JAASSecurityManager();
final String domainName = SimpleLogingModule.class.getName();
@@ -88,6 +90,8 @@
protected void tearDown() throws Exception
{
securityManager = null;
+
+ super.tearDown();
}
public void testValidatingUser()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBMSecurityManagerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBMSecurityManagerImplTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBMSecurityManagerImplTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -40,12 +40,16 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
securityManager = new JBMSecurityManagerImpl(true);
}
protected void tearDown() throws Exception
{
securityManager = null;
+
+ super.tearDown();
}
public void testDefaultSecurity()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBossASSecurityManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBossASSecurityManagerTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBossASSecurityManagerTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -48,12 +48,16 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
securityManager = new JBossASSecurityManager();
}
protected void tearDown() throws Exception
{
securityManager = null;
+
+ super.tearDown();
}
public void testValidatingUser()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -46,12 +46,16 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
securityStore = new SecurityStoreImpl(1000000000, true);
}
protected void tearDown() throws Exception
{
securityStore = null;
+
+ super.tearDown();
}
public void testSuccessfulAuthentication() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/RepositoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/RepositoryTest.java 2009-02-25 04:22:25 UTC (rev 5925)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/RepositoryTest.java 2009-02-25 10:04:34 UTC (rev 5926)
@@ -41,6 +41,8 @@
protected void setUp() throws Exception
{
+ super.setUp();
+
securityRepository = new HierarchicalObjectRepository<HashSet<Role>>();
}
More information about the jboss-cvs-commits
mailing list