You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/09/08 12:07:19 UTC
svn commit: r994963 - in
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging:
AbstractTestLogging.java ManagementLoggingTest.java
Author: robbie
Date: Wed Sep 8 10:07:19 2010
New Revision: 994963
URL: http://svn.apache.org/viewvc?rev=994963&view=rev
Log:
QPID-2838, QPID-2843: test readability tweaks
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java?rev=994963&r1=994962&r2=994963&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java Wed Sep 8 10:07:19 2010
@@ -465,7 +465,7 @@ public class AbstractTestLogging extends
System.err.println(log);
}
- if (results.size() == 0 && monitor != null)
+ if (results.isEmpty() && monitor != null)
{
System.err.println("Monitored file contents:");
System.err.println(monitor.readFile());
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java?rev=994963&r1=994962&r2=994963&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java Wed Sep 8 10:07:19 2010
@@ -219,10 +219,10 @@ public class ManagementLoggingTest exten
validateMessageID("MNG-1002", log);
// We expect the RMI Registry port (the defined 'management port') to be
- // 100 lower than the RMIConnector Server Port (the actual JMX server)
- mPort = getPort() + (DEFAULT_MANAGEMENT_PORT - DEFAULT_PORT) + 100;
- assertTrue("RMI ConnectorServer port not as expected(" + mPort + ").:" + getMessageString(log),
- getMessageString(log).endsWith(String.valueOf(mPort)));
+ // 100 lower than the JMX RMIConnector Server Port (the actual JMX server)
+ int jmxPort = mPort + 100;
+ assertTrue("JMX RMIConnectorServer port not as expected(" + jmxPort + ").:" + getMessageString(log),
+ getMessageString(log).endsWith(String.valueOf(jmxPort)));
}
catch (AssertionFailedError afe)
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org