QPID-4746, QPID-4747:Fix the tests failing on IBM JDK

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1469256 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 33 insertions, 18 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
index 7773586073..95a378f1f6 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
@@ -589,16 +589,23 @@ public class BrokerLoggingTest extends AbstractTestLogging
                     assertEquals("Four listen messages should be found.",
                                  4, listenMessages .size());
 
-                    //3
-                    //Check the first
-                    String message = getMessageString(getLog(listenMessages .get(0)));
-                    assertTrue("Expected Listen log not correct" + message,
-                               message.endsWith("Listening on TCP port " + getPort()));
+                    int tcpStarted = 0;
+                    int sslStarted = 0;
 
-                    // Check the third, ssl listen.
-                    message = getMessageString(getLog(listenMessages .get(2)));
-                    assertTrue("Expected Listen log not correct" + message,
-                               message.endsWith("Listening on SSL port " + DEFAULT_SSL_PORT));
+                    for (String message : listenMessages)
+                    {
+                        if (message.endsWith("Listening on TCP port " + getPort()))
+                        {
+                            tcpStarted++;
+                        }
+                        if (message.endsWith("Listening on SSL port " + DEFAULT_SSL_PORT))
+                        {
+                            sslStarted++;
+                        }
+                    }
+
+                    assertEquals("Unexpected number of logs 'Listening on TCP port'", 2, tcpStarted);
+                    assertEquals("Unexpected number of logs 'Listening on SSL port'", 2, sslStarted);
 
                     //4 Test ports open
                     testSocketOpen(getPort());
@@ -859,15 +866,23 @@ public class BrokerLoggingTest extends AbstractTestLogging
                 assertEquals("Two shutdown messages should be found.",
                              2, listenMessages.size());
 
-                //3
-                String message = getMessageString(getLog(listenMessages.get(0)));
-                assertTrue("Expected shutdown log not correct" + message,
-                           message.endsWith("TCP port " + getPort()));
-
-                // Check second, ssl, listen.
-                message = getMessageString(getLog(listenMessages.get(1)));
-                assertTrue("Expected shutdown log not correct" + message,
-                           message.endsWith("SSL port " + DEFAULT_SSL_PORT));
+                int tcpShuttingDown = 0;
+                int sslShuttingDown = 0;
+
+                for (String m : listenMessages)
+                {
+                    if (m.endsWith("Shutting down : TCP port " + getPort()))
+                    {
+                        tcpShuttingDown++;
+                    }
+                    if (m.endsWith("Shutting down : SSL port " + DEFAULT_SSL_PORT))
+                    {
+                        sslShuttingDown++;
+                    }
+                }
+
+                assertEquals("Unexpected number of logs 'Shutting down : TCP port'", 1, tcpShuttingDown);
+                assertEquals("Unexpected number of logs 'Shutting down : SSL port'", 1, sslShuttingDown);
 
                 //4
                 //Test Port closed