Slight change to format of test-main output

Author: Steve Powell

test/src/com/rabbitmq/examples/ConsumerMain.java

@@ -188,13 +188,13 @@ public void report(boolean writeStats) throws IOException {
                 sumL += v;
             }
 
-            double avgL = sumL / messageCount;
-            System.out.println("CONSUMER -  Message count: " + messageCount);
-            System.out.println("Total time, milliseconds: " + totalDelta);
-            System.out.println("Overall messages-per-second: " + (messageCount / (totalDelta / 1000.0)));
-            System.out.println("Min latency, milliseconds: " + minL);
-            System.out.println("Avg latency, milliseconds: " + avgL);
-            System.out.println("Max latency, milliseconds: " + maxL);
+            System.out.println("CONSUMER -       Overall: "
+                            + String.format("%d messages in %dms, a rate of %.2f msgs/sec", messageCount,
+                                    totalDelta,
+                                    (messageCount / (totalDelta / 1000.0))));
+            System.out.println("Latency  - Min (Avg) Max: "
+                    + String.format("%dms (%.2fms) %dms", minL, sumL
+                            / messageCount, maxL));
 
             if (writeStats) {
                 PrintStream o = new PrintStream(new FileOutputStream("simple-latency-experiment.csv"));

test/src/com/rabbitmq/examples/ProducerMain.java

@@ -217,14 +217,18 @@ public void sendBatch(String queueName) throws IOException {
     }
 
     public void report(long totalDelta) {
-        System.out.println("PRODUCER - Message count: " + _messageCount);
-        System.out.println("Total time, milliseconds: " + totalDelta);
-        System.out.println("Overall messages-per-second: " + (_messageCount / (totalDelta / 1000.0)));
+        System.out
+                .println("PRODUCER -       Overall: "
+                        + String.format("%d messages in %dms, a rate of %.2f msgs/sec", _messageCount,
+                                totalDelta,
+                                (_messageCount / (totalDelta / 1000.0))));
     }
 
     public void summariseProgress(long startTime, long now, int sent, long previousReportTime, int previousSent) {
         int countOverInterval = sent - previousSent;
         double intervalRate = countOverInterval / ((now - previousReportTime) / 1000.0);
-        System.out.println((now - startTime) + " ms: Sent " + sent + " - " + countOverInterval + " since last report (" + (int) intervalRate + " Hz)");
+        System.out.println((now - startTime) + " ms: Sent " + sent + " - "
+                + countOverInterval + " since last report ("
+                + (int) intervalRate + " Hz)");
     }
 }