Update from trunk r1375509 through r1450773asyncstore

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 0 deletions

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;
     }
 }