Merge branch 'committers/swinkler/performance-framework'

2 files changed, 41 insertions, 21 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java
index 32b7691509..154bb0b514 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceRecord.java
@@ -52,4 +52,20 @@ public class PerformanceRecord
   {

     return probes;

   }

-}
\ No newline at end of file
+

+  public long getDurationSum()

+  {

+    long durationSum = 0L;

+    for (long probe : probes)

+    {

+      durationSum += probe;

+    }

+

+    return durationSum;

+  }

+

+  public long getDurationAvg()

+  {

+    return getDurationSum() / probes.length;

+  }

+}

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
index a165322b46..28486e0855 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PrintStreamPerformanceRecordAnalyzer.java
@@ -37,6 +37,16 @@ public class PrintStreamPerformanceRecordAnalyzer implements IPerformanceRecordA
 
   public void analyze(List<PerformanceRecord> performanceRecords)
   {
+    printHeader();
+
+    for (PerformanceRecord performanceRecord : performanceRecords)
+    {
+      printRecord(performanceRecord);
+    }
+  }
+
+  protected void printHeader()
+  {
     String recordString = MessageFormat.format("{0};{1};{2};{3};{4};{5};{6}", //
         "ContainerConfig", //
         "RepositoryConfig", //
@@ -45,29 +55,23 @@ public class PrintStreamPerformanceRecordAnalyzer implements IPerformanceRecordA
         "Test name", //
         "Test Case Name", //
         "Average Duration");
+  
     out.println(recordString);
+  }
 
-    for (PerformanceRecord performanceRecord : performanceRecords)
-    {
-      long durationSum = 0L;
-      for (long durationMillis : performanceRecord.getProbes())
-      {
-        durationSum += durationMillis;
-      }
-      long durationAverage = durationSum / performanceRecord.getProbes().length;
-
-      IScenario scenario = performanceRecord.getScenario();
+  protected void printRecord(PerformanceRecord performanceRecord)
+  {
+    IScenario scenario = performanceRecord.getScenario();
 
-      recordString = MessageFormat.format("{0};{1};{2};{3};{4};{5};{6}", //
-          scenario.getContainerConfig().getName(), //
-          scenario.getRepositoryConfig().getName(), //
-          scenario.getSessionConfig().getName(), //
-          scenario.getModelConfig().getName(), //
-          performanceRecord.getTestName(), //
-          performanceRecord.getTestCaseName(), //
-          durationAverage);
+    String recordString = MessageFormat.format("{0};{1};{2};{3};{4};{5};{6}", //
+        scenario.getContainerConfig().getName(), //
+        scenario.getRepositoryConfig().getName(), //
+        scenario.getSessionConfig().getName(), //
+        scenario.getModelConfig().getName(), //
+        performanceRecord.getTestName(), //
+        performanceRecord.getTestCaseName(), //
+        performanceRecord.getDurationAvg());
 
-      out.println(recordString);
-    }
+    out.println(recordString);
   }
 }