4 files changed, 39 insertions, 4 deletions
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java b/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java
index 3f9cdff69d..6230067486 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java
+++ b/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ITestResult.java
@@ -22,10 +22,8 @@ import java.util.List;
 
 import org.apache.qpid.disttest.message.ParticipantResult;
 
-// TODO rename me!!
 public interface ITestResult
 {
-
     // TODO  should weaken to Collection
     List<ParticipantResult> getParticipantResults();
 
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java b/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
index 4dcabe6c7b..c21a78d359 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
+++ b/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/ParticipantResultAggregator.java
@@ -142,6 +142,7 @@ public class ParticipantResultAggregator
         aggregatedResult.setStartDate(new Date(_minStartDate));
         aggregatedResult.setEndDate(new Date(_maxEndDate));
         aggregatedResult.setThroughput(calculateThroughputInKiloBytesPerSecond());
+        aggregatedResult.setMessageThroughput(calculateThroughputInMessagesPerSecond());
     }
 
     private void setRolledUpConstantAttributes(ParticipantResult aggregatedResult)
@@ -197,4 +198,14 @@ public class ParticipantResultAggregator
         return totalPayloadProcessedInKiloBytes/durationInSeconds;
     }
 
+    private int calculateThroughputInMessagesPerSecond()
+    {
+        double durationInMillis = _maxEndDate - _minStartDate;
+        if (durationInMillis == 0 )
+        {
+            return 0;
+        }
+
+        return (int)Math.round((_numberOfMessagesProcessed * 1000.0d)/durationInMillis);
+    }
 }
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java b/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
index 5934e0e997..954828b043 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
+++ b/java/perftests/src/main/java/org/apache/qpid/disttest/results/aggregation/TestResultAggregator.java
@@ -18,6 +18,9 @@
  */
 package org.apache.qpid.disttest.results.aggregation;
 
+import java.util.List;
+
+import org.apache.qpid.disttest.controller.ResultsForAllTests;
 import org.apache.qpid.disttest.message.ConsumerParticipantResult;
 import org.apache.qpid.disttest.message.ParticipantResult;
 import org.apache.qpid.disttest.message.ProducerParticipantResult;
@@ -102,5 +105,26 @@ public class TestResultAggregator
         aggregatedAllResult.setNumberOfMessagesProcessed(aggregatedConsumerResult.getNumberOfMessagesProcessed());
         aggregatedAllResult.setTotalPayloadProcessed(aggregatedConsumerResult.getTotalPayloadProcessed());
         aggregatedAllResult.setThroughput(aggregatedConsumerResult.getThroughput());
+        aggregatedAllResult.setMessageThroughput(aggregatedConsumerResult.getMessageThroughput());
+    }
+
+    /**
+     * Produces a single {@link ResultsForAllTests} from the supplied list, only containing
+     * the "All participants" results.
+     */
+    public ResultsForAllTests aggregateTestResults(List<ResultsForAllTests> allResultsList)
+    {
+        ResultsForAllTests retVal = new ResultsForAllTests();
+
+        for (ResultsForAllTests resultsForAllTests : allResultsList)
+        {
+            ResultsForAllTests allParticipantsResult = resultsForAllTests.getAllParticipantsResult();
+            for (ITestResult testResult : allParticipantsResult.getTestResults())
+            {
+                retVal.add(testResult);
+            }
+        }
+
+        return retVal;
     }
 }
diff --git a/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormater.java b/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
index 52e53ca624..ea7a3f78c7 100644
--- a/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormater.java
+++ b/java/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
@@ -32,7 +32,7 @@ import org.apache.qpid.disttest.results.aggregation.ITestResult;
 /**
  * produces CSV output using the ordered enums in {@link ParticipantAttribute}
  */
-public class CSVFormater
+public class CSVFormatter
 {
     public String format(ResultsForAllTests results)
     {
@@ -66,7 +66,9 @@ public class CSVFormater
         List<Object> attributeValues = new ArrayList<Object>();
         for (ParticipantAttribute attribute : ParticipantAttribute.values())
         {
-            attributeValues.add(attributeValueMap.get(attribute));
+            Object attributeValue = attributeValueMap.get(attribute);
+            String attributeValueFormatted = attribute.format(attributeValue);
+            attributeValues.add(attributeValueFormatted);
         }
 
         String row = StringUtils.join(attributeValues.toArray(), ",");