ARTEMIS-1947 fix tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7d14c06d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7d14c06d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7d14c06d Branch: refs/heads/master Commit: 7d14c06dd965adff409c32e2a962bad7948b1bca Parents: 869ad80 Author: Justin Bertram <jbert...@apache.org> Authored: Mon Aug 6 09:15:15 2018 -0500 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Mon Aug 6 11:14:57 2018 -0400 ---------------------------------------------------------------------- .../integration/management/ActiveMQServerControlTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7d14c06d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 048d506..2b76de6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -1550,8 +1550,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase { Assert.assertEquals("myUser", second.getString("principal")); Assert.assertTrue(second.getJsonNumber("creationTime").longValue() > 0); Assert.assertEquals(1, second.getJsonNumber("consumerCount").longValue()); - Assert.assertTrue(second.getJsonString("metadata").getString().contains("foo=bar")); - Assert.assertTrue(second.getJsonString("metadata").getString().contains("bar=baz")); + Assert.assertEquals(second.getJsonObject("metadata").getJsonString("foo").getString(), "bar"); + Assert.assertEquals(second.getJsonObject("metadata").getJsonString("bar").getString(), "baz"); } @Test @@ -1572,8 +1572,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase { JsonArray array = JsonUtil.readJsonArray(jsonString); Assert.assertEquals(1 + (usingCore() ? 1 : 0), array.size()); JsonObject obj = lookupSession(array, ((ActiveMQConnection)con).getInitialSession()); - Assert.assertTrue(obj.getString("metadata").contains(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY + "=" + clientID)); - Assert.assertTrue(obj.getString("metadata").contains(ClientSession.JMS_SESSION_IDENTIFIER_PROPERTY)); + Assert.assertEquals(obj.getJsonObject("metadata").getJsonString(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY).getString(), clientID); + Assert.assertNotNull(obj.getJsonObject("metadata").getJsonString(ClientSession.JMS_SESSION_IDENTIFIER_PROPERTY)); } @Test
