Merge pr #6, upgrading tap4j to 4.2.0 and resolving conflicts

jenkinsci · May 18, 2016 · 8e30c2d · 8e30c2d
2 parents 4646fba + 1d964ea
commit 8e30c2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -92,7 +92,7 @@
 		<dependency>
 			<groupId>org.tap4j</groupId>
 			<artifactId>tap4j</artifactId>
-			<version>4.1.2</version>
+			<version>4.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/tap4j/plugin/model/TapTestResultResult.java b/src/main/java/org/tap4j/plugin/model/TapTestResultResult.java
@@ -262,7 +262,7 @@ public float getDuration() {
             Object duration = diagnostic.get(DURATION_KEY);
             if (duration != null) {
                 Float durationMS = Float.parseFloat(duration.toString());
-                return durationMS.floatValue();
+                return durationMS.floatValue() / 1000;
             }
         }
         return super.getDuration();

diff --git a/src/test/java/org/tap4j/plugin/issue16647/TestIssue16647.java b/src/test/java/org/tap4j/plugin/issue16647/TestIssue16647.java
@@ -25,7 +25,7 @@ public void testDurationMs() throws IOException, InterruptedException, Execution
                 "ok 1 - Input file opened\n" +
                 "not ok 2 - First line of the input valid\n" +
                 "  ---\n" +
-                "    duration_ms: 100.66\n" +
+                "    duration_ms: 100660.00\n" +
                 "  ...\n";
 
         project.getBuildersList().add(new TestBuilder() {