From 84c3710523eea5072e9847470d04e74c46782bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Fri, 1 Apr 2022 00:31:04 +0100
Subject: [PATCH] junit: Improve benchmark total time calculation

---
 pkg/junit/junit.go      |  2 +-
 testdata/022-report.xml |  4 ++--
 testdata/023-report.xml |  4 ++--
 testdata/024-report.xml |  4 ++--
 testdata/025-report.xml |  4 ++--
 testdata/026-report.xml | 12 ++++++------
 testdata/027-report.xml |  4 ++--
 testdata/028-report.xml |  2 +-
 testdata/029-report.xml |  2 +-
 testdata/033-report.xml |  4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkg/junit/junit.go b/pkg/junit/junit.go
index dfcdfc7..ca1abb6 100644
--- a/pkg/junit/junit.go
+++ b/pkg/junit/junit.go
@@ -187,7 +187,7 @@ func CreateFromReport(report gtr.Report, hostname string) Testsuites {
 			tc := Testcase{
 				Classname: pkg.Name,
 				Name:      bm.Name,
-				Time:      formatBenchmarkTime(time.Duration(bm.NsPerOp)),
+				Time:      formatBenchmarkTime(time.Duration(bm.NsPerOp) * time.Duration(bm.Iterations)),
 			}
 
 			if bm.Result == gtr.Fail {
diff --git a/testdata/022-report.xml b/testdata/022-report.xml
index 5cccd17..521e33d 100644
--- a/testdata/022-report.xml
+++ b/testdata/022-report.xml
@@ -4,8 +4,8 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkParse" classname="package/basic" time="0.000000604"></testcase>
-		<testcase name="BenchmarkReadingList" classname="package/basic" time="0.000001425"></testcase>
+		<testcase name="BenchmarkParse" classname="package/basic" time="1.208000000"></testcase>
+		<testcase name="BenchmarkReadingList" classname="package/basic" time="1.425000000"></testcase>
 		<system-out><![CDATA[goos: darwin
 goarch: amd64
 pkg: code.internal/state]]></system-out>
diff --git a/testdata/023-report.xml b/testdata/023-report.xml
index 63ba3f9..300725c 100644
--- a/testdata/023-report.xml
+++ b/testdata/023-report.xml
@@ -4,8 +4,8 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkIpsHistoryInsert" classname="package/one" time="0.000052568"></testcase>
-		<testcase name="BenchmarkIpsHistoryLookup" classname="package/one" time="0.000015208"></testcase>
+		<testcase name="BenchmarkIpsHistoryInsert" classname="package/one" time="1.577040000"></testcase>
+		<testcase name="BenchmarkIpsHistoryLookup" classname="package/one" time="1.520800000"></testcase>
 		<system-out><![CDATA[goos: darwin
 goarch: amd64
 pkg: code.internal/state]]></system-out>
diff --git a/testdata/024-report.xml b/testdata/024-report.xml
index 305d403..7c678ad 100644
--- a/testdata/024-report.xml
+++ b/testdata/024-report.xml
@@ -8,7 +8,7 @@
 		<testcase name="TestNew/no" classname="package3/baz" time="0.000"></testcase>
 		<testcase name="TestNew/normal" classname="package3/baz" time="0.000"></testcase>
 		<testcase name="TestWriteThis" classname="package3/baz" time="0.000"></testcase>
-		<testcase name="BenchmarkDeepMerge" classname="package3/baz" time="0.000002611"></testcase>
-		<testcase name="BenchmarkNext" classname="package3/baz" time="0.000000100"></testcase>
+		<testcase name="BenchmarkDeepMerge" classname="package3/baz" time="1.305500000"></testcase>
+		<testcase name="BenchmarkNext" classname="package3/baz" time="0.050000000"></testcase>
 	</testsuite>
 </testsuites>
diff --git a/testdata/025-report.xml b/testdata/025-report.xml
index 00fb0cf..50ce583 100644
--- a/testdata/025-report.xml
+++ b/testdata/025-report.xml
@@ -4,7 +4,7 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkNew" classname="pkg/count" time="0.000000352"></testcase>
-		<testcase name="BenchmarkFew" classname="pkg/count" time="0.000000102"></testcase>
+		<testcase name="BenchmarkNew" classname="pkg/count" time="8.800000000"></testcase>
+		<testcase name="BenchmarkFew" classname="pkg/count" time="2.550000000"></testcase>
 	</testsuite>
 </testsuites>
diff --git a/testdata/026-report.xml b/testdata/026-report.xml
index 273a6d4..1cbdf42 100644
--- a/testdata/026-report.xml
+++ b/testdata/026-report.xml
@@ -4,18 +4,18 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkParse" classname="mycode/common" time="0.000001591"></testcase>
-		<testcase name="BenchmarkNewTask" classname="mycode/common" time="0.000000391"></testcase>
+		<testcase name="BenchmarkParse" classname="mycode/common" time="1.591000000"></testcase>
+		<testcase name="BenchmarkNewTask" classname="mycode/common" time="1.173000000"></testcase>
 		<system-out><![CDATA[pkg: mycode/common]]></system-out>
 	</testsuite>
 	<testsuite name="mycode/benchmarks/channels" tests="4" failures="0" errors="0" hostname="hostname" time="47.084" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkFanout/Channel/10" classname="mycode/benchmarks/channels" time="0.000004673"></testcase>
-		<testcase name="BenchmarkFanout/Channel/100" classname="mycode/benchmarks/channels" time="0.000024965"></testcase>
-		<testcase name="BenchmarkFanout/Channel/1000" classname="mycode/benchmarks/channels" time="0.000195672"></testcase>
-		<testcase name="BenchmarkFanout/Channel/10000" classname="mycode/benchmarks/channels" time="0.002410200"></testcase>
+		<testcase name="BenchmarkFanout/Channel/10" classname="mycode/benchmarks/channels" time="2.336500000"></testcase>
+		<testcase name="BenchmarkFanout/Channel/100" classname="mycode/benchmarks/channels" time="1.248250000"></testcase>
+		<testcase name="BenchmarkFanout/Channel/1000" classname="mycode/benchmarks/channels" time="1.956720000"></testcase>
+		<testcase name="BenchmarkFanout/Channel/10000" classname="mycode/benchmarks/channels" time="1.205100000"></testcase>
 		<system-out><![CDATA[pkg: mycode/benchmarks/channels]]></system-out>
 	</testsuite>
 </testsuites>
diff --git a/testdata/027-report.xml b/testdata/027-report.xml
index 792cf19..0afc4d3 100644
--- a/testdata/027-report.xml
+++ b/testdata/027-report.xml
@@ -4,8 +4,8 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkItsy" classname="really/small" time="0.000000045"></testcase>
-		<testcase name="BenchmarkTeeny" classname="really/small" time="0.000000002"></testcase>
+		<testcase name="BenchmarkItsy" classname="really/small" time="1.350000000"></testcase>
+		<testcase name="BenchmarkTeeny" classname="really/small" time="2.000000000"></testcase>
 		<testcase name="BenchmarkWeeny" classname="really/small" time="0.000000000"></testcase>
 		<system-out><![CDATA[goos: darwin
 goarch: amd64
diff --git a/testdata/028-report.xml b/testdata/028-report.xml
index 74a4fb0..04b414c 100644
--- a/testdata/028-report.xml
+++ b/testdata/028-report.xml
@@ -4,7 +4,7 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkRing" classname="single/cpu" time="0.000000074"></testcase>
+		<testcase name="BenchmarkRing" classname="single/cpu" time="1.480000000"></testcase>
 		<system-out><![CDATA[pkg: single/cpu]]></system-out>
 	</testsuite>
 </testsuites>
diff --git a/testdata/029-report.xml b/testdata/029-report.xml
index e64584f..3c446f2 100644
--- a/testdata/029-report.xml
+++ b/testdata/029-report.xml
@@ -4,7 +4,7 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkRingaround" classname="sixteen/cpu" time="0.000013571"></testcase>
+		<testcase name="BenchmarkRingaround" classname="sixteen/cpu" time="1.357100000"></testcase>
 		<system-out><![CDATA[pkg: sixteen/cpu]]></system-out>
 	</testsuite>
 </testsuites>
diff --git a/testdata/033-report.xml b/testdata/033-report.xml
index cf6436b..1ae7bb5 100644
--- a/testdata/033-report.xml
+++ b/testdata/033-report.xml
@@ -4,8 +4,8 @@
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
-		<testcase name="BenchmarkDecode/Digits/Huffman/1e4" classname="compress/flate" time="0.000104427"></testcase>
-		<testcase name="BenchmarkEncode/Digits/Huffman/1e4" classname="compress/flate" time="0.000028334"></testcase>
+		<testcase name="BenchmarkDecode/Digits/Huffman/1e4" classname="compress/flate" time="1.044270000"></testcase>
+		<testcase name="BenchmarkEncode/Digits/Huffman/1e4" classname="compress/flate" time="1.416700000"></testcase>
 		<system-out><![CDATA[goos: linux
 goarch: amd64
 pkg: compress/flate]]></system-out>