From ec958d7d27f545de44ff9f86c06da03d1c8b368c Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Mon, 9 Mar 2020 09:18:33 -0500 Subject: [PATCH] NO-JIRA fix errant test directory --- .../integration/stomp/StompWebSocketTest.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java index 4dcd4fed06..6a9a08857e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java @@ -28,11 +28,10 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; -public class StompWebSocketTest extends ActiveMQTestBase { +public class StompWebSocketTest extends StompTestBase { private ActiveMQServer server; @@ -59,19 +58,27 @@ public class StompWebSocketTest extends ActiveMQTestBase { * @return * @throws Exception */ - private ActiveMQServer createServer() throws Exception { + @Override + protected ActiveMQServer createServer() throws Exception { Map params = new HashMap<>(); params.put(TransportConstants.PROTOCOLS_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME); params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT + 1); TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params); - Configuration config = createBasicConfig().addAcceptorConfiguration(stompTransport).addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())).addQueueConfiguration(new CoreQueueConfiguration().setAddress(getQueueName()).setName(getQueueName()).setDurable(false)); + Configuration config = createBasicConfig() + .addAcceptorConfiguration(stompTransport) + .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) + .setPersistenceEnabled(isPersistenceEnabled()) + .addQueueConfiguration(new CoreQueueConfiguration() + .setAddress(getQueueName()) + .setName(getQueueName()) + .setDurable(false)); server = addServer(ActiveMQServers.newActiveMQServer(config)); return server; } - protected String getQueueName() { + protected static String getQueueName() { return "/queue/test"; } }