Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8960F182FC for ; Thu, 28 May 2015 15:18:53 +0000 (UTC) Received: (qmail 24897 invoked by uid 500); 28 May 2015 15:18:53 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 24603 invoked by uid 500); 28 May 2015 15:18:53 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 24157 invoked by uid 99); 28 May 2015 15:18:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 May 2015 15:18:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6393E10B7; Thu, 28 May 2015 15:18:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 28 May 2015 15:18:58 -0000 Message-Id: <73ef161f01904ce694f34e6394b98976@git.apache.org> In-Reply-To: <14a618e69d1240e0aa3c324e78a3546a@git.apache.org> References: <14a618e69d1240e0aa3c324e78a3546a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/21] activemq-artemis git commit: More test-suite refactoring http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java index 4f57287..b6a036a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java @@ -15,14 +15,6 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import org.junit.Before; -import org.junit.After; - -import java.util.Map; - -import javax.jms.QueueConnection; -import javax.jms.QueueSession; -import javax.jms.Session; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ResourceNames; @@ -32,9 +24,15 @@ import org.apache.activemq.artemis.api.jms.management.JMSQueueControl; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.client.ActiveMQQueue; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import javax.jms.QueueConnection; +import javax.jms.QueueSession; +import javax.jms.Session; +import java.util.Map; + /** * * A JMSQueueControlUsingJMSTest @@ -67,19 +65,6 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest connection.start(); } - @Override - @After - public void tearDown() throws Exception - { - connection.close(); - - connection = null; - - session = null; - - super.tearDown(); - } - @Ignore @Override @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java index 27e5901..ea79f7e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java @@ -16,22 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; -import java.util.Arrays; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.QueueControl; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; @@ -39,9 +23,6 @@ import org.apache.activemq.artemis.api.jms.management.JMSConnectionInfo; import org.apache.activemq.artemis.api.jms.management.JMSConsumerInfo; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; import org.apache.activemq.artemis.api.jms.management.JMSSessionInfo; -import org.apache.activemq.artemis.tests.unit.ra.BootstrapContext; -import org.apache.activemq.artemis.tests.unit.ra.MessageEndpointFactory; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; @@ -57,11 +38,29 @@ import org.apache.activemq.artemis.ra.inflow.ActiveMQActivation; import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.ra.BootstrapContext; +import org.apache.activemq.artemis.tests.unit.ra.MessageEndpointFactory; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.junit.After; import org.junit.Assert; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.jms.TemporaryTopic; +import javax.jms.TextMessage; +import javax.jms.Topic; +import java.util.Arrays; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + public class JMSServerControl2Test extends ManagementTestBase { private static final long CONNECTION_TTL = 1000; @@ -78,9 +77,9 @@ public class JMSServerControl2Test extends ManagementTestBase private void startActiveMQServer(final String acceptorFactory) throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(new TransportConfiguration(acceptorFactory)); - server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true)); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, true)); server.start(); context = new InVMNamingContext(); @@ -522,7 +521,7 @@ public class JMSServerControl2Test extends ManagementTestBase ra = new ActiveMQResourceAdapter(); - ra.setConnectorClassName("org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"); + ra.setConnectorClassName(INVM_CONNECTOR_FACTORY); ra.setUserName("userGlobal"); ra.setPassword("passwordGlobal"); ra.start(new BootstrapContext()); @@ -690,17 +689,6 @@ public class JMSServerControl2Test extends ManagementTestBase return ManagementControlHelper.createJMSServerControl(mbeanServer); } - @Override - @After - public void tearDown() throws Exception - { - serverManager = null; - - server = null; - - super.tearDown(); - } - // Private ------------------------------------------------------- private void doListConnectionIDs(final String acceptorFactory, final String connectorFactory) throws Exception http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java index 9d4c8db..828e80a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java @@ -16,38 +16,36 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.Queue; -import javax.jms.QueueRequestor; -import javax.jms.QueueSession; -import javax.jms.Session; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; -import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.jms.server.JMSServerManager; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.Queue; +import javax.jms.QueueRequestor; +import javax.jms.QueueSession; +import javax.jms.Session; + public class JMSServerControlRestartTest extends ManagementTestBase { @@ -61,13 +59,13 @@ public class JMSServerControlRestartTest extends ManagementTestBase String queueName = RandomUtil.randomString(); String binding = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = ManagementControlHelper.createJMSServerControl(mbeanServer); control.createQueue(queueName, binding); - Object o = ServiceTestBase.checkBinding(context, binding); + Object o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -75,13 +73,13 @@ public class JMSServerControlRestartTest extends ManagementTestBase serverManager.stop(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); serverManager = createJMSServer(); serverManager.start(); - o = ServiceTestBase.checkBinding(context, binding); + o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -94,7 +92,7 @@ public class JMSServerControlRestartTest extends ManagementTestBase String queueName = RandomUtil.randomString(); String binding = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName()); @@ -109,7 +107,7 @@ public class JMSServerControlRestartTest extends ManagementTestBase Assert.assertTrue(JMSManagementHelper.hasOperationSucceeded(reply)); connection.close(); - Object o = ServiceTestBase.checkBinding(context, binding); + Object o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -117,13 +115,13 @@ public class JMSServerControlRestartTest extends ManagementTestBase serverManager.stop(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); serverManager = createJMSServer(); serverManager.start(); - o = ServiceTestBase.checkBinding(context, binding); + o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -146,13 +144,11 @@ public class JMSServerControlRestartTest extends ManagementTestBase private JMSServerManager createJMSServer() throws Exception { - Configuration conf = createDefaultConfig() - .setSecurityEnabled(false) + Configuration config = createDefaultInVMConfig() .setJMXManagementEnabled(true) - .setPersistenceEnabled(true) - .setJournalType(JournalType.NIO) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, mbeanServer); + .setJournalType(JournalType.NIO); + + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer)); context = new InVMNamingContext(); @@ -161,15 +157,6 @@ public class JMSServerControlRestartTest extends ManagementTestBase return serverManager; } - @Override - @After - public void tearDown() throws Exception - { - serverManager.stop(); - serverManager = null; - super.tearDown(); - } - // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java index 2cecabb..1c96931 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java @@ -16,28 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XASession; -import javax.naming.NamingException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException; import org.apache.activemq.artemis.api.core.SimpleString; @@ -48,10 +26,6 @@ import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; -import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.postoffice.QueueBinding; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; @@ -64,18 +38,43 @@ import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.artemis.jms.client.ActiveMQMessageConsumer; import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory; import org.apache.activemq.artemis.jms.persistence.JMSStorageManager; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; -import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; import org.apache.activemq.artemis.jms.persistence.config.PersistedType; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.json.JSONArray; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; +import javax.jms.XASession; +import javax.naming.NamingException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class JMSServerControlTest extends ManagementTestBase { // Attributes ---------------------------------------------------- @@ -134,22 +133,22 @@ public class JMSServerControlTest extends ManagementTestBase String queueName = RandomUtil.randomString(); String bindingsCSV = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, bindingsCSV); + ActiveMQTestBase.checkNoBinding(context, bindingsCSV); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, bindingsCSV); - Object o = ServiceTestBase.checkBinding(context, bindings[0]); + Object o = ActiveMQTestBase.checkBinding(context, bindings[0]); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, bindings[1]); + o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, bindings[2]); + o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -172,22 +171,22 @@ public class JMSServerControlTest extends ManagementTestBase String queueName = RandomUtil.randomString(); String bindingsCSV = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, bindingsCSV); + ActiveMQTestBase.checkNoBinding(context, bindingsCSV); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, bindingsCSV); - Object o = ServiceTestBase.checkBinding(context, "first,first"); + Object o = ActiveMQTestBase.checkBinding(context, "first,first"); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, "second,second"); + o = ActiveMQTestBase.checkBinding(context, "second,second"); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, "third,third"); + o = ActiveMQTestBase.checkBinding(context, "third,third"); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -210,7 +209,7 @@ public class JMSServerControlTest extends ManagementTestBase String queueName = RandomUtil.randomString(); String bindingsCSV = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, bindingsCSV); + ActiveMQTestBase.checkNoBinding(context, bindingsCSV); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); @@ -218,7 +217,7 @@ public class JMSServerControlTest extends ManagementTestBase String selector = "foo='bar'"; control.createQueue(queueName, bindingsCSV, selector); - Object o = ServiceTestBase.checkBinding(context, bindings[0]); + Object o = ActiveMQTestBase.checkBinding(context, bindings[0]); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; // assertEquals(((ActiveMQDestination)queue).get); @@ -228,7 +227,7 @@ public class JMSServerControlTest extends ManagementTestBase .getFilter() .getFilterString() .toString()); - o = ServiceTestBase.checkBinding(context, bindings[1]); + o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -237,7 +236,7 @@ public class JMSServerControlTest extends ManagementTestBase .getFilter() .getFilterString() .toString()); - o = ServiceTestBase.checkBinding(context, bindings[2]); + o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -261,13 +260,13 @@ public class JMSServerControlTest extends ManagementTestBase String queueName = RandomUtil.randomString(); String binding = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, binding, null, false); - Object o = ServiceTestBase.checkBinding(context, binding); + Object o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -287,18 +286,18 @@ public class JMSServerControlTest extends ManagementTestBase String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); control.destroyQueue(queueName); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -310,13 +309,13 @@ public class JMSServerControlTest extends ManagementTestBase String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); ActiveMQConnectionFactory cf = @@ -330,7 +329,7 @@ public class JMSServerControlTest extends ManagementTestBase control.destroyQueue(queueName, true); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -367,13 +366,13 @@ public class JMSServerControlTest extends ManagementTestBase String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); @@ -397,7 +396,7 @@ public class JMSServerControlTest extends ManagementTestBase Assert.assertTrue(e.getMessage().startsWith("AMQ119025")); } - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNotNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -422,13 +421,13 @@ public class JMSServerControlTest extends ManagementTestBase String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); control.createTopic(topicName, topicJNDIBinding); - ServiceTestBase.checkBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkBinding(context, topicJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); @@ -452,7 +451,7 @@ public class JMSServerControlTest extends ManagementTestBase Assert.assertTrue(e.getMessage().startsWith("AMQ119025")); } - ServiceTestBase.checkBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkBinding(context, topicJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Assert.assertFalse(cons.isClosed()); @@ -474,13 +473,13 @@ public class JMSServerControlTest extends ManagementTestBase String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); control.createTopic(topicName, topicJNDIBinding); - ServiceTestBase.checkBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkBinding(context, topicJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); ActiveMQConnectionFactory cf = @@ -494,7 +493,7 @@ public class JMSServerControlTest extends ManagementTestBase control.destroyTopic(topicName, true); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); long time = System.currentTimeMillis(); @@ -529,17 +528,17 @@ public class JMSServerControlTest extends ManagementTestBase String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); ActiveMQConnectionFactory cf = - new ActiveMQConnectionFactory(false, new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY)); + new ActiveMQConnectionFactory(false, new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY)); cf.setReconnectAttempts(-1); ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection(); try @@ -550,7 +549,7 @@ public class JMSServerControlTest extends ManagementTestBase control.destroyQueue(queueName, true); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -610,24 +609,24 @@ public class JMSServerControlTest extends ManagementTestBase bindings[1] = RandomUtil.randomString(); bindings[2] = RandomUtil.randomString(); String topicJNDIBinding = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); control.createTopic(topicName, topicJNDIBinding); - Object o = ServiceTestBase.checkBinding(context, bindings[0]); + Object o = ActiveMQTestBase.checkBinding(context, bindings[0]); Assert.assertTrue(o instanceof Topic); Topic topic = (Topic) o; Assert.assertEquals(topicName, topic.getTopicName()); - o = ServiceTestBase.checkBinding(context, bindings[1]); + o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Topic); topic = (Topic) o; Assert.assertEquals(topicName, topic.getTopicName()); - o = ServiceTestBase.checkBinding(context, bindings[2]); + o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Topic); topic = (Topic) o; Assert.assertEquals(topicName, topic.getTopicName()); @@ -646,7 +645,7 @@ public class JMSServerControlTest extends ManagementTestBase String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); @@ -673,7 +672,7 @@ public class JMSServerControlTest extends ManagementTestBase control.destroyTopic(topicName); Assert.assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress)); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(topicName)); @@ -685,7 +684,7 @@ public class JMSServerControlTest extends ManagementTestBase String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); @@ -722,7 +721,7 @@ public class JMSServerControlTest extends ManagementTestBase control.destroyTopic(topicName); Assert.assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress)); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(topicName)); @@ -841,7 +840,9 @@ public class JMSServerControlTest extends ManagementTestBase Assert.assertEquals(true, cf.isFailoverOnInitialConnection()); Assert.assertEquals("tst", cf.getGroupID()); - stopServer(); + server.stop(); + + waitForServerToStop(server); startServer(); @@ -883,7 +884,9 @@ public class JMSServerControlTest extends ManagementTestBase ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(ActiveMQDefaultConfiguration.getDefaultJmxDomain()); Assert.assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test"))); - stopServer(); + server.stop(); + + waitForServerToStop(server); startServer(); @@ -1064,14 +1067,12 @@ public class JMSServerControlTest extends ManagementTestBase */ protected void startServer() throws Exception { - Configuration conf = createBasicConfig() - .setPersistenceEnabled(true) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY)) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)) - .addConnectorConfiguration("netty", new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY)) - .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + Configuration config = createDefaultNettyConfig() + .setJMXManagementEnabled(true) + .addConnectorConfiguration("netty", new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY)) + .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true)); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, true)); serverManager = new JMSServerManagerImpl(server); context = new InVMNamingContext(); @@ -1084,34 +1085,6 @@ public class JMSServerControlTest extends ManagementTestBase serverManager.replaceStorageManager(fakeJMSStorageManager); } - @Override - @After - public void tearDown() throws Exception - { - try - { - stopServer(); - } - finally - { - super.tearDown(); - } - } - - /** - * @throws Exception - */ - protected void stopServer() throws Exception - { - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; - } - protected JMSServerControl createManagementControl() throws Exception { return ManagementControlHelper.createJMSServerControl(mbeanServer); @@ -1130,7 +1103,7 @@ public class JMSServerControlTest extends ManagementTestBase for (Object cfJNDIBinding : cfJNDIBindings) { - ServiceTestBase.checkNoBinding(context, cfJNDIBinding.toString()); + ActiveMQTestBase.checkNoBinding(context, cfJNDIBinding.toString()); } checkNoResource(ObjectNameBuilder.DEFAULT.getConnectionFactoryObjectName(cfName)); @@ -1139,7 +1112,7 @@ public class JMSServerControlTest extends ManagementTestBase for (Object cfJNDIBinding : cfJNDIBindings) { - Object o = ServiceTestBase.checkBinding(context, cfJNDIBinding.toString()); + Object o = ActiveMQTestBase.checkBinding(context, cfJNDIBinding.toString()); Assert.assertTrue(o instanceof ConnectionFactory); ConnectionFactory cf = (ConnectionFactory) o; Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java index bab1042..d66a27c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java @@ -15,15 +15,6 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import org.junit.Assert; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import javax.jms.QueueConnection; -import javax.jms.QueueSession; -import javax.jms.Session; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; @@ -35,6 +26,13 @@ import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.client.ActiveMQQueue; import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import javax.jms.QueueConnection; +import javax.jms.QueueSession; +import javax.jms.Session; public class JMSServerControlUsingJMSTest extends JMSServerControlTest { @@ -158,19 +156,6 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest } @Override - @After - public void tearDown() throws Exception - { - connection.close(); - - connection = null; - - session = null; - - super.tearDown(); - } - - @Override protected JMSServerControl createManagementControl() throws Exception { ActiveMQQueue managementQueue = (ActiveMQQueue) ActiveMQJMSClient.createQueue("activemq.management"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java index d2f7d64..95a1f8f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlClusterTest.java @@ -15,14 +15,11 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; import org.apache.activemq.artemis.api.jms.management.TopicControl; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase; +import org.junit.Test; import javax.jms.Connection; import javax.jms.Session; @@ -31,19 +28,6 @@ import javax.jms.Topic; public class TopicControlClusterTest extends JMSClusteredTestBase { - @After - public void tearDown() throws Exception - { - super.tearDown(); - } - - - @Before - public void setUp() throws Exception - { - super.setUp(); - } - @Test public void testClusteredSubscriptionCount() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java index ca35dd4..292b448 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java @@ -16,29 +16,11 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.TopicSubscriber; -import javax.management.Notification; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; import org.apache.activemq.artemis.api.jms.management.SubscriptionInfo; import org.apache.activemq.artemis.api.jms.management.TopicControl; -import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.postoffice.Binding; import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; @@ -50,13 +32,28 @@ import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.artemis.jms.client.ActiveMQTopic; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.jms.server.management.JMSNotificationType; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.json.JSONArray; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.TopicSubscriber; +import javax.management.Notification; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class TopicControlTest extends ManagementTestBase { @@ -599,9 +596,9 @@ public class TopicControlTest extends ManagementTestBase { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory")); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, false)); server.start(); serverManager = new JMSServerManagerImpl(server); @@ -617,23 +614,6 @@ public class TopicControlTest extends ManagementTestBase topic = (ActiveMQTopic) ActiveMQJMSClient.createTopic(topicName); } - @Override - @After - public void tearDown() throws Exception - { - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; - - topic = null; - - super.tearDown(); - } - protected TopicControl createManagementControl() throws Exception { return ManagementControlHelper.createTopicControl(topic, mbeanServer); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java index bca3eea..6cbf043 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java @@ -15,30 +15,13 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; - -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.QueueConnection; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TopicSubscriber; - -import org.junit.Assert; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; @@ -48,7 +31,21 @@ import org.apache.activemq.artemis.jms.client.ActiveMQQueue; import org.apache.activemq.artemis.jms.client.ActiveMQTopic; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.QueueConnection; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TopicSubscriber; + +import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; public class TopicControlUsingJMSTest extends ManagementTestBase { @@ -443,9 +440,9 @@ public class TopicControlUsingJMSTest extends ManagementTestBase { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory")); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, false)); server.start(); serverManager = new JMSServerManagerImpl(server); @@ -471,32 +468,6 @@ public class TopicControlUsingJMSTest extends ManagementTestBase proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_TOPIC + topic.getTopicName()); } - @Override - @After - public void tearDown() throws Exception - { - - session.close(); - - connection.close(); - - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; - - session = null; - - connection = null; - - proxy = null; - - super.tearDown(); - } - // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java index 4b3ea24..605fa39 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.integration.journal; import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.junit.BeforeClass; @@ -36,7 +36,7 @@ public class AIOImportExportTest extends NIOImportExportTest { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java index dd63460..2da8915 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.integration.journal; import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.JournalConstants; @@ -37,7 +37,7 @@ public class AIOJournalCompactTest extends NIOJournalCompactTest { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java index 02efaa3..0a558a3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.EncodingSupport; import org.apache.activemq.artemis.core.journal.IOCompletion; import org.apache.activemq.artemis.core.journal.Journal; @@ -37,7 +37,7 @@ import org.junit.Ignore; import org.junit.Test; @Ignore -public class JournalPerfTuneTest extends ServiceTestBase +public class JournalPerfTuneTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java index da39e88..28ca43d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.integration.journal; import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; @@ -30,7 +30,7 @@ public class NIOBufferedJournalCompactTest extends NIOJournalCompactTest { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java index 66e001b..dfd6a05 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java @@ -15,19 +15,17 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.journal; + +import org.apache.activemq.artemis.core.journal.EncodingSupport; +import org.apache.activemq.artemis.core.journal.SequentialFileFactory; +import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.junit.After; - +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.io.File; -import org.apache.activemq.artemis.core.journal.EncodingSupport; -import org.apache.activemq.artemis.core.journal.SequentialFileFactory; -import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; - public class NIOImportExportTest extends JournalImplTestBase { @@ -39,7 +37,7 @@ public class NIOImportExportTest extends JournalImplTestBase { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); @@ -56,12 +54,6 @@ public class NIOImportExportTest extends JournalImplTestBase // Public -------------------------------------------------------- - @After - public void tearDown() throws Exception - { - super.tearDown(); - } - @Test public void testExportImport() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java index acc98c8..29fb007 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java @@ -48,7 +48,7 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContex import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.IDGenerator; import org.apache.activemq.artemis.utils.OrderedExecutorFactory; import org.apache.activemq.artemis.utils.SimpleIDGenerator; @@ -556,7 +556,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase System.out.println("Waiting on Compact"); try { - ServiceTestBase.waitForLatch(latchWait); + ActiveMQTestBase.waitForLatch(latchWait); } catch (InterruptedException e) { @@ -650,7 +650,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase t.start(); - ServiceTestBase.waitForLatch(latchDone); + ActiveMQTestBase.waitForLatch(latchDone); int nextID = NIOJournalCompactTest.NUMBER_OF_RECORDS; @@ -1917,7 +1917,6 @@ public class NIOJournalCompactTest extends JournalImplTestBase @After public void tearDown() throws Exception { - File testDir = new File(getTestDir()); File[] files = testDir.listFiles(new FilenameFilter() http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java index e99775b..7301dee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java @@ -20,7 +20,7 @@ import java.io.File; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestUnit; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; @@ -35,7 +35,7 @@ public class NIOJournalImplTest extends JournalImplTestUnit NIOJournalImplTest.log.debug("deleting directory " + getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java index 95ce97c..6506421 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.artemis.tests.util.SpawnedVMSupport; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.journal.LoaderCallback; import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; @@ -37,7 +37,7 @@ import org.junit.Test; /** * This test spawns a remote VM, as we want to "crash" the VM right after the journal is filled with data */ -public class ValidateTransactionHealthTest extends ServiceTestBase +public class ValidateTransactionHealthTest extends ActiveMQTestBase { private static final int OK = 10; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java index d80ee58..9244bdd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.DataConstants; import org.apache.activemq.artemis.utils.DeflaterReader; import org.junit.Assert; @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -public abstract class LargeMessageTestBase extends ServiceTestBase +public abstract class LargeMessageTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -125,9 +125,9 @@ public abstract class LargeMessageTestBase extends ServiceTestBase if (sendingBlocking) { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator.setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); } if (producerWindow > 0) @@ -299,7 +299,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase @Override public void write(final byte[] b) throws IOException { - if (b[0] == ServiceTestBase.getSamplebyte(bytesRead.get())) + if (b[0] == ActiveMQTestBase.getSamplebyte(bytesRead.get())) { bytesRead.addAndGet(b.length); LargeMessageTestBase.log.debug("Read position " + bytesRead.get() + " on consumer"); @@ -313,7 +313,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase @Override public void write(final int b) throws IOException { - if (b == ServiceTestBase.getSamplebyte(bytesRead.get())) + if (b == ActiveMQTestBase.getSamplebyte(bytesRead.get())) { bytesRead.incrementAndGet(); } @@ -338,7 +338,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase LargeMessageTestBase.log.debug("Read " + b + " bytes"); } - Assert.assertEquals(ServiceTestBase.getSamplebyte(b), buffer.readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(b), buffer.readByte()); } try @@ -418,7 +418,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase @Override public void write(final byte[] b) throws IOException { - if (b[0] == ServiceTestBase.getSamplebyte(bytesRead.get())) + if (b[0] == ActiveMQTestBase.getSamplebyte(bytesRead.get())) { bytesRead.addAndGet(b.length); } @@ -460,7 +460,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase { LargeMessageTestBase.log.debug("Read " + b + " bytes"); } - Assert.assertEquals(ServiceTestBase.getSamplebyte(b), buffer.readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(b), buffer.readByte()); } } @@ -546,7 +546,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase if (numberOfBytes > 1024 * 1024 || i % 2 == 0) { LargeMessageTestBase.log.debug("Sending message (stream)" + i); - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(numberOfBytes)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(numberOfBytes)); } else { @@ -554,7 +554,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase byte[] bytes = new byte[(int) numberOfBytes]; for (int j = 0; j < bytes.length; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(j); + bytes[j] = ActiveMQTestBase.getSamplebyte(j); } message.getBodyBuffer().writeBytes(bytes); } @@ -606,7 +606,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase ClientMessage clientMessage = session.createMessage(persistent); - clientMessage.setBodyInputStream(ServiceTestBase.createFakeLargeStream(numberOfBytes)); + clientMessage.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(numberOfBytes)); return clientMessage; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java index 83aa6d5..b7efa02 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; -public class ServerLargeMessageTest extends ServiceTestBase +public class ServerLargeMessageTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -52,7 +52,7 @@ public class ServerLargeMessageTest extends ServiceTestBase server.start(); - ServerLocator locator = createFactory(false); + ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); @@ -66,7 +66,7 @@ public class ServerLargeMessageTest extends ServiceTestBase for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { - fileMessage.addBytes(new byte[]{ServiceTestBase.getSamplebyte(i)}); + fileMessage.addBytes(new byte[]{ActiveMQTestBase.getSamplebyte(i)}); } // The server would be doing this fileMessage.putLongProperty(Message.HDR_LARGE_BODY_SIZE, 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); @@ -96,7 +96,7 @@ public class ServerLargeMessageTest extends ServiceTestBase for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } msg.acknowledge(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java index 1f73935..bfd7edf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java @@ -51,9 +51,9 @@ public class AcceptorControlTest extends ManagementTestBase new HashMap(), RandomUtil.randomString()); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(acceptorConfig); - ActiveMQServer service = createServer(false, conf); + ActiveMQServer service = createServer(false, config); service.setMBeanServer(mbeanServer); service.start(); @@ -69,9 +69,9 @@ public class AcceptorControlTest extends ManagementTestBase TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), new HashMap(), RandomUtil.randomString()); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(acceptorConfig); - ActiveMQServer service = createServer(false, conf); + ActiveMQServer service = createServer(false, config); service.setMBeanServer(mbeanServer); service.start(); @@ -129,9 +129,9 @@ public class AcceptorControlTest extends ManagementTestBase TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), new HashMap(), RandomUtil.randomString()); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(acceptorConfig); - ActiveMQServer service = createServer(false, conf); + ActiveMQServer service = createServer(false, config); service.setMBeanServer(mbeanServer); service.start(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 7df47ea..47cf183 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -36,7 +36,6 @@ import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; @@ -46,7 +45,6 @@ import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.apache.activemq.artemis.utils.json.JSONArray; import org.apache.activemq.artemis.utils.json.JSONObject; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -54,7 +52,6 @@ import org.junit.Test; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.HashMap; -import java.util.Map; public class ActiveMQServerControlTest extends ManagementTestBase { @@ -1008,48 +1005,43 @@ public class ActiveMQServerControlTest extends ManagementTestBase protected void scaleDown(ScaleDownHandler handler) throws Exception { SimpleString address = new SimpleString("testQueue"); - Configuration conf = createDefaultConfig(2, new HashMap(), INVM_ACCEPTOR_FACTORY); - conf.setSecurityEnabled(false); - conf.getAcceptorConfigurations().clear(); - HashMap params = new HashMap(); + HashMap params = new HashMap<>(); params.put(TransportConstants.SERVER_ID_PROP_NAME, "2"); - conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName(), params)); - ActiveMQServer server2 = ActiveMQServers.newActiveMQServer(conf, null, true); - this.conf.getConnectorConfigurations().clear(); - this.conf.getConnectorConfigurations().put("server2-connector", new TransportConfiguration(INVM_CONNECTOR_FACTORY, params)); - try + Configuration config = createDefaultInVMConfig(2) + .clearAcceptorConfigurations() + .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName(), params)); + ActiveMQServer server2 = addServer(ActiveMQServers.newActiveMQServer(config, null, true)); + + this.conf + .clearConnectorConfigurations() + .addConnectorConfiguration("server2-connector", new TransportConfiguration(INVM_CONNECTOR_FACTORY, params)); + + server2.start(); + server.createQueue(address, address, null, true, false); + server2.createQueue(address, address, null, true, false); + ServerLocator locator = createInVMNonHALocator(); + ClientSessionFactory csf = createSessionFactory(locator); + ClientSession session = csf.createSession(); + ClientProducer producer = session.createProducer(address); + for (int i = 0; i < 100; i++) { - server2.start(); - server.createQueue(address, address, null, true, false); - server2.createQueue(address, address, null, true, false); - ServerLocator locator = createInVMNonHALocator(); - ClientSessionFactory csf = createSessionFactory(locator); - ClientSession session = csf.createSession(); - ClientProducer producer = session.createProducer(address); - for (int i = 0; i < 100; i++) - { - ClientMessage message = session.createMessage(true); - message.getBodyBuffer().writeString("m" + i); - producer.send(message); - } - - ActiveMQServerControl managementControl = createManagementControl(); - handler.scaleDown(managementControl); - locator.close(); - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY, params)); - csf = createSessionFactory(locator); - session = csf.createSession(); - session.start(); - ClientConsumer consumer = session.createConsumer(address); - for (int i = 0; i < 100; i++) - { - ClientMessage m = consumer.receive(5000); - assertNotNull(m); - } + ClientMessage message = session.createMessage(true); + message.getBodyBuffer().writeString("m" + i); + producer.send(message); } - finally + + ActiveMQServerControl managementControl = createManagementControl(); + handler.scaleDown(managementControl); + locator.close(); + locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY, params))); + csf = createSessionFactory(locator); + session = csf.createSession(); + session.start(); + ClientConsumer consumer = session.createConsumer(address); + for (int i = 0; i < 100; i++) { - server2.stop(); + ClientMessage m = consumer.receive(5000); + assertNotNull(m); } } // Package protected --------------------------------------------- @@ -1065,38 +1057,15 @@ public class ActiveMQServerControlTest extends ManagementTestBase { super.setUp(); - Map params = new HashMap(); - //params.put(RandomUtil.randomString(), RandomUtil.randomBoolean()); - connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName(), - params, - RandomUtil.randomString()); + connectorConfig = new TransportConfiguration(INVM_CONNECTOR_FACTORY); - conf = createDefaultConfig() - .setSecurityEnabled(false) + conf = createDefaultInVMConfig() .setJMXManagementEnabled(true) - .clearAcceptorConfigurations() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) .addConnectorConfiguration(connectorConfig.getName(), connectorConfig); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, true); + server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true)); server.start(); } - @Override - @After - public void tearDown() throws Exception - { - if (server != null) - { - server.stop(); - } - - server = null; - - connectorConfig = null; - - super.tearDown(); - } - protected ActiveMQServerControl createManagementControl() throws Exception { return ManagementControlHelper.createActiveMQServerControl(mbeanServer); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java index 451c16d..9edf21c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java @@ -22,7 +22,6 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl; import org.apache.activemq.artemis.api.core.management.Parameter; import org.apache.activemq.artemis.api.core.management.ResourceNames; -import org.junit.After; import org.junit.Before; public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTest @@ -63,20 +62,6 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes ClientSessionFactory sf = createSessionFactory(locator); session = sf.createSession(false, true, true); session.start(); - - } - - @Override - @After - public void tearDown() throws Exception - { - session.close(); - - session = null; - - locator.close(); - - super.tearDown(); } protected void restartServer() throws Exception