Merge pull request #429 from soid/duration-in-history

JENKINS-13377 test suite duration may be calculated wrong
jenkinsci · Apr 8, 2012 · e330af1 · e330af1
2 parents 5432576 + f8a0fc0
commit e330af1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/core/src/main/java/hudson/tasks/junit/TestResult.java b/core/src/main/java/hudson/tasks/junit/TestResult.java
@@ -200,6 +200,7 @@ private void add(SuiteResult sr) {
                     s.addCase(cr);
                     cr.replaceParent(s);
                 }
+                duration += sr.getDuration();
                 return;
             }
         }

diff --git a/core/src/test/java/hudson/tasks/junit/TestResultTest.java b/core/src/test/java/hudson/tasks/junit/TestResultTest.java
@@ -125,6 +125,9 @@ public void testTestSuiteDistributedOverMultipleFilesIsCountedAsOne() throws IOE
 
         assertEquals("Wrong number of testsuites", 1, testResult.getSuites().size());
         assertEquals("Wrong number of test cases", 2, testResult.getTotalCount());
+
+        // check duration: 157.980 (TestSuite_a1.xml) and 15.000 (TestSuite_a2.xml) = 172.98 
+        assertEquals("Wrong duration for test result", 172.98, testResult.getDuration(), 0.1);
     }
 
     /**
@@ -139,6 +142,7 @@ public void testDuplicatedTestSuiteIsNotCounted() throws IOException, URISyntaxE
 
         assertEquals("Wrong number of testsuites", 1, testResult.getSuites().size());
         assertEquals("Wrong number of test cases", 1, testResult.getTotalCount());
+        assertEquals("Wrong duration for test result", 1.0, testResult.getDuration(), 0.01);
     }
 
     private static final XStream XSTREAM = new XStream2();