Skip to content

The Unified and Autonomous Development Platform

feat: Able to mark untested lines in source view annotated with test coverage info (OD-2070)

Robin Shende32afe8a40a
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.java
index 89c1aa248b..ca1e615627 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
@@ -154,12 +154,7 @@ public class PublishCoberturaReportStep extends PublishCoverageReportStep {
status = COVERED;
}
}
-
- var prevStatus = coverageStatusesOfFile.get(lineNum);
- if (prevStatus != null)
- coverageStatusesOfFile.put(lineNum, prevStatus.mergeWith(status));
- else if (status != NOT_COVERED)
- coverageStatusesOfFile.put(lineNum, status);
+ coverageStatusesOfFile.put(lineNum, status.mergeWith(coverageStatusesOfFile.get(lineNum)));
}
if (!coverageStatusesOfFile.isEmpty())
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageInfo.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageInfo.java
index 3f682a0068..42a1cf84f1 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageInfo.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageInfo.java
@@ -74,7 +74,7 @@ public class CoverageInfo implements Serializable {
}
public static int getCoverage(int total, int covered) {
- return total != 0? covered * 100 / total: 100;
+ return total != 0? covered * 100 / total: -1;
}
}
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
index 6eaaba8761..c0081a9a48 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java
@@ -79,7 +79,6 @@ public abstract class PublishCoverageReportStep extends PublishReportStep {
protected abstract ProcessResult process(Build build, File inputDir, TaskLogger logger);
private void writeLineStatuses(Build build, String blobPath, Map<Integer, CoverageStatus> lineStatuses) {
- lineStatuses.entrySet().removeIf(it -> it.getValue() == CoverageStatus.NOT_COVERED);
if (!lineStatuses.isEmpty()) {
File reportDir = new File(build.getDir(), CoverageReport.CATEGORY + "/" + getReportName());
File lineCoverageFile = new File(reportDir, CoverageReport.FILES + "/" + blobPath);