diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-09-08 10:07:19 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-09-08 10:07:19 +0000 |
| commit | 88e35b17575fbeed5b1c58f23288fe2dc4bcf41b (patch) | |
| tree | 04a6336379b418b589b6b8f7b14ffc4b130b8f9e /java | |
| parent | 862029a61a1121b39357d4dee82f9b6adf63a8bd (diff) | |
| download | qpid-python-88e35b17575fbeed5b1c58f23288fe2dc4bcf41b.tar.gz | |
QPID-2838, QPID-2843: test readability tweaks
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@994963 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java | 2 | ||||
| -rw-r--r-- | java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java index 96cf2d9b70..9c1d302be0 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java +++ b/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java @@ -465,7 +465,7 @@ public class AbstractTestLogging extends QpidBrokerTestCase 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()); diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java index 6868f82ed9..7ab937b15f 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java @@ -219,10 +219,10 @@ public class ManagementLoggingTest extends AbstractTestLogging 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) { |