The Unified and Autonomous Development Platform
fix: Unable to publish cobertura report (OD-2318)
Robin Shenbd4f32976be6
diff --git a/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.java b/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.javaindex 4b3ffef8b3..4c89631702 100644--- a/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.java+++ b/server-plugin/server-plugin-report-cobertura/src/main/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStep.java@@ -84,8 +84,11 @@ public class PublishCoberturaReportStep extends PublishCoverageReportStep {coveredLines += parseInt(coverageElement.attributeValue("lines-covered"));var sourcePaths = new ArrayList<String>();- for (var sourceElement: coverageElement.element("sources").elements())- sourcePaths.add(sourceElement.getText().trim());+ var sourcesElement = coverageElement.element("sources");+ if (sourcesElement != null) {+ for (var sourceElement: sourcesElement.elements())+ sourcePaths.add(sourceElement.getText().trim());+ }Map<String, Optional<String>> blobPaths = new HashMap<>();@@ -104,17 +107,20 @@ public class PublishCoberturaReportStep extends PublishCoverageReportStep {var fileName = classElement.attributeValue("filename");var blobPathOpt = blobPaths.get(fileName);if (blobPathOpt == null) {- for (var sourcePath: sourcePaths) {- var blobPath = build.getBlobPath(sourcePath + "/" + fileName);- if (blobPath != null) {- blobPathOpt = Optional.of(blobPath);- break;+ String blobPath;+ if (sourcePaths.isEmpty()) {+ blobPath = build.getBlobPath(fileName);+ } else {+ blobPath = null;+ for (var sourcePath: sourcePaths) {+ blobPath = build.getBlobPath(sourcePath + "/" + fileName);+ if (blobPath != null)+ break;}}- if (blobPathOpt == null) {- blobPathOpt = Optional.empty();+ if (blobPath == null)logger.warning("Unable to find blob path for file: " + fileName);- }+ blobPathOpt = Optional.ofNullable(blobPath);blobPaths.put(fileName, blobPathOpt);}var blobPath = blobPathOpt.orElse(null);diff --git a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.javaindex ffd415e3a2..dd04510eb5 100644--- a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java+++ b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/PublishCoberturaReportStepTest.java@@ -74,7 +74,7 @@ public class PublishCoberturaReportStepTest {program1Found = true;if (each.getBlobPath().endsWith("Program2.cs"))program2Found = true;- if (each.getBlobPath().equals("coverlet/supermario/Movement.cs"))+ if (each.getBlobPath().equals("supermario/Movement.cs"))fileCoverage = each;}}@@ -86,7 +86,7 @@ public class PublishCoberturaReportStepTest {assertEquals(36, fileCoverage.getTotalLines());assertEquals(33, fileCoverage.getCoveredLines());- var statusesOfFile = result.getStatuses().get("coverlet/supermario/Movement.cs");+ var statusesOfFile = result.getStatuses().get("supermario/Movement.cs");var expected = new HashMap<Integer, CoverageStatus>();expected.put(37, CoverageStatus.COVERED);diff --git a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage1.xml b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage1.xmlindex 388e39e28d..87d693a7fb 100644--- a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage1.xml+++ b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage1.xml@@ -1,9 +1,6 @@<?xml version="1.0" encoding="utf-8"?><coverage line-rate="0.7234" branch-rate="0.5" version="1.9" timestamp="1693882608" lines-covered="34" lines-valid="47"branches-covered="4" branches-valid="8">- <sources>- <source>coverlet</source>- </sources><packages><package name="supermario" line-rate="0.7559999999999999" branch-rate="0.5" complexity="18"><classes>diff --git a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage2.xml b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage2.xmlindex 11b8ebd4c1..8c34c079a6 100644--- a/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage2.xml+++ b/server-plugin/server-plugin-report-cobertura/src/test/java/io/onedev/server/plugin/report/cobertura/coverage2.xml@@ -1,9 +1,6 @@<?xml version="1.0" encoding="utf-8"?><coverage line-rate="0.7234" branch-rate="0.5" version="1.9" timestamp="1693882608" lines-covered="34" lines-valid="47"branches-covered="4" branches-valid="8">- <sources>- <source>coverlet</source>- </sources><packages><package name="supermario" line-rate="0.7559999999999999" branch-rate="0.5" complexity="18"><classes>