added execution time in csv file

Author: albertotn

src/main/java/AllocationCsvExporter.java

@@ -8,14 +8,15 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.LongSummaryStatistics;
+import java.util.stream.Collectors;
 
 public class AllocationCsvExporter {
 
     public static final AllocationCsvExporter INSTANCE = new AllocationCsvExporter();
 
     private AllocationCsvExporter() {}
 
-    public void writeAllocationsToCsv(Maven3Version maven3Version, long[] allocations, String resultFilePath) throws IOException {
+    public void writeAllocationsToCsv(Maven3Version maven3Version, AllocationTimePair[] allocations, String resultFilePath) throws IOException {
 
         int numberOfAllocations = allocations.length;
         CSVFormat csvFormat = buildCsvFormat(resultFilePath, numberOfAllocations);
@@ -37,7 +38,7 @@ private CSVFormat buildCsvFormat(String resultFilePath, int numberOfAllocations)
     }
 
     private String[] buildCsvHeaders(int numberOfAllocations) {
-        String[] csvHeaders = new String[(2 * numberOfAllocations) + 5];
+        String[] csvHeaders = new String[(3 * numberOfAllocations) +5];
         csvHeaders[0] = "Maven version";
         csvHeaders[1] = "Average (bytes)";
         csvHeaders[2] = "Average (Gb)";
@@ -47,32 +48,40 @@ private String[] buildCsvHeaders(int numberOfAllocations) {
         for (int i = 1; i < numberOfAllocations + 1; i++) {
             csvHeaders[i + 4] = "Allocation" + " " + i + " "+ "(bytes)";
         }
+        
+        for (int i = 1; i < numberOfAllocations + 1; i++) {
+        	csvHeaders[i + 4+ numberOfAllocations] = "Lenght" + " " + i + " "+ "(seconds)";
+        }
 
         for (int i = 1; i < numberOfAllocations + 1; i++) {
-            csvHeaders[i + 4 + numberOfAllocations] = "Allocation" + " " + i + " "+ "(Gb)";
+            csvHeaders[i + 4 + numberOfAllocations*2] = "Allocation" + " " + i + " "+ "(Gb)";
         }
         return csvHeaders;
     }
 
-    private List<Object> buildCsvRecord(Maven3Version maven3Version, long[] allocations) {
+    private List<Object> buildCsvRecord(Maven3Version maven3Version, AllocationTimePair[] input) {
 
-        List<Object> csvRecord = new ArrayList<>((2 * allocations.length) + 5);
+        List<Object> csvRecord = new ArrayList<>((2 * input.length) + 5);
 
         csvRecord.add(maven3Version);
 
-        LongSummaryStatistics allocationStatistics = Arrays.stream(allocations).summaryStatistics();
+        LongSummaryStatistics allocationStatistics = Arrays.stream(input).collect(Collectors.summarizingLong(AllocationTimePair::getAllocationInBytes));
         double averageAllocationInBytes = allocationStatistics.getAverage();
         csvRecord.add(averageAllocationInBytes);
         csvRecord.add(averageAllocationInBytes / Math.pow(1024, 3));
         csvRecord.add(allocationStatistics.getMin());
         csvRecord.add(allocationStatistics.getMax());
 
-        for (int i = 0; i < allocations.length; i++) {
-            csvRecord.add(allocations[i]);
+        for (int i = 0; i < input.length; i++) {
+            csvRecord.add(input[i].getAllocationInBytes());
         }
-
-        for (int i = 0; i < allocations.length; i++) {
-            csvRecord.add(allocations[i] / Math.pow(1024, 3));
+        
+        for (int i = 0; i < input.length; i++) {
+        	csvRecord.add(input[i].getLenghtInSeconds());
+        }         
+        
+        for (int i = 0; i < input.length; i++) {
+            csvRecord.add(input[i].getAllocationInBytes() / Math.pow(1024, 3));
         }
 
         return csvRecord;

src/main/java/AllocationTimePair.java

@@ -0,0 +1,21 @@
+
+public class AllocationTimePair {
+
+	private final Long allocationInBytes;
+	private final  Long lenghtInSeconds;
+	
+	public AllocationTimePair(Long allocationInBytes, Long lenghtInSeconds) {
+		this.allocationInBytes = allocationInBytes;
+		this.lenghtInSeconds = lenghtInSeconds;
+	}
+
+	public Long getAllocationInBytes() {
+		return allocationInBytes;
+	}
+
+	public Long getLenghtInSeconds() {
+		return lenghtInSeconds;
+	}
+	
+	
+}

src/test/java/MvnValidateAllocationByMaven3VersionTest.java

@@ -90,7 +90,7 @@ public void measure() throws IOException {
 
             applyWarmMeasurements(maven3Version, testClass);
 
-            long[] allocations = measureAllocationSeveralTimes(testClass, numberOfMeasuresByVersion);
+            AllocationTimePair[] allocations = measureAllocationSeveralTimes(testClass, numberOfMeasuresByVersion);
 
             AllocationCsvExporter.INSTANCE.writeAllocationsToCsv(maven3Version
                                                                , allocations
@@ -134,25 +134,28 @@ private String getDateTimeAsString() {
         return df.format(new Date());
     }
 
-    private long[] measureAllocationSeveralTimes(Class<?> testClass, int numberOfTimes) throws IOException {
-        long[] allocations = new long[numberOfTimes];
+    private AllocationTimePair[] measureAllocationSeveralTimes(Class<?> testClass, int numberOfTimes) throws IOException {
+    	AllocationTimePair[] allocations = new AllocationTimePair[numberOfTimes];
         for (int i = 0; i < numberOfTimes; i++) {
-            long allocationInBytes = measureAllocation(testClass);
-            allocations[i] = allocationInBytes;
+        	allocations[i] =measureAllocation(testClass);
         }
         return allocations;
     }
 
-    private Long measureAllocation(Class<?> testClass) throws IOException {
+    private AllocationTimePair measureAllocation(Class<?> testClass) throws IOException {
         deleteQuickPerfFoldersInTemp();
+        long startTime = System.currentTimeMillis();
         PrintableResult printableResult = testResult(testClass);
+        long executionTimeInMilliseconds = System.currentTimeMillis() - startTime;
         if(printableResult.failureCount() != 0) {
             System.out.println("Allocation can't be measured. " + printableResult.toString());
         }
         Long allocationInBytes = retrieveMeasuredAllocationInBytes();
+        Long lenghtInSeconds = executionTimeInMilliseconds/1000l;
         System.out.println("Allocation in bytes: " + allocationInBytes);
+        System.out.println("Lenght in seconds: " + lenghtInSeconds);
         System.out.println("----------------");
-        return allocationInBytes;
+        return new AllocationTimePair(allocationInBytes, lenghtInSeconds);
     }
 
     private void deleteQuickPerfFoldersInTemp() throws IOException {