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

ARTEMIS-2333 Making tests more reliable

This commit is contained in:
Clebert Suconic 2019-05-08 21:10:05 -04:00
parent 3f08e7f359
commit 7f7194f779
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
View File

@ -66,7 +66,7 @@ public class MQTTConnection implements RemotingConnection {
@Override @Override
public boolean isWritable(ReadyListener callback) { public boolean isWritable(ReadyListener callback) {
return transportConnection.isWritable(callback); return transportConnection.isWritable(callback) && transportConnection.isOpen();
} }
@Override @Override

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

@ -2612,19 +2612,31 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
JsonArray array = (JsonArray) producersAsJsonObject.get("data"); JsonArray array = (JsonArray) producersAsJsonObject.get("data");
Assert.assertTrue("number of producers returned from query", 2 <= array.size()); Assert.assertTrue("number of producers returned from query", 2 <= array.size());
JsonObject jsonSession = array.getJsonObject(0);
//check all fields boolean foundElement = false;
Assert.assertNotEquals("id", "", jsonSession.getString("id")); for (int i = 0; i < array.size(); i++) {
Assert.assertNotEquals("session", "", jsonSession.getString("session"));
Assert.assertEquals("clientID", "", jsonSession.getString("clientID"));
Assert.assertEquals("user", "", jsonSession.getString("user"));
Assert.assertNotEquals("protocol", "", jsonSession.getString("protocol"));
Assert.assertEquals("address", "", jsonSession.getString("address"));
Assert.assertNotEquals("localAddress", "", jsonSession.getString("localAddress"));
Assert.assertNotEquals("remoteAddress", "", jsonSession.getString("remoteAddress"));
Assert.assertNotEquals("creationTime", "", jsonSession.getString("creationTime"));
JsonObject jsonSession = array.getJsonObject(i);
if (jsonSession.getString("address").equals("activemq.management")) {
continue;
}
foundElement = true;
//check all fields
Assert.assertNotEquals("id", "", jsonSession.getString("id"));
Assert.assertNotEquals("session", "", jsonSession.getString("session"));
Assert.assertEquals("clientID", "", jsonSession.getString("clientID"));
Assert.assertEquals("user", "", jsonSession.getString("user"));
Assert.assertNotEquals("protocol", "", jsonSession.getString("protocol"));
Assert.assertEquals("address", "", jsonSession.getString("address"));
Assert.assertNotEquals("localAddress", "", jsonSession.getString("localAddress"));
Assert.assertNotEquals("remoteAddress", "", jsonSession.getString("remoteAddress"));
Assert.assertNotEquals("creationTime", "", jsonSession.getString("creationTime"));
}
Assert.assertTrue("Valid session not found", foundElement);
} }
} }