Skip to content

The Unified and Autonomous Development Platform

handle testsuites if present (JUnit report format)

Daniel Gollings591fd6f84788
diff --git a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java
index 9ae25302ab..2b2f703a4b 100644
--- a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java
+++ b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/JUnitReportParser.java
@@ -1,6 +1,7 @@
package io.onedev.server.plugin.report.junit;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.dom4j.Document;
@@ -18,60 +19,92 @@ public class JUnitReportParser {
public static List<TestCase> parse(Build build, Document doc) {
List<TestCase> testCases = new ArrayList<>();
- Element testSuiteElement = doc.getRootElement();
- String name = testSuiteElement.attributeValue("name");
- long duration = (long) (Double.parseDouble(testSuiteElement.attributeValue("time"))*1000);
- int tests = Integer.parseInt(testSuiteElement.attributeValue("tests"));
- int failures = Integer.parseInt(testSuiteElement.attributeValue("failures"));
- int errors = Integer.parseInt(testSuiteElement.attributeValue("errors"));
-
- int skipped = 0;
- String skippedString = testSuiteElement.attributeValue("skipped");
- if (StringUtils.isNotBlank(skippedString))
- skipped = Integer.parseInt(skippedString);
-
- Status status;
- if (failures != 0 || errors != 0)
- status = Status.FAILED;
- else if (skipped == tests)
- status = Status.SKIPPED;
- else
- status = Status.PASSED;
-
- String fileName;
- if (name.contains("."))
- fileName = StringUtils.substringAfterLast(name, ".") + ".java";
- else
- fileName = name + ".java";
-
- String partialBlobPath = name.replace('.', '/') + ".java";
+ Element rootElement = doc.getRootElement();
- String blobPath = OneDev.getInstance(CodeSearchManager.class)
- .findBlobPath(build.getProject(), build.getCommitId(), fileName, partialBlobPath);
-
- TestSuite testSuite = new TestSuite(name, status, duration, null, blobPath);
+ List<Element> rootElements = new ArrayList<>();
+ if (rootElement.getName().equals("testsuite")) {
+ // JUnit format
+ rootElements.add(rootElement);
+ } else if (rootElement.getName().equals("testsuites")) {
+ // JUnit report format
+ Iterator<Element> elements = rootElement.elementIterator("testsuite");
+ while(elements.hasNext()) {
+ rootElements.add(elements.next());
+ }
+ } else {
+ return testCases;
+ }
- for (Element testCaseElement: testSuiteElement.elements("testcase")) {
- name = testCaseElement.attributeValue("name");
- if (testCaseElement.element("skipped") != null) {
- testCases.add(new TestCase(testSuite, name, Status.SKIPPED, 0, null));
- } else {
- duration = (long) (Double.parseDouble(testCaseElement.attributeValue("time"))*1000);
+ for (Element testSuiteElement : rootElements) {
+ String name = testSuiteElement.attributeValue("name");
+ String test = testSuiteElement.attributeValue("time");
+ long duration = getDouble(testSuiteElement.attributeValue("time"));
+ int tests = getInt(testSuiteElement.attributeValue("tests"));
+ int failures =getInt(testSuiteElement.attributeValue("failures"));
+ int errors = getInt(testSuiteElement.attributeValue("errors"));
+
+ int skipped = 0;
+ String skippedString = testSuiteElement.attributeValue("skipped");
+ if (StringUtils.isNotBlank(skippedString))
+ skipped = getInt(skippedString);
+
+ Status status;
+ if (failures != 0 || errors != 0)
+ status = Status.FAILED;
+ else if (skipped == tests)
+ status = Status.SKIPPED;
+ else
status = Status.PASSED;
- String message = null;
- Element failureElement = testCaseElement.element("failure");
- Element errorElement = testCaseElement.element("error");
- if (failureElement != null) {
- status = Status.FAILED;
- message = failureElement.getText();
- } else if (errorElement != null) {
- status = Status.FAILED;
- message = errorElement.getText();
- }
- testCases.add(new TestCase(testSuite, name, status, duration, message));
+
+ String fileName;
+ if (name.contains("."))
+ fileName = StringUtils.substringAfterLast(name, ".") + ".java";
+ else
+ fileName = name + ".java";
+
+ String partialBlobPath = name.replace('.', '/') + ".java";
+
+ String blobPath = OneDev.getInstance(CodeSearchManager.class)
+ .findBlobPath(build.getProject(), build.getCommitId(), fileName, partialBlobPath);
+
+ TestSuite testSuite = new TestSuite(name, status, duration, null, blobPath);
+
+ for (Element testCaseElement: testSuiteElement.elements("testcase")) {
+ name = testCaseElement.attributeValue("name");
+ if (testCaseElement.element("skipped") != null) {
+ testCases.add(new TestCase(testSuite, name, Status.SKIPPED, 0, null));
+ } else {
+ duration = getDouble(testCaseElement.attributeValue("time"));
+ status = Status.PASSED;
+ String message = null;
+ Element failureElement = testCaseElement.element("failure");
+ Element errorElement = testCaseElement.element("error");
+ if (failureElement != null) {
+ status = Status.FAILED;
+ message = failureElement.getText();
+ } else if (errorElement != null) {
+ status = Status.FAILED;
+ message = errorElement.getText();
+ }
+ testCases.add(new TestCase(testSuite, name, status, duration, message));
+ }
}
}
return testCases;
}
+ public static int getInt(String input) {
+ if (input == null) {
+ return 0;
+ }
+ return Integer.parseInt(input);
+ }
+
+ public static long getDouble(String input) {
+ if (input == null) {
+ return 0;
+ }
+ return (long) Double.parseDouble(input);
+ }
+
}