Merge c231576 into 79f5eee

CJSCommonPlatform · Aug 16, 2018 · b2cdcf7 · b2cdcf7
2 parents 79f5eee + c231576
commit b2cdcf7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/...st/java/uk/gov/justice/artemis/manager/connector/CombinedJmsAndJmxArtemisConnectorIT.java b/...st/java/uk/gov/justice/artemis/manager/connector/CombinedJmsAndJmxArtemisConnectorIT.java
@@ -1,13 +1,15 @@
 package uk.gov.justice.artemis.manager.connector;
 
 import static java.util.Arrays.asList;
+import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 import static uk.gov.justice.artemis.manager.util.JmsTestUtil.cleanQueue;
+import static uk.gov.justice.artemis.manager.util.JmsTestUtil.cleanTopic;
 import static uk.gov.justice.artemis.manager.util.JmsTestUtil.closeJmsConnection;
 import static uk.gov.justice.artemis.manager.util.JmsTestUtil.openJmsConnection;
 import static uk.gov.justice.artemis.manager.util.JmsTestUtil.putInQueue;
@@ -148,4 +150,21 @@ public void shouldReprocessMessageOntoOriginalQueue() throws Exception {
         assertThat(reprocessedMessages, is(2L));
         assertThat(messageDataAfter, is(empty()));
     }
+
+    @Test
+    public void shouldReturnListOfQueues() throws Exception {
+        final String[] queueNames = combinedArtemisConnector.queueNames("localhost", "3000", "0.0.0.0");
+        assertThat(queueNames, arrayContainingInAnyOrder("DLQ", "ExpiryQueue"));
+    }
+
+    @Test
+    public void shouldReturnListOfTopics() throws Exception {
+        final String topic = "testTopic";
+
+        cleanTopic(topic, "testSubscription");
+
+        final String[] topicNames = combinedArtemisConnector.topicNames("localhost", "3000", "0.0.0.0");
+
+        assertThat(topicNames, arrayContainingInAnyOrder("testTopic"));
+    }
 }
diff --git a/src/test/java/uk/gov/justice/artemis/manager/connector/JmxArtemisConnectorIT.java b/src/test/java/uk/gov/justice/artemis/manager/connector/JmxArtemisConnectorIT.java
@@ -117,7 +117,7 @@ public void shouldReturnNumberOfDeletedMessages() throws Exception {
     @Test
     public void shouldReturnListOfQueues() throws Exception {
         final String[] queueNames = jmxArtemisConnector.queueNames("localhost", "3000", "0.0.0.0");
-        assertThat(queueNames, arrayContainingInAnyOrder(new String[] {"DLQ", "ExpiryQueue"}));
+        assertThat(queueNames, arrayContainingInAnyOrder("DLQ", "ExpiryQueue"));
     }
 
     @Test
@@ -128,6 +128,6 @@ public void shouldReturnListOfTopics() throws Exception {
 
         final String[] topicNames = jmxArtemisConnector.topicNames("localhost", "3000", "0.0.0.0");
 
-        assertThat(topicNames, arrayContainingInAnyOrder(new String[] {"testTopic"}));
+        assertThat(topicNames, arrayContainingInAnyOrder("testTopic"));
     }
 }