Fix AutoCreateJmsDestinationTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3bd57057 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3bd57057 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3bd57057 Branch: refs/heads/ARTEMIS-780 Commit: 3bd57057b630bbf1ace1d3a84d7c1b1c1367edf2 Parents: 5686114 Author: jbertram <[email protected]> Authored: Mon Nov 14 16:31:11 2016 -0600 Committer: jbertram <[email protected]> Committed: Tue Nov 15 10:36:43 2016 -0600 ---------------------------------------------------------------------- .../apache/activemq/artemis/jms/client/ActiveMQSession.java | 2 +- .../integration/client/AutoCreateJmsDestinationTest.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3bd57057/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java ---------------------------------------------------------------------- diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java index c115614..e0cef1d 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java @@ -660,7 +660,7 @@ public class ActiveMQSession implements QueueSession, TopicSession { AddressQuery response = session.addressQuery(dest.getSimpleAddress()); if (!response.isExists()) { - if (response.isAutoCreateJmsQueues()) { + if (response.isAutoCreateJmsTopics()) { session.createAddress(dest.getSimpleAddress(), true, true); } else { throw new InvalidDestinationException("Topic " + dest.getName() + " does not exist"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3bd57057/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java index 5094eba..006bef1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java @@ -28,6 +28,7 @@ import java.util.Set; import java.util.UUID; import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.Queue; @@ -144,7 +145,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase { connection.close(); - assertNotNull(server.getManagementService().getResource("core.address.test")); + assertNotNull(server.getManagementService().getResource(ResourceNames.ADDRESS + "test")); } @Test @@ -181,11 +182,11 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase { connection.start(); assertNotNull(consumer.receive(500)); - assertNotNull(server.getManagementService().getResource("core.address." + topicName)); + assertNotNull(server.getManagementService().getResource(ResourceNames.ADDRESS + topicName)); connection.close(); - assertNull(server.getManagementService().getResource("core.address." + topicName)); + assertNull(server.getManagementService().getResource(ResourceNames.ADDRESS + topicName)); } @Test @@ -204,7 +205,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase { connection.close(); - assertNotNull(server.getManagementService().getResource("core.address.test")); + assertNotNull(server.getManagementService().getResource(ResourceNames.ADDRESS + "test")); assertNotNull(server.locateQueue(SimpleString.toSimpleString("myClientID.myDurableSub"))); }
