summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java4
-rw-r--r--java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java9
2 files changed, 4 insertions, 9 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 47ae599d2b..82c53aefa7 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
@@ -191,7 +191,7 @@ public class AbstractTestLogging extends QpidTestCase
* @param log the log String to process
* @return the connection ID or -1.
*/
- protected int extractConnectionID(String log)
+ protected int getConnectionID(String log)
{
int conIDStart = log.indexOf("con:") + 4;
int conIDEnd = log.indexOf("(", conIDStart);
@@ -242,7 +242,7 @@ public class AbstractTestLogging extends QpidTestCase
for (String log : logMessages)
{
// Get the connectionID from the Actor in the Message Log.
- int cID = extractConnectionID(fromActor(getLog(log)));
+ int cID = getConnectionID(fromActor(getLog(log)));
List<String> connectionData = connectionSplitList.get(cID);
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
index 46f32b1414..9915d410c5 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
@@ -20,15 +20,10 @@
*/
package org.apache.qpid.server.logging;
-import org.apache.qpid.test.unit.client.forwardall.Client;
-
import javax.jms.Connection;
import java.io.File;
import java.util.List;
import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.SortedSet;
-import java.util.Collections;
import java.util.TreeSet;
public class ConnectionLoggingTest extends AbstractTestLogging
@@ -174,12 +169,12 @@ public class ConnectionLoggingTest extends AbstractTestLogging
assertTrue("Message does not end with close:" + log, log.endsWith("Close"));
// Extract connection ID to validate there is a CON-1001 messasge for it
- int connectionID = extractConnectionID(log);
+ int connectionID = getConnectionID(log);
//Previous log message should be the open
log = getLog(results.get(resultsSize - 2));
// MESSAGE [con:1(/127.0.0.1:52540)] CON-1001 : Open : Client ID : clientid : Protocol Version : 0-9
validateMessageID("CON-1001",log);
- assertEquals("Connection IDs do not match", connectionID, extractConnectionID(fromActor(log)));
+ assertEquals("Connection IDs do not match", connectionID, getConnectionID(fromActor(log)));
}
}