[jboss-cvs] JBoss Messaging SVN: r5922 - in trunk/tests/src/org/jboss/messaging/tests: integration/clientcrash and 35 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 24 11:35:40 EST 2009
Author: jmesnil
Date: 2009-02-24 11:35:40 -0500 (Tue, 24 Feb 2009)
New Revision: 5922
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientSessionFactoryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.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/RandomFailoverTest.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/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/JMSServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.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/management/SecurityManagementTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/ssl/CoreClientOverSSLTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/jms/bridge/impl/BridgeImplTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/util/TokenBucketLimiterImplTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/management/impl/ManagementHelperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/TransportConfigurationTest.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/deployers/impl/XMLDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/RoleInfoTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/messagecounter/impl/MessageCounterHelperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MessagingIOSessionDataStructureFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.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/AddressSettingsTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/RepositoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/version/impl/VersionImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossDestinationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTopicTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/bridge/impl/BridgeImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMapMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossStreamMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSExceptionHelperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/SubscriptionInfoTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/ConnectionFactoryControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/ConcurrentHashSetTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/SimpleStringTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/UTF8Test.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDGeneratorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/VariableLatchTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java
trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
Log:
all our tests inherits from UnitTestCase
* in UnitTestCase.setUp(), clear the InVMRegistry so that a failure in a previous test (leaving invm acceptors registered) won't make this test fails too.
* in UnitTestCase.tearDown(), assert that the InVMRegistry is empty
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -23,8 +23,6 @@
import java.util.concurrent.CountDownLatch;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -42,12 +40,13 @@
import org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor;
import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
-public class AutoGroupClientTest extends TestCase
+public class AutoGroupClientTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(AutoGroupClientTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -24,7 +24,6 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import junit.framework.TestCase;
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
@@ -43,6 +42,7 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -50,7 +50,7 @@
*
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*/
-public class ClientRequestorTest extends TestCase
+public class ClientRequestorTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientSessionFactoryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientSessionFactoryImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientSessionFactoryImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,12 +22,11 @@
package org.jboss.messaging.tests.integration.basic;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientSessionFactory;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
@@ -36,7 +35,7 @@
*
*
*/
-public class ClientSessionFactoryImplTest extends TestCase
+public class ClientSessionFactoryImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,8 +22,6 @@
package org.jboss.messaging.tests.integration.basic;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -37,9 +35,10 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
-public class CoreClientTest extends TestCase
+public class CoreClientTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(CoreClientTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.integration.clientcrash;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientSession;
@@ -38,6 +37,7 @@
import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
import org.jboss.messaging.tests.util.SpawnedVMSupport;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -52,7 +52,7 @@
*
* $Id$
*/
-public class ClientExitTest extends TestCase
+public class ClientExitTest extends UnitTestCase
{
// Constants ------------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,14 +25,13 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A BridgeTestBase
@@ -43,7 +42,7 @@
*
*
*/
-public abstract class BridgeTestBase extends TestCase
+public abstract class BridgeTestBase extends UnitTestCase
{
protected MessagingService createMessagingServiceNIO(final int id, final Map<String, Object> params)
{
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -45,6 +43,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -57,7 +56,7 @@
*
*
*/
-public class ActivationTimeoutTest extends TestCase
+public class ActivationTimeoutTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(SimpleAutomaticFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,8 +27,6 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -47,6 +45,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.Pair;
import org.jboss.messaging.util.SimpleString;
@@ -60,7 +59,7 @@
*
*
*/
-public class AutomaticFailoverWithDiscoveryTest extends TestCase
+public class AutomaticFailoverWithDiscoveryTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(AutomaticFailoverWithDiscoveryTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,8 +26,6 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -45,6 +43,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -59,7 +58,7 @@
*
*
*/
-public class FailBackupServerTest extends TestCase
+public class FailBackupServerTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailBackupServerTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -45,6 +43,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -57,7 +56,7 @@
*
*
*/
-public class FailoverExpiredMessageTest extends TestCase
+public class FailoverExpiredMessageTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailoverExpiredMessageTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,8 +27,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -49,6 +47,7 @@
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -61,7 +60,7 @@
*
*
*/
-public class FailoverManagementTest extends TestCase
+public class FailoverManagementTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailoverManagementTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -42,6 +40,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -55,7 +54,7 @@
*
*
*/
-public class FailoverNoSessionsFailoverTest extends TestCase
+public class FailoverNoSessionsFailoverTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailoverNoSessionsFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -24,8 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -44,12 +42,13 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
-public class FailoverPreAcknowledgeTest extends TestCase
+public class FailoverPreAcknowledgeTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailoverPreAcknowledgeTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -46,6 +44,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -57,7 +56,7 @@
* Created 5 Nov 2008 11:18:51
*
*/
-public class FailoverScheduledMessageTest extends TestCase
+public class FailoverScheduledMessageTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailoverScheduledMessageTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryInternal;
@@ -43,6 +41,7 @@
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
*
@@ -56,7 +55,7 @@
*
*
*/
-public class FailureListenerOnFailoverTest extends TestCase
+public class FailureListenerOnFailoverTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailureListenerOnFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,8 +22,6 @@
package org.jboss.messaging.tests.integration.cluster.failover;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -42,6 +40,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -54,7 +53,7 @@
*
*
*/
-public class FailureOnCreateConnectionTest extends TestCase
+public class FailureOnCreateConnectionTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailureOnCreateConnectionTest.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -21,8 +21,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -41,6 +39,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -48,7 +47,7 @@
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*/
-public class RandomFailoverTest extends TestCase
+public class RandomFailoverTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(RandomFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,8 +22,6 @@
package org.jboss.messaging.tests.integration.cluster.failover;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -42,6 +40,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -54,7 +53,7 @@
*
*
*/
-public class ReconnectTest extends TestCase
+public class ReconnectTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(ReconnectTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -45,6 +43,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -57,7 +56,7 @@
*
*
*/
-public class ReconnectWithBackupTest extends TestCase
+public class ReconnectWithBackupTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(ReconnectWithBackupTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -44,8 +44,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryInternal;
@@ -59,6 +57,7 @@
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
*
@@ -72,7 +71,7 @@
* is replicated to backup.
*
*/
-public class ReplicateConnectionFailureTest extends TestCase
+public class ReplicateConnectionFailureTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(ReplicateConnectionFailureTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -29,8 +29,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -52,6 +50,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -61,7 +60,7 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*/
-public class SimpleAutomaticFailoverTest extends TestCase
+public class SimpleAutomaticFailoverTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(SimpleAutomaticFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,8 +27,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -49,6 +47,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -58,7 +57,7 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*/
-public class SimpleManualFailoverTest extends TestCase
+public class SimpleManualFailoverTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(SimpleManualFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,8 +27,6 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -49,6 +47,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -63,7 +62,7 @@
*
*
*/
-public class SplitBrainTest extends TestCase
+public class SplitBrainTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(FailBackupServerTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -29,8 +29,6 @@
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -40,13 +38,14 @@
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A ReplicationAwareAddressControlWrapperTest
*
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*/
-public class ReplicationAwareTestBase extends TestCase
+public class ReplicationAwareTestBase extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -54,8 +54,6 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientSessionImpl;
import org.jboss.messaging.core.config.Configuration;
@@ -71,6 +69,7 @@
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.client.JBossSession;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -86,7 +85,7 @@
*
*
*/
-public class JMSFailoverTest extends TestCase
+public class JMSFailoverTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(JMSFailoverTest.class);
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -46,8 +46,6 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -59,12 +57,13 @@
import org.jboss.messaging.jms.client.JBossSession;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.tests.integration.jms.management.NullInitialContext;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
-public class ConsumerTest extends TestCase
+public class ConsumerTest extends UnitTestCase
{
private MessagingService service;
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -56,8 +56,6 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -69,6 +67,7 @@
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A QueueControlTest
@@ -79,7 +78,7 @@
*
*
*/
-public class JMSQueueControlTest extends TestCase
+public class JMSQueueControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -36,8 +36,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
@@ -53,6 +51,7 @@
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.ConnectionFactoryControlMBean;
import org.jboss.messaging.jms.server.management.JMSServerControlMBean;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A QueueControlTest
@@ -63,7 +62,7 @@
*
*
*/
-public class JMSServerControlTest extends TestCase
+public class JMSServerControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -32,8 +32,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -43,6 +41,7 @@
import org.jboss.messaging.jms.JBossTopic;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.TopicControlMBean;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A TopicControlTest
@@ -53,7 +52,7 @@
*
*
*/
-public class TopicControlTest extends TestCase
+public class TopicControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
@@ -76,11 +75,6 @@
// Constructors --------------------------------------------------
- public TopicControlTest(String name)
- {
- super(name);
- }
-
// Public --------------------------------------------------------
public void testGetXXXSubscriptionsCount() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -30,8 +30,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
@@ -44,6 +42,7 @@
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A AcceptorControlTest
@@ -54,7 +53,7 @@
*
*
*/
-public class AcceptorControlTest extends TestCase
+public class AcceptorControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,10 +27,10 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomPositiveInt;
import static org.jboss.messaging.tests.util.RandomUtil.randomPositiveLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.jboss.messaging.core.config.cluster.BridgeConfiguration;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.Pair;
/**
@@ -41,7 +41,7 @@
* Created 11 dec. 2008 17:38:58
*
*/
-public class BridgeControlTest extends TestCase
+public class BridgeControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -33,8 +33,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
@@ -43,6 +41,7 @@
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.Pair;
/**
@@ -54,7 +53,7 @@
*
*
*/
-public class BroadcastGroupControlTest extends TestCase
+public class BroadcastGroupControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -29,14 +29,13 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.DiscoveryGroupControlMBean;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A AcceptorControlTest
@@ -47,7 +46,7 @@
*
*
*/
-public class DiscoveryGroupControlTest extends TestCase
+public class DiscoveryGroupControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -43,8 +43,6 @@
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.management.impl.ManagementHelper;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.AddressControlMBean;
@@ -57,6 +55,7 @@
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/*
@@ -64,7 +63,7 @@
*
* @version <tt>$Revision$</tt>
*/
-public class ManagementServiceImplTest extends TestCase
+public class ManagementServiceImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -30,8 +30,6 @@
import javax.management.MBeanServerFactory;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -40,6 +38,7 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A QueueControlTest
@@ -50,7 +49,7 @@
*
*
*/
-public class MessagingServerControlTest extends TestCase
+public class MessagingServerControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -28,8 +28,6 @@
import java.util.Set;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
@@ -44,6 +42,7 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -52,7 +51,7 @@
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
-public class NotificationTest extends TestCase
+public class NotificationTest extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -29,8 +29,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -45,6 +43,7 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -56,7 +55,7 @@
*
*
*/
-public class QueueControlTest extends TestCase
+public class QueueControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.integration.management;
import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS;
-import junit.framework.TestCase;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientRequestor;
@@ -35,6 +34,7 @@
import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -43,7 +43,7 @@
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
-public abstract class SecurityManagementTestBase extends TestCase
+public abstract class SecurityManagementTestBase extends UnitTestCase
{
// Constants -----------------------------------------------------
@@ -65,6 +65,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
service = setupAndStartMessagingService();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,19 +22,18 @@
package org.jboss.messaging.tests.integration.security;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.tests.util.SpawnedVMSupport;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*/
-public abstract class SecurityManagerClientTestBase extends TestCase
+public abstract class SecurityManagerClientTestBase extends UnitTestCase
{
// Constants ------------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -49,6 +49,8 @@
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertFalse(q.isDurable());
+
+ session.close();
}
public void testDurableTrue() throws Exception
@@ -58,6 +60,8 @@
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertTrue(q.isDurable());
+
+ session.close();
}
public void testTemporaryFalse() throws Exception
@@ -67,6 +71,8 @@
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertFalse(q.isTemporary());
+
+ session.close();
}
public void testTemporaryTrue() throws Exception
@@ -76,6 +82,8 @@
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertTrue(q.isTemporary());
+
+ session.close();
}
public void testcreateWithFilter() throws Exception
@@ -86,6 +94,8 @@
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertEquals(q.getFilter().getFilterString(), filterString);
+
+ session.close();
}
public void testAddressSettingUSed() throws Exception
@@ -98,6 +108,8 @@
session.createQueue(address, queueName, filterString, false, false);
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
assertTrue(binding.getBindable() instanceof SoloQueueImpl);
+
+ session.close();
}
@Override
@@ -111,10 +123,12 @@
@Override
protected void tearDown() throws Exception
{
- super.tearDown();
if(messagingService != null && messagingService.isStarted())
{
messagingService.stop();
}
+
+ super.tearDown();
+
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/ssl/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/ssl/CoreClientOverSSLTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/ssl/CoreClientOverSSLTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,12 +22,11 @@
package org.jboss.messaging.tests.integration.ssl;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -36,7 +35,7 @@
* @version <tt>$Revision: 3716 $</tt>
*
*/
-public class CoreClientOverSSLTest extends TestCase
+public class CoreClientOverSSLTest extends UnitTestCase
{
// Constants -----------------------------------------------------
@@ -59,11 +58,6 @@
// Constructors --------------------------------------------------
- public CoreClientOverSSLTest(String name)
- {
- super(name);
- }
-
// Public --------------------------------------------------------
public void testDummy()
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/jms/bridge/impl/BridgeImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/jms/bridge/impl/BridgeImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/jms/bridge/impl/BridgeImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -45,13 +45,12 @@
import javax.jms.Session;
import javax.transaction.TransactionManager;
-import junit.framework.TestCase;
-
import org.easymock.IAnswer;
import org.jboss.messaging.jms.bridge.ConnectionFactoryFactory;
import org.jboss.messaging.jms.bridge.DestinationFactory;
import org.jboss.messaging.jms.bridge.QualityOfServiceMode;
import org.jboss.messaging.jms.bridge.impl.BridgeImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -59,7 +58,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class BridgeImplTest extends TestCase
+public class BridgeImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/util/TokenBucketLimiterImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/util/TokenBucketLimiterImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/util/TokenBucketLimiterImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,9 +22,8 @@
package org.jboss.messaging.tests.timing.util;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.TokenBucketLimiterImpl;
/**
@@ -34,7 +33,7 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*/
-public class TokenBucketLimiterImplTest extends TestCase
+public class TokenBucketLimiterImplTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(TokenBucketLimiterImplTest.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/util/UTF8Test.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,9 +22,8 @@
package org.jboss.messaging.tests.timing.util;
-import junit.framework.TestCase;
-
import org.jboss.messaging.integration.transports.netty.ChannelBufferWrapper;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.UTF8Util;
/**
@@ -37,7 +36,7 @@
*
*
*/
-public class UTF8Test extends TestCase
+public class UTF8Test extends UnitTestCase
{
private final String str = "abcdef&^*&!^ghijkl\uB5E2\uCAC7\uB2BB\uB7DD\uB7C7\uB3A3\uBCE4\uB5A5" + "abcdef&^*&!^ghijkl\uB5E2\uCAC7\uB2BB\uB7DD\uB7C7\uB3A3\uBCE4\uB5A5"
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/management/impl/ManagementHelperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/management/impl/ManagementHelperTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/management/impl/ManagementHelperTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -31,13 +31,12 @@
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.client.management.impl.ManagementHelper;
import org.jboss.messaging.core.management.RoleInfo;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/*
@@ -45,7 +44,7 @@
*
* @version <tt>$Revision$</tt>
*/
-public class ManagementHelperTest extends TestCase
+public class ManagementHelperTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -32,11 +32,10 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.server.JournalType;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -46,7 +45,7 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*/
-public class ConfigurationImplTest extends TestCase
+public class ConfigurationImplTest extends UnitTestCase
{
protected Configuration conf;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,9 +22,8 @@
package org.jboss.messaging.tests.unit.core.config.impl;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.impl.FileConfiguration;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
@@ -37,7 +36,7 @@
*
*
*/
-public class ConfigurationValidationTest extends TestCase
+public class ConfigurationValidationTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,13 +22,12 @@
package org.jboss.messaging.tests.unit.core.config.impl;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.cluster.QueueConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.deployers.impl.FileDeploymentManager;
import org.jboss.messaging.core.deployers.impl.QueueDeployer;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -39,7 +38,7 @@
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
-public class QueueDeployerTest extends TestCase
+public class QueueDeployerTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/TransportConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/TransportConfigurationTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/TransportConfigurationTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -24,9 +24,8 @@
package org.jboss.messaging.tests.unit.core.config.impl;
import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.tests.util.UnitTestCase;
-import junit.framework.TestCase;
-
/**
* A TransportConfigurationTest
*
@@ -36,7 +35,7 @@
*
*
*/
-public class TransportConfigurationTest extends TestCase
+public class TransportConfigurationTest extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,21 +22,20 @@
package org.jboss.messaging.tests.unit.core.deployers.impl;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.jboss.messaging.core.deployers.impl.AddressSettingsDeployer;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.AddressSettings;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.XMLUtil;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class AddressSettingsDeployerTest extends TestCase
+public class AddressSettingsDeployerTest extends UnitTestCase
{
private String conf = "<address-settings match=\"queues.*\">\n" +
" <manageConfirmations>false</manageConfirmations>\n" +
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,12 +22,11 @@
package org.jboss.messaging.tests.unit.core.deployers.impl;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.jboss.messaging.core.deployers.impl.BasicSecurityDeployer;
import org.jboss.messaging.core.security.JBMUpdateableSecurityManager;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -36,7 +35,7 @@
* tests BasicSecurityDeployer
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class BasicSecurityDeployerTest extends TestCase
+public class BasicSecurityDeployerTest extends UnitTestCase
{
private BasicSecurityDeployer deployer;
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,20 +25,19 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.jboss.messaging.core.deployers.impl.SecurityDeployer;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.settings.HierarchicalRepository;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class SecurityDeployerTest extends TestCase
+public class SecurityDeployerTest extends UnitTestCase
{
private SecurityDeployer deployer;
private String conf =
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/XMLDeployerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,9 +26,8 @@
import java.util.ArrayList;
import java.util.HashMap;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.deployers.impl.XmlDeployer;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -37,7 +36,7 @@
* tests the abstract xml deployer class
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class XMLDeployerTest extends TestCase
+public class XMLDeployerTest extends UnitTestCase
{
private static final String conf1 = "<deployment>\n" + " <test name=\"test1\">content1</test>\n"
+ " <test name=\"test2\">content2</test>\n"
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,13 +22,12 @@
package org.jboss.messaging.tests.unit.core.filter.impl;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -38,17 +37,12 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @version $Revision: 3514 $
*/
-public class FilterTest extends TestCase
+public class FilterTest extends UnitTestCase
{
private Filter filter;
private ServerMessage message;
- public FilterTest(String name)
- {
- super(name);
- }
-
protected void setUp() throws Exception
{
super.setUp();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -49,9 +49,8 @@
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.filter.impl.Operator;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -63,7 +62,7 @@
*
*
*/
-public class OperatorTest extends TestCase
+public class OperatorTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/MessageInfoTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -33,9 +33,8 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.management.MessageInfo;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -43,7 +42,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class MessageInfoTest extends TestCase
+public class MessageInfoTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/RoleInfoTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/RoleInfoTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/RoleInfoTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -28,9 +28,8 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.management.RoleInfo;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -38,7 +37,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class RoleInfoTest extends TestCase
+public class RoleInfoTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -38,14 +38,13 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.management.RoleInfo;
import org.jboss.messaging.core.management.impl.AddressControl;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.settings.HierarchicalRepository;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -54,7 +53,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class AddressControlTest extends TestCase
+public class AddressControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -30,30 +30,16 @@
import static org.easymock.EasyMock.verify;
import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import java.util.Set;
-
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import junit.framework.TestCase;
-
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.impl.AddressControl;
import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
-import org.jboss.messaging.core.management.impl.MessagingServerControl;
-import org.jboss.messaging.core.persistence.StorageManager;
-import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.remoting.server.RemotingService;
-import org.jboss.messaging.core.security.Role;
-import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.core.server.QueueFactory;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.AddressSettings;
-import org.jboss.messaging.core.transaction.ResourceManager;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -62,7 +48,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class ManagementServiceImplTest extends TestCase
+public class ManagementServiceImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,25 +26,11 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
-import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomXid;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.management.NotificationBroadcasterSupport;
-import javax.transaction.xa.Xid;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.management.impl.MessagingServerControl;
import org.jboss.messaging.core.messagecounter.MessageCounterManager;
@@ -52,16 +38,12 @@
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.remoting.server.RemotingService;
import org.jboss.messaging.core.security.Role;
-import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.QueueFactory;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.core.transaction.ResourceManager;
-import org.jboss.messaging.core.transaction.Transaction;
-import org.jboss.messaging.core.transaction.impl.XidImpl;
-import org.jboss.messaging.core.version.Version;
-import org.jboss.messaging.util.SimpleString;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* t
@@ -71,7 +53,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class MessagingServerControlTest extends TestCase
+public class MessagingServerControlTest extends UnitTestCase
{
private PostOffice postOffice;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -43,8 +43,6 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.management.QueueControlMBean;
@@ -58,6 +56,7 @@
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.AddressSettings;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -66,7 +65,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class QueueControlTest extends TestCase
+public class QueueControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/messagecounter/impl/MessageCounterHelperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/messagecounter/impl/MessageCounterHelperTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/messagecounter/impl/MessageCounterHelperTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -35,11 +35,10 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.messagecounter.MessageCounter;
import org.jboss.messaging.core.messagecounter.impl.MessageCounterHelper;
import org.jboss.messaging.core.server.Queue;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.DefaultHandler;
@@ -49,7 +48,7 @@
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
-public class MessageCounterHelperTest extends TestCase
+public class MessageCounterHelperTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/MessagingBufferTestBase.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -30,10 +30,10 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import static org.jboss.messaging.tests.util.UnitTestCase.assertEqualsByteArrays;
-import junit.framework.TestCase;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -41,7 +41,7 @@
*
* @version <tt>$Revision$</tt>
*/
-public abstract class MessagingBufferTestBase extends TestCase
+public abstract class MessagingBufferTestBase extends UnitTestCase
{
// Constants -----------------------------------------------------
@@ -58,6 +58,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
wrapper = createBuffer();
}
@@ -65,6 +67,8 @@
protected void tearDown() throws Exception
{
wrapper = null;
+
+ super.tearDown();
}
protected abstract MessagingBuffer createBuffer();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MessagingIOSessionDataStructureFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MessagingIOSessionDataStructureFactoryTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MessagingIOSessionDataStructureFactoryTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,11 +26,11 @@
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionAttributeMap;
import org.jboss.messaging.integration.transports.mina.MessagingIOSessionDataStructureFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -38,7 +38,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class MessagingIOSessionDataStructureFactoryTest extends TestCase
+public class MessagingIOSessionDataStructureFactoryTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,9 +25,8 @@
import java.io.File;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.remoting.impl.ssl.SSLSupport;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -35,7 +34,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class SSLSupportTest extends TestCase
+public class SSLSupportTest extends UnitTestCase
{
private String keyStorePath;
private String keyStorePassword;
@@ -55,6 +54,8 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
+
keyStorePath = "messaging.keystore";
keyStorePassword = "secureexample";
trustStorePath = "messaging.truststore";
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,9 +25,9 @@
import static org.jboss.messaging.core.security.CheckType.CREATE;
import static org.jboss.messaging.core.security.CheckType.READ;
import static org.jboss.messaging.core.security.CheckType.WRITE;
-import junit.framework.TestCase;
import org.jboss.messaging.core.security.Role;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -35,7 +35,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class RoleTest extends TestCase
+public class RoleTest extends UnitTestCase
{
// Constants -----------------------------------------------------
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -41,11 +41,10 @@
import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import javax.security.auth.spi.LoginModule;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.integration.security.JAASSecurityManager;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.security.SimpleGroup;
/**
@@ -53,7 +52,7 @@
*
*@author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*/
-public class JAASSecurityManagerTest extends TestCase
+public class JAASSecurityManagerTest extends UnitTestCase
{
private JAASSecurityManager securityManager;
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBMSecurityManagerImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -24,18 +24,17 @@
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* tests JBMSecurityManagerImpl
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class JBMSecurityManagerImplTest extends TestCase
+public class JBMSecurityManagerImplTest extends UnitTestCase
{
private JBMSecurityManagerImpl securityManager;
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/JBossASSecurityManagerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,13 +27,12 @@
import javax.security.auth.Subject;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.integration.security.JBossASSecurityManager;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
import org.jboss.security.SimplePrincipal;
@@ -43,7 +42,7 @@
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class JBossASSecurityManagerTest extends TestCase
+public class JBossASSecurityManagerTest extends UnitTestCase
{
private JBossASSecurityManager securityManager;
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.JBMSecurityManager;
@@ -34,6 +32,7 @@
import org.jboss.messaging.core.security.impl.SecurityStoreImpl;
import org.jboss.messaging.core.server.ServerSession;
import org.jboss.messaging.core.settings.HierarchicalRepository;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -41,7 +40,7 @@
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class SecurityStoreImplTest extends TestCase
+public class SecurityStoreImplTest extends UnitTestCase
{
SecurityStoreImpl securityStore;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,15 +22,14 @@
package org.jboss.messaging.tests.unit.core.settings.impl;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.settings.impl.AddressSettings;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class AddressSettingsTest extends TestCase
+public class AddressSettingsTest extends UnitTestCase
{
public void testDefaults()
{
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-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/RepositoryTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,17 +25,16 @@
import java.util.ArrayList;
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.Mergeable;
import org.jboss.messaging.core.settings.impl.HierarchicalObjectRepository;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class RepositoryTest extends TestCase
+public class RepositoryTest extends UnitTestCase
{
HierarchicalRepository<HashSet<Role>> securityRepository;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/version/impl/VersionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/version/impl/VersionImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/version/impl/VersionImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,9 +27,8 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.version.impl.VersionImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -37,7 +36,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class VersionImplTest extends TestCase
+public class VersionImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossDestinationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossDestinationTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossDestinationTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -29,13 +29,12 @@
import javax.jms.TemporaryTopic;
import javax.jms.Topic;
-import junit.framework.TestCase;
-
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.JBossTemporaryQueue;
import org.jboss.messaging.jms.JBossTemporaryTopic;
import org.jboss.messaging.jms.JBossTopic;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -43,7 +42,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossDestinationTest extends TestCase
+public class JBossDestinationTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossQueueTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossQueueTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -23,9 +23,9 @@
package org.jboss.messaging.tests.unit.jms;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -33,7 +33,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossQueueTest extends TestCase
+public class JBossQueueTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -27,10 +27,10 @@
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.jboss.messaging.jms.JBossTemporaryQueue;
import org.jboss.messaging.jms.client.JBossSession;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -38,7 +38,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossTemporaryQueueTest extends TestCase
+public class JBossTemporaryQueueTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -32,8 +32,6 @@
import javax.jms.Session;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
@@ -41,6 +39,7 @@
import org.jboss.messaging.jms.JBossTemporaryTopic;
import org.jboss.messaging.jms.client.JBossConnection;
import org.jboss.messaging.jms.client.JBossSession;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -49,7 +48,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossTemporaryTopicTest extends TestCase
+public class JBossTemporaryTopicTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTopicTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTopicTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTopicTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -23,9 +23,9 @@
package org.jboss.messaging.tests.unit.jms;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.jboss.messaging.jms.JBossTopic;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.Pair;
/**
@@ -34,7 +34,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossTopicTest extends TestCase
+public class JBossTopicTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/bridge/impl/BridgeImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/bridge/impl/BridgeImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/bridge/impl/BridgeImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -53,8 +53,6 @@
import javax.transaction.TransactionManager;
import javax.transaction.xa.XAResource;
-import junit.framework.TestCase;
-
import org.easymock.IAnswer;
import org.jboss.messaging.jms.bridge.Bridge;
import org.jboss.messaging.jms.bridge.ConnectionFactoryFactory;
@@ -62,6 +60,7 @@
import org.jboss.messaging.jms.bridge.QualityOfServiceMode;
import org.jboss.messaging.jms.bridge.impl.BridgeImpl;
import org.jboss.messaging.jms.client.JBossMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -69,7 +68,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class BridgeImplTest extends TestCase
+public class BridgeImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,6 @@
import javax.jms.MessageEOFException;
import javax.jms.MessageFormatException;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
@@ -34,6 +32,7 @@
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossBytesMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -41,7 +40,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossBytesMessageTest extends TestCase
+public class JBossBytesMessageTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -24,9 +24,8 @@
import javax.jms.Connection;
-import junit.framework.TestCase;
-
import org.jboss.messaging.jms.client.JBossConnectionFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -34,7 +33,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossConnectionFactoryTest extends TestCase
+public class JBossConnectionFactoryTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -33,10 +33,9 @@
import javax.jms.ConnectionMetaData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.version.Version;
import org.jboss.messaging.jms.client.JBossConnectionMetaData;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -44,7 +43,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossConnectionMetaDataTest extends TestCase
+public class JBossConnectionMetaDataTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,10 +22,9 @@
package org.jboss.messaging.tests.unit.jms.client;
-import junit.framework.TestCase;
-
import org.easymock.IArgumentMatcher;
import org.jboss.messaging.core.remoting.FailureListener;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -33,7 +32,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossConnectionTest extends TestCase
+public class JBossConnectionTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMapMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMapMessageTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMapMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -36,9 +36,8 @@
import javax.jms.MessageFormatException;
-import junit.framework.TestCase;
-
import org.jboss.messaging.jms.client.JBossMapMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -46,7 +45,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossMapMessageTest extends TestCase
+public class JBossMapMessageTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -38,8 +38,6 @@
import javax.jms.MessageListener;
import javax.jms.Session;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
@@ -52,6 +50,7 @@
import org.jboss.messaging.jms.client.JBossMessage;
import org.jboss.messaging.jms.client.JBossMessageConsumer;
import org.jboss.messaging.jms.client.JBossSession;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -59,7 +58,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossMessageConsumerTest extends TestCase
+public class JBossMessageConsumerTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -49,8 +49,6 @@
import javax.jms.Queue;
import javax.jms.Topic;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -64,6 +62,7 @@
import org.jboss.messaging.jms.client.JBossConnection;
import org.jboss.messaging.jms.client.JBossMessage;
import org.jboss.messaging.jms.client.JBossMessageProducer;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -72,7 +71,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossMessageProducerTest extends TestCase
+public class JBossMessageProducerTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -45,8 +45,6 @@
import javax.jms.Message;
import javax.jms.MessageFormatException;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
@@ -61,6 +59,7 @@
import org.jboss.messaging.jms.client.JBossObjectMessage;
import org.jboss.messaging.jms.client.JBossStreamMessage;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -69,7 +68,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossMessageTest extends TestCase
+public class JBossMessageTest extends UnitTestCase
{
private ClientSession clientSession;
private ClientMessage clientMessage;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -38,8 +38,6 @@
import javax.jms.DeliveryMode;
import javax.jms.ObjectMessage;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
@@ -47,6 +45,7 @@
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossObjectMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -54,7 +53,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossObjectMessageTest extends TestCase
+public class JBossObjectMessageTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -32,8 +32,6 @@
import javax.jms.Message;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
@@ -42,6 +40,7 @@
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.client.JBossMessage;
import org.jboss.messaging.jms.client.JBossQueueBrowser;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -50,7 +49,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossQueueBrowserTest extends TestCase
+public class JBossQueueBrowserTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,10 +26,9 @@
import javax.jms.Message;
import javax.jms.Session;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -37,7 +36,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossSessionTest extends TestCase
+public class JBossSessionTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossStreamMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossStreamMessageTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossStreamMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -39,10 +39,9 @@
import javax.jms.MessageEOFException;
import javax.jms.MessageFormatException;
-import junit.framework.TestCase;
-
import org.jboss.messaging.jms.client.JBossStreamMessage;
import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -50,7 +49,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossStreamMessageTest extends TestCase
+public class JBossStreamMessageTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -34,8 +34,6 @@
import javax.jms.DeliveryMode;
import javax.jms.TextMessage;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
@@ -43,6 +41,7 @@
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.jms.client.JBossTextMessage;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -50,7 +49,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JBossTextMessageTest extends TestCase
+public class JBossTextMessageTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSExceptionHelperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSExceptionHelperTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSExceptionHelperTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -28,10 +28,9 @@
import javax.jms.JMSException;
import javax.jms.JMSSecurityException;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.jms.client.JMSExceptionHelper;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -39,7 +38,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JMSExceptionHelperTest extends TestCase
+public class JMSExceptionHelperTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,7 +22,7 @@
package org.jboss.messaging.tests.unit.jms.client;
-import junit.framework.TestCase;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -30,7 +30,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JMSMessageListenerWrapperTest extends TestCase
+public class JMSMessageListenerWrapperTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -31,17 +31,16 @@
import javax.jms.Connection;
import javax.jms.ConnectionMetaData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossConnectionMetaData;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class ManifestTest extends TestCase
+public class ManifestTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Logger log = Logger.getLogger(ManifestTest.class);
@@ -51,11 +50,6 @@
// Constructors --------------------------------------------------
- public ManifestTest(String name)
- {
- super(name);
- }
-
// Public --------------------------------------------------------
public void testManifestEntries() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,7 +22,7 @@
package org.jboss.messaging.tests.unit.jms.referenceable;
-import junit.framework.TestCase;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -30,7 +30,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class ConnectionFactoryObjectFactoryTest extends TestCase
+public class ConnectionFactoryObjectFactoryTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,11 +26,10 @@
import javax.naming.Reference;
-import junit.framework.TestCase;
-
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.referenceable.DestinationObjectFactory;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -38,7 +37,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class DestinationObjectFactoryTest extends TestCase
+public class DestinationObjectFactoryTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/JMSMessageInfoTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -40,10 +40,9 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.jms.server.management.JMSMessageInfo;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -52,7 +51,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JMSMessageInfoTest extends TestCase
+public class JMSMessageInfoTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/SubscriptionInfoTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/SubscriptionInfoTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/SubscriptionInfoTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -29,9 +29,8 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.jboss.messaging.jms.server.management.SubscriptionInfo;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -39,7 +38,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class SubscriptionInfoTest extends TestCase
+public class SubscriptionInfoTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/ConnectionFactoryControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/ConnectionFactoryControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/ConnectionFactoryControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -33,11 +33,10 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.easymock.classextension.EasyMock;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.management.impl.ConnectionFactoryControl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -45,7 +44,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class ConnectionFactoryControlTest extends TestCase
+public class ConnectionFactoryControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -36,8 +36,6 @@
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.ReplicationOperationInvoker;
@@ -58,13 +56,14 @@
import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.jms.server.management.impl.JMSQueueControl;
import org.jboss.messaging.jms.server.management.impl.TopicControl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/*
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
* @version <tt>$Revision$</tt>
*/
-public class JMSManagementServiceImplTest extends TestCase
+public class JMSManagementServiceImplTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -43,8 +43,6 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.messagecounter.MessageCounter;
@@ -57,6 +55,7 @@
import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.server.management.impl.JMSQueueControl;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -65,7 +64,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JMSQueueControlTest extends TestCase
+public class JMSQueueControlTest extends UnitTestCase
{
private String jndiBinding;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -39,11 +39,10 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.impl.JMSServerControl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -51,7 +50,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JMSServerControlTest extends TestCase
+public class JMSServerControlTest extends UnitTestCase
{
private MBeanServer mbeanServer;
private ObjectName serverON;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,12 +26,12 @@
import static org.easymock.EasyMock.verify;
import static org.easymock.classextension.EasyMock.createMock;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.jms.JBossTopic;
import org.jboss.messaging.jms.server.management.impl.TopicControl;
+import org.jboss.messaging.tests.util.UnitTestCase;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -39,7 +39,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class TopicControlTest extends TestCase
+public class TopicControlTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/ConcurrentHashSetTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/ConcurrentHashSetTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/ConcurrentHashSetTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,8 +26,7 @@
import java.util.Iterator;
-import junit.framework.TestCase;
-
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.ConcurrentHashSet;
import org.jboss.messaging.util.ConcurrentSet;
@@ -37,7 +36,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class ConcurrentHashSetTest extends TestCase
+public class ConcurrentHashSetTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -34,8 +34,7 @@
import java.util.List;
import java.util.StringTokenizer;
-import junit.framework.TestCase;
-
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.ObjectInputStreamWithClassLoader;
/**
@@ -45,7 +44,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class ObjectInputStreamWithClassLoaderTest extends TestCase
+public class ObjectInputStreamWithClassLoaderTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/SimpleStringTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/SimpleStringTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/SimpleStringTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -23,8 +23,8 @@
package org.jboss.messaging.tests.unit.util;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import junit.framework.TestCase;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.DataConstants;
import org.jboss.messaging.util.SimpleString;
@@ -35,7 +35,7 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*/
-public class SimpleStringTest extends TestCase
+public class SimpleStringTest extends UnitTestCase
{
public void testString() throws Exception
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -32,12 +32,9 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomShort;
import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.UnitTestCase.assertEqualsByteArrays;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
import org.jboss.messaging.tests.util.UnitTestCase;
@@ -50,7 +47,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class TypedPropertiesTest extends TestCase
+public class TypedPropertiesTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/UTF8Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/UTF8Test.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/UTF8Test.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -28,13 +28,12 @@
import java.io.DataOutputStream;
import java.nio.ByteBuffer;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.ExpandingMessagingBuffer;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.netty.ChannelBufferWrapper;
import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.DataConstants;
import org.jboss.messaging.util.Random;
import org.jboss.messaging.util.UTF8Util;
@@ -48,7 +47,7 @@
*
*
*/
-public class UTF8Test extends TestCase
+public class UTF8Test extends UnitTestCase
{
public void testValidateUTF() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDGeneratorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDGeneratorTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDGeneratorTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,8 +22,6 @@
package org.jboss.messaging.tests.unit.util;
-import junit.framework.TestCase;
-
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.UUIDGenerator;
@@ -33,7 +31,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class UUIDGeneratorTest extends TestCase
+public class UUIDGeneratorTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/UUIDTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -25,8 +25,7 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
-
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.UUIDGenerator;
/**
@@ -35,7 +34,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class UUIDTest extends TestCase
+public class UUIDTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/VariableLatchTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/VariableLatchTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/VariableLatchTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -24,9 +24,8 @@
import java.util.concurrent.CountDownLatch;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.VariableLatch;
/**
@@ -34,7 +33,7 @@
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
*
*/
-public class VariableLatchTest extends TestCase
+public class VariableLatchTest extends UnitTestCase
{
private static final Logger log = Logger.getLogger(VariableLatchTest.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -26,9 +26,8 @@
import java.util.Properties;
-import junit.framework.TestCase;
-
import org.jboss.messaging.core.version.Version;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.VersionLoader;
/**
@@ -37,7 +36,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class VersionLoaderTest extends TestCase
+public class VersionLoaderTest extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/XMLUtilTest.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -22,8 +22,7 @@
package org.jboss.messaging.tests.unit.util;
-import junit.framework.TestCase;
-
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -34,27 +33,12 @@
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
*/
-public class XMLUtilTest extends TestCase
+public class XMLUtilTest extends UnitTestCase
{
// Constructors --------------------------------------------------
- public XMLUtilTest(String name)
- {
- super(name);
- }
-
// Public --------------------------------------------------------
- public void setUp() throws Exception
- {
- super.setUp();
- }
-
- public void tearDown() throws Exception
- {
- super.tearDown();
- }
-
public void testGetTextContext_1() throws Exception
{
String document = "<blah>foo</blah>";
Modified: trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2009-02-23 23:35:13 UTC (rev 5921)
+++ trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2009-02-24 16:35:40 UTC (rev 5922)
@@ -46,6 +46,7 @@
import org.jboss.messaging.core.journal.EncodingSupport;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
@@ -324,14 +325,19 @@
{
super.setUp();
+ InVMRegistry.instance.clear();
+
log.info("###### starting test " + this.getName());
}
@Override
protected void tearDown() throws Exception
{
+ deleteDirectory(new File(getTestDir()));
+
+ assertEquals(0, InVMRegistry.instance.size());
+
super.tearDown();
- deleteDirectory(new File(getTestDir()));
}
protected byte[] autoEncode(Object... args)
More information about the jboss-cvs-commits
mailing list