svn commit: r502576 - in /incubator/qpid/trunk/qpid/java/perftests/src: main/java/org/apache/qpid/requestreply/PingPongProducer.java test/java/org/apache/qpid/ping/PingAsyncTestPerf.java

[ri...@apache.org]

Author: ritchiem
Date: Fri Feb  2 03:13:13 2007
New Revision: 502576

URL: http://svn.apache.org/viewvc?view=rev&rev=502576
Log:
QPID-343 Performance test suite doesn't output missing message count on failure.

Updated PingAsyncTestPerf to output missing messsage count.
Updated PingPongProducer so it doesn't use AMQShortStringx.

Modified:
    incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
    incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java

Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java?view=diff&rev=502576&r1=502575&r2=502576
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java Fri Feb  2 03:13:13 2007
@@ -34,9 +34,13 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.qpid.client.*;
+
 import org.apache.qpid.client.message.TestMessageFactory;
-import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQNoConsumersException;
 import org.apache.qpid.jms.MessageProducer;
 import org.apache.qpid.jms.Session;
 import org.apache.qpid.topic.Config;
@@ -570,14 +574,12 @@
             // Check if this is a pub/sub pinger, in which case create topics.
             if (_isPubSub)
             {
-                AMQShortString name = new AMQShortString(rootName + id);
-                destination = new AMQTopic(name);
+                destination = new AMQTopic(rootName + id);
             }
             // Otherwise this is a p2p pinger, in which case create queues.
             else
             {
-                AMQShortString name = new AMQShortString(rootName + id);
-                destination = new AMQQueue(name, name, false, false, false);
+                destination = new AMQQueue(rootName + id);
             }
 
             // Keep the destination.

Modified: incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java?view=diff&rev=502576&r1=502575&r2=502576
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java Fri Feb  2 03:13:13 2007
@@ -171,7 +171,7 @@
         // Check that all the replies were received and log a fail if they were not.
         if (numReplies < numPings)
         {
-            tc.completeTest(false, 0);
+            tc.completeTest(false, numPings - numReplies);
         }
 
         // Remove the chained message listener from the ping producer.