diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/MDBEJBRuntimeNameTestsCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/MDBEJBRuntimeNameTestsCase.java index b293b44e92e0..a03d65e1965e 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/MDBEJBRuntimeNameTestsCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/MDBEJBRuntimeNameTestsCase.java @@ -86,7 +86,7 @@ public void setup() throws Exception { ejbJar.addPackage(BEAN_PACKAGE); ejbJar.setManifest(new StringAsset( Descriptors.create(ManifestDescriptor.class) - .attribute("Dependencies", "org.hornetq.ra") + .attribute("Dependencies", "org.apache.activemq.artemis.ra") .exportAsString())); EnterpriseArchive earArchive = ShrinkWrap.create(EnterpriseArchive.class, DEPLOYMENT_NAME); earArchive.addAsModule(ejbJar); diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/ConnectionFactoryManagementTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/ConnectionFactoryManagementTestCase.java index 58be33938455..d696c652792d 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/ConnectionFactoryManagementTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/ConnectionFactoryManagementTestCase.java @@ -84,13 +84,7 @@ public void testWriteDiscoveryGroupAttributeWhenConnectorIsAlreadyDefined() thro e.printStackTrace(); assertEquals(FAILED, e.getResult().get(OUTCOME).asString()); assertEquals(true, e.getResult().get(ROLLED_BACK).asBoolean()); - final String errorCode; - if ("hornetq".equals(jmsOperations.getProviderName())) { - errorCode = "WFLYMSG0019"; - } else { - errorCode = "WFLYMSGAMQ0019"; - } - assertTrue(e.getResult().get(FAILURE_DESCRIPTION).asString().contains(errorCode)); + assertTrue(e.getResult().get(FAILURE_DESCRIPTION).asString().contains("WFLYMSGAMQ0019")); } jmsOperations.removeJmsConnectionFactory(CF_NAME); diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java index 97fd4326ddc9..922a82bd146e 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java @@ -32,33 +32,30 @@ import java.util.HashSet; import java.util.Set; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.as.arquillian.api.ContainerResource; import org.jboss.as.arquillian.container.ManagementClient; -import org.jboss.as.test.integration.common.jms.JMSOperations; -import org.jboss.as.test.integration.common.jms.JMSOperationsProvider; import org.jboss.as.test.shared.TestSuiteEnvironment; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; import org.junit.After; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; /** - * Tests the management API for HornetQ core queues. + * Tests the management API for Artemis core queues. * * @author Brian Stansberry (c) 2011 Red Hat Inc. */ @@ -78,9 +75,6 @@ public class CoreQueueManagementTestCase { @Before public void setup() throws Exception { - JMSOperations jmsOperations = JMSOperationsProvider.getInstance(managementClient); - Assume.assumeTrue("Test is relevant only when the messaging subsystem with HornetQ is setup", "hornetq".equals(jmsOperations.getProviderName())); - count++; HashMap map = new HashMap(); @@ -90,7 +84,7 @@ public void setup() throws Exception { map.put(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME, "http-acceptor"); TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName(), map); - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(transportConfiguration); + ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(transportConfiguration); locator.setBlockOnDurableSend(true); locator.setBlockOnNonDurableSend(true); sessionFactory = locator.createSessionFactory(); @@ -370,16 +364,16 @@ public void testListConsumers() throws Exception { private ModelNode getQueueOperation(String operationName, String queueName) { final ModelNode address = new ModelNode(); - address.add("subsystem", "messaging"); - address.add("hornetq-server", "default"); + address.add("subsystem", "messaging-activemq"); + address.add("server", "default"); address.add("queue", queueName); return org.jboss.as.controller.operations.common.Util.getEmptyOperation(operationName, address); } private ModelNode getRuntimeQueueOperation(String operationName, String queueName) { final ModelNode address = new ModelNode(); - address.add("subsystem", "messaging"); - address.add("hornetq-server", "default"); + address.add("subsystem", "messaging-activemq"); + address.add("server", "default"); address.add("runtime-queue", queueName); return org.jboss.as.controller.operations.common.Util.getEmptyOperation(operationName, address); } diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/security/SecurityTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/security/SecurityTestCase.java index 72be5ef11d1d..27db562a9f0f 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/security/SecurityTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/security/SecurityTestCase.java @@ -27,32 +27,24 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.HornetQExceptionType; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.core.security.CheckType; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.artemis.core.security.CheckType; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.as.arquillian.api.ContainerResource; import org.jboss.as.arquillian.container.ManagementClient; -import org.jboss.as.controller.client.ModelControllerClient; -import org.jboss.as.controller.client.OperationBuilder; -import org.jboss.as.test.integration.common.jms.JMSOperations; -import org.jboss.as.test.integration.common.jms.JMSOperationsProvider; -import org.jboss.dmr.ModelNode; -import org.junit.Assume; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,21 +60,15 @@ public class SecurityTestCase { @ContainerResource private ManagementClient managementClient; - @Before - public void setUp() { - JMSOperations jmsOperations = JMSOperationsProvider.getInstance(managementClient); - Assume.assumeTrue("Test is relevant only when the messaging subsystem with HornetQ is setup", "hornetq".equals(jmsOperations.getProviderName())); - } - @Test public void testFailedAuthenticationBadUserPass() throws Exception { final ClientSessionFactory sf = createClientSessionFactory(managementClient.getMgmtAddress(), managementClient.getWebUri().getPort()); try { sf.createSession("fail", "epicfail", false, true, true, false, 1); fail("must not allow to create a session with bad authentication"); - } catch (HornetQException e) { - assertEquals(HornetQExceptionType.SECURITY_EXCEPTION, e.getType()); - assertTrue(e.getMessage().startsWith("HQ119031")); + } catch (ActiveMQException e) { + assertEquals(ActiveMQExceptionType.SECURITY_EXCEPTION, e.getType()); + assertTrue(e.getMessage(), e.getMessage().startsWith("AMQ119031")); } finally { if (sf != null) { sf.close(); @@ -96,9 +82,9 @@ public void testFailedAuthenticationBlankUserPass() throws Exception { try { sf.createSession(); fail("must not allow to create a session without any authentication"); - } catch (HornetQException e) { - assertEquals(HornetQExceptionType.SECURITY_EXCEPTION, e.getType()); - assertTrue(e.getMessage().startsWith("HQ119031")); + } catch (ActiveMQException e) { + assertEquals(ActiveMQExceptionType.SECURITY_EXCEPTION, e.getType()); + assertTrue(e.getMessage(), e.getMessage().startsWith("AMQ119031")); } finally { if (sf != null) { sf.close(); @@ -110,11 +96,11 @@ public void testFailedAuthenticationBlankUserPass() throws Exception { public void testDefaultClusterUser() throws Exception { final ClientSessionFactory sf = createClientSessionFactory(managementClient.getMgmtAddress(), managementClient.getWebUri().getPort()); try { - sf.createSession(HornetQDefaultConfiguration.getDefaultClusterUser(), HornetQDefaultConfiguration.getDefaultClusterPassword(), false, true, true, false, 1); + sf.createSession(ActiveMQDefaultConfiguration.getDefaultClusterUser(), ActiveMQDefaultConfiguration.getDefaultClusterPassword(), false, true, true, false, 1); fail("must not allow to create a session with the default cluster user credentials"); - } catch (HornetQException e) { - assertEquals(HornetQExceptionType.CLUSTER_SECURITY_EXCEPTION, e.getType()); - assertTrue(e.getMessage().startsWith("HQ119099")); + } catch (ActiveMQException e) { + assertEquals(ActiveMQExceptionType.CLUSTER_SECURITY_EXCEPTION, e.getType()); + assertTrue(e.getMessage(), e.getMessage().startsWith("AMQ119099")); } finally { if (sf != null) { sf.close(); @@ -168,9 +154,9 @@ public void testUnsuccessfulAuthorization() throws Exception { session = sf.createSession("guest", "guest", false, true, true, false, 1); session.createQueue(queueName, queueName, true); fail("Must not create a durable queue without the CREATE_DURABLE_QUEUE permission"); - } catch (HornetQException e) { - assertEquals(HornetQExceptionType.SECURITY_EXCEPTION, e.getType()); - assertTrue(e.getMessage().startsWith("HQ119032")); + } catch (ActiveMQException e) { + assertEquals(ActiveMQExceptionType.SECURITY_EXCEPTION, e.getType()); + assertTrue(e.getMessage().startsWith("AMQ119032")); assertTrue(e.getMessage().contains(CheckType.CREATE_DURABLE_QUEUE.toString())); } finally { if (session != null) { @@ -179,19 +165,6 @@ public void testUnsuccessfulAuthorization() throws Exception { } } - static void applyUpdate(ModelNode update, final ModelControllerClient client) throws IOException { - ModelNode result = client.execute(new OperationBuilder(update).build()); - if (result.hasDefined("outcome") && "success".equals(result.get("outcome").asString())) { - if (result.hasDefined("result")) { - System.out.println(result.get("result")); - } - } else if (result.hasDefined("failure-description")) { - throw new RuntimeException(result.get("failure-description").toString()); - } else { - throw new RuntimeException("Operation not successful; outcome = " + result.get("outcome")); - } - } - static ClientSessionFactory createClientSessionFactory(String host, int port) throws Exception { final Map properties = new HashMap(); properties.put("host", host); @@ -199,6 +172,6 @@ static ClientSessionFactory createClientSessionFactory(String host, int port) th properties.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true); properties.put(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME, "http-acceptor"); final TransportConfiguration configuration = new TransportConfiguration(NettyConnectorFactory.class.getName(), properties); - return HornetQClient.createServerLocatorWithoutHA(configuration).createSessionFactory(); + return ActiveMQClient.createServerLocatorWithoutHA(configuration).createSessionFactory(); } } diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/messaging/client/messaging/MessagingClientTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/messaging/client/messaging/MessagingClientTestCase.java index 1bd6798e9bd7..8624c3b8b587 100644 --- a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/messaging/client/messaging/MessagingClientTestCase.java +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/messaging/client/messaging/MessagingClientTestCase.java @@ -24,34 +24,31 @@ import static org.junit.Assert.assertNotNull; -import javax.resource.spi.IllegalStateException; import java.io.IOException; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.core.remoting.impl.netty.TransportConstants; +import javax.resource.spi.IllegalStateException; + +import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; +import org.apache.activemq.artemis.api.core.client.ClientProducer; +import org.apache.activemq.artemis.api.core.client.ClientSession; +import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.as.arquillian.api.ContainerResource; import org.jboss.as.arquillian.container.ManagementClient; import org.jboss.as.controller.client.ModelControllerClient; import org.jboss.as.controller.client.OperationBuilder; -import org.jboss.as.test.integration.common.jms.JMSOperationsProvider; import org.jboss.dmr.ModelNode; -import org.junit.Assume; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,12 +66,6 @@ public class MessagingClientTestCase { @ContainerResource private ManagementClient managementClient; - @Before - public void before() { - Assume.assumeTrue("Test is relevant only when the messaging subsystem with HornetQ is setup", - "hornetq".equals(JMSOperationsProvider.getInstance(managementClient).getProviderName())); - } - @Ignore @Test public void testMessagingClientUsingMessagingPort() throws Exception { @@ -110,8 +101,8 @@ private void doMessagingClient(ClientSessionFactory sf) throws Exception { // Create a new core queue using the standalone client ModelNode op = new ModelNode(); op.get("operation").set("add"); - op.get("address").add("subsystem", "messaging"); - op.get("address").add("hornetq-server", "default"); + op.get("address").add("subsystem", "messaging-activemq"); + op.get("address").add("server", "default"); op.get("address").add("queue", queueName); op.get("queue-address").set(queueName); applyUpdate(op, client); @@ -144,8 +135,8 @@ private void doMessagingClient(ClientSessionFactory sf) throws Exception { op = new ModelNode(); op.get("operation").set("remove"); - op.get("address").add("subsystem", "messaging"); - op.get("address").add("hornetq-server", "default"); + op.get("address").add("subsystem", "messaging-activemq"); + op.get("address").add("server", "default"); op.get("address").add("queue", queueName); applyUpdate(op, client); @@ -168,10 +159,10 @@ static void applyUpdate(ModelNode update, final ModelControllerClient client) th } } - static boolean queueExists(final String queueName, final ClientSessionFactory sf) throws HornetQException { + static boolean queueExists(final String queueName, final ClientSessionFactory sf) throws ActiveMQException { final ClientSession session = sf.createSession("guest", "guest", false, false, false, false, 1); try { - final QueueQuery query = session.queueQuery(new SimpleString(queueName)); + final ClientSession.QueueQuery query = session.queueQuery(new SimpleString(queueName)); return query.isExists(); } finally { session.close(); @@ -187,7 +178,7 @@ static ClientSessionFactory createClientSessionFactory(String host, int port, bo properties.put(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME, "http-acceptor"); } final TransportConfiguration configuration = new TransportConfiguration(NettyConnectorFactory.class.getName(), properties); - return HornetQClient.createServerLocatorWithoutHA(configuration).createSessionFactory(); + return ActiveMQClient.createServerLocatorWithoutHA(configuration).createSessionFactory(); } }