diff --git a/core/src/main/java/hudson/tasks/junit/TestResult.java b/core/src/main/java/hudson/tasks/junit/TestResult.java index 9ddf957a06..13e8156121 100644 --- a/core/src/main/java/hudson/tasks/junit/TestResult.java +++ b/core/src/main/java/hudson/tasks/junit/TestResult.java @@ -185,7 +185,6 @@ public final class TestResult extends MetaTabulatedResult { } private void add(SuiteResult sr) { - duration += sr.getDuration(); for (SuiteResult s : suites) { // JENKINS-12457: If a testsuite is distributed over multiple files, merge it into a single SuiteResult: if(s.getName().equals(sr.getName()) && nullSafeEq(s.getId(),sr.getId())) { @@ -201,10 +200,12 @@ public final class TestResult extends MetaTabulatedResult { s.addCase(cr); cr.replaceParent(s); } + duration += sr.getDuration(); return; } } suites.add(sr); + duration += sr.getDuration(); } private boolean strictEq(Object lhs, Object rhs) { diff --git a/core/src/test/java/hudson/tasks/junit/TestResultTest.java b/core/src/test/java/hudson/tasks/junit/TestResultTest.java index 46e22d54e6..90f9f6a27f 100644 --- a/core/src/test/java/hudson/tasks/junit/TestResultTest.java +++ b/core/src/test/java/hudson/tasks/junit/TestResultTest.java @@ -142,6 +142,7 @@ public class TestResultTest extends TestCase { 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();