Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Fixing intermittent failure on listSession methods

This commit is contained in:
Clebert Suconic 2018-03-09 15:48:51 -05:00
parent 41a3fedb82
commit 91043f8153
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
View File

@ -1438,7 +1438,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
ServerLocator locator = createInVMNonHALocator();
ClientSessionFactory factory = createSessionFactory(locator);
ClientSession session1 = addClientSession(factory.createSession());
Thread.sleep(5);
ClientSession session2 = addClientSession(factory.createSession("myUser", "myPass", false, false, false, false, 0));
session2.createConsumer(queueName);
@ -1447,15 +1446,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
Assert.assertNotNull(jsonString);
JsonArray array = JsonUtil.readJsonArray(jsonString);
Assert.assertEquals(2, array.size());
JsonObject first;
JsonObject second;
if (array.getJsonObject(0).getJsonNumber("creationTime").longValue() < array.getJsonObject(1).getJsonNumber("creationTime").longValue()) {
first = array.getJsonObject(0);
second = array.getJsonObject(1);
} else {
first = array.getJsonObject(1);
second = array.getJsonObject(0);
}
JsonObject first = lookupSession(array, session1);
JsonObject second = lookupSession(array, session2);
Assert.assertTrue(first.getString("sessionID").length() > 0);
Assert.assertEquals(((ClientSessionImpl) session1).getName(), first.getString("sessionID"));
@ -1472,6 +1464,25 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
Assert.assertEquals(1, second.getJsonNumber("consumerCount").longValue());
}
private JsonObject lookupSession(JsonArray jsonArray, ClientSession session) throws Exception {
String name = ((ClientSessionImpl)session).getName();
for (int i = 0; i < jsonArray.size(); i++) {
JsonObject obj = jsonArray.getJsonObject(i);
String sessionID = obj.getString("sessionID");
Assert.assertNotNull(sessionID);
if (sessionID.equals(name)) {
return obj;
}
}
Assert.fail("Sesison not found for session id " + name);
// not going to happen, fail will throw an exception but it won't compile without this
return null;
}
@Test
public void testListAllSessionsAsJSON() throws Exception {
SimpleString queueName = new SimpleString(UUID.randomUUID().toString());
@ -1493,15 +1504,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
Assert.assertNotNull(jsonString);
JsonArray array = JsonUtil.readJsonArray(jsonString);
Assert.assertEquals(2 + (usingCore() ? 1 : 0), array.size());
JsonObject first;
JsonObject second;
if (array.getJsonObject(0).getJsonNumber("creationTime").longValue() < array.getJsonObject(1).getJsonNumber("creationTime").longValue()) {
first = array.getJsonObject(0);
second = array.getJsonObject(1);
} else {
first = array.getJsonObject(1);
second = array.getJsonObject(0);
}
JsonObject first = lookupSession(array, session1);
JsonObject second = lookupSession(array, session2);
Assert.assertTrue(first.getString("sessionID").length() > 0);
Assert.assertEquals(((ClientSessionImpl) session1).getName(), first.getString("sessionID"));