You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/04/18 11:56:53 UTC
svn commit: r1469256 -
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
Author: orudyy
Date: Thu Apr 18 09:56:52 2013
New Revision: 1469256
URL: http://svn.apache.org/r1469256
Log:
QPID-4746, QPID-4747:Fix the tests failing on IBM JDK
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java?rev=1469256&r1=1469255&r2=1469256&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java Thu Apr 18 09:56:52 2013
@@ -589,16 +589,23 @@ public class BrokerLoggingTest extends A
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()));
-
- // 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));
+ int tcpStarted = 0;
+ int sslStarted = 0;
+
+ 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 A
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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org