[activemq-artemis] branch main updated: NO-JIRA fixing intermittent failure on ActiveMQServerControlTest

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new f6050b842e NO-JIRA fixing intermittent failure on 
ActiveMQServerControlTest
f6050b842e is described below

commit f6050b842e6801b65623496293de534c7e3058a6
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Tue Dec 13 11:59:53 2022 -0500

    NO-JIRA fixing intermittent failure on ActiveMQServerControlTest
---
 .../management/ActiveMQServerControlTest.java      | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

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 aabde1d2dc..17913f128c 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
@@ -2615,32 +2615,26 @@ public class ActiveMQServerControlTest extends 
ManagementTestBase {
       JsonArray array = JsonUtil.readJsonArray(jsonString);
       Assert.assertEquals(usingCore() ? 3 : 2, array.size());
 
-      String key = "creationTime";
       JsonObject[] sorted = new JsonObject[array.size()];
       for (int i = 0; i < array.size(); i++) {
          sorted[i] = array.getJsonObject(i);
       }
 
-      if (sorted[0].getJsonNumber(key).longValue() > 
sorted[1].getJsonNumber(key).longValue()) {
-         JsonObject o = sorted[1];
-         sorted[1] = sorted[0];
-         sorted[0] = o;
-      }
-      if (usingCore()) {
-         if (sorted[1].getJsonNumber(key).longValue() > 
sorted[2].getJsonNumber(key).longValue()) {
-            JsonObject o = sorted[2];
-            sorted[2] = sorted[1];
-            sorted[1] = o;
+      JsonObject first = null;
+      JsonObject second = null;
+
+      for (int i = 0; i < array.size(); i++) {
+         JsonObject obj = array.getJsonObject(i);
+         if 
(obj.getString("connectionID").equals(factories.get(0).getConnection().getID().toString()))
 {
+            first = obj;
          }
-         if (sorted[0].getJsonNumber(key).longValue() > 
sorted[1].getJsonNumber(key).longValue()) {
-            JsonObject o = sorted[1];
-            sorted[1] = sorted[0];
-            sorted[0] = o;
+         if 
(obj.getString("connectionID").equals(factories.get(1).getConnection().getID().toString()))
 {
+            second = obj;
          }
       }
 
-      JsonObject first = sorted[0];
-      JsonObject second = sorted[1];
+      Assert.assertNotNull(first);
+      Assert.assertNotNull(second);
 
       Assert.assertTrue(first.getString("connectionID").length() > 0);
       Assert.assertTrue(first.getString("clientAddress").length() > 0);