From c23157600736799273f171320f7e8937aaced8c7 Mon Sep 17 00:00:00 2001 From: Shaun Francis Date: Thu, 16 Aug 2018 10:33:37 +0100 Subject: [PATCH] Increase test coverage --- .../CombinedJmsAndJmxArtemisConnectorIT.java | 19 +++++++++++++++++++ .../connector/JmxArtemisConnectorIT.java | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/test/java/uk/gov/justice/artemis/manager/connector/CombinedJmsAndJmxArtemisConnectorIT.java b/src/test/java/uk/gov/justice/artemis/manager/connector/CombinedJmsAndJmxArtemisConnectorIT.java index 4e51a47..f87444d 100644 --- a/src/test/java/uk/gov/justice/artemis/manager/connector/CombinedJmsAndJmxArtemisConnectorIT.java +++ b/src/test/java/uk/gov/justice/artemis/manager/connector/CombinedJmsAndJmxArtemisConnectorIT.java @@ -1,6 +1,7 @@ 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; @@ -8,6 +9,7 @@ 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 index 1e43799..549d946 100644 --- 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")); } }