qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r801556 - in /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging: AbstractTestLogging.java ConnectionLoggingTest.java
Date Thu, 06 Aug 2009 09:23:17 GMT
Author: ritchiem
Date: Thu Aug  6 09:23:17 2009
New Revision: 801556

URL: http://svn.apache.org/viewvc?rev=801556&view=rev
Log:
QPID-2002 : Rename extractConnectionID to getConnectionID to be inline with rest of the helper
methods

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/ConnectionLoggingTest.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=801556&r1=801555&r2=801556&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
Thu Aug  6 09:23:17 2009
@@ -191,7 +191,7 @@
      * @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 @@
           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);
 

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java?rev=801556&r1=801555&r2=801556&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
(original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
Thu Aug  6 09:23:17 2009
@@ -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 @@
         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)));
     }
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message