Merge pull request #672 from jenkinsci/use-id-to-select-reference-action

Use the correct ID of the action when comparing with reference build
jenkinsci · May 10, 2023 · d4f72fe · d4f72fe
2 parents af39962 + 22a5917
commit d4f72fe
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageBuildAction.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageBuildAction.java
@@ -546,6 +546,7 @@ public String formatDelta(final Baseline baseline, final Metric metric) {
      *
      * @return {@code true} if the trend is positive, {@code false} otherwise
      */
+    @SuppressWarnings("unused") // Called by jelly view
     public boolean isPositiveTrend(final Baseline baseline, final Metric metric) {
         var delta = getDelta(baseline, metric);
         if (delta.isPresent()) {
@@ -581,7 +582,7 @@ NavigableSet<Metric> getMetricsForSummary() {
     }
 
     /**
-     * Renders the reference build as HTML link.
+     * Renders the reference build as HTML-link.
      *
      * @return the reference build
      * @see #getReferenceBuild()

diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageReporter.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageReporter.java
@@ -46,7 +46,7 @@ CoverageBuildAction publishAction(final String id, final String optionalName, fi
             throws InterruptedException {
         FilteredLog log = new FilteredLog("Errors while reporting code coverage results:");
 
-        Optional<CoverageBuildAction> possibleReferenceResult = getReferenceBuildAction(build, log);
+        Optional<CoverageBuildAction> possibleReferenceResult = getReferenceBuildAction(build, id, log);
 
         List<FileNode> filesToStore;
         CoverageBuildAction action;
@@ -194,7 +194,7 @@ private boolean hasLineCoverageSet(final Value value) {
         return ((edu.hm.hafner.coverage.Coverage) value).isSet();
     }
 
-    private Optional<CoverageBuildAction> getReferenceBuildAction(final Run<?, ?> build, final FilteredLog log) {
+    private Optional<CoverageBuildAction> getReferenceBuildAction(final Run<?, ?> build, final String id, final FilteredLog log) {
         log.logInfo("Obtaining action of reference build");
 
         ReferenceFinder referenceFinder = new ReferenceFinder();
@@ -204,7 +204,7 @@ private Optional<CoverageBuildAction> getReferenceBuildAction(final Run<?, ?> bu
         if (reference.isPresent()) {
             Run<?, ?> referenceBuild = reference.get();
             log.logInfo("-> Using reference build '%s'", referenceBuild);
-            previousResult = getPreviousResult(reference.get());
+            previousResult = getPreviousResult(id, reference.get());
             if (previousResult.isPresent()) {
                 Run<?, ?> fallbackBuild = previousResult.get().getOwner();
                 if (!fallbackBuild.equals(referenceBuild)) {
@@ -214,7 +214,7 @@ private Optional<CoverageBuildAction> getReferenceBuildAction(final Run<?, ?> bu
             }
         }
         else {
-            previousResult = getPreviousResult(build.getPreviousBuild());
+            previousResult = getPreviousResult(id, build.getPreviousBuild());
             previousResult.ifPresent(coverageBuildAction ->
                     log.logInfo("-> No reference build defined, falling back to previous build: '%s'",
                             coverageBuildAction.getOwner().getDisplayName()));
@@ -232,11 +232,13 @@ private Optional<CoverageBuildAction> getReferenceBuildAction(final Run<?, ?> bu
         return Optional.of(referenceAction);
     }
 
-    private Optional<CoverageBuildAction> getPreviousResult(@CheckForNull final Run<?, ?> startSearch) {
+    private Optional<CoverageBuildAction> getPreviousResult(final String id, @CheckForNull final Run<?, ?> startSearch) {
         for (Run<?, ?> build = startSearch; build != null; build = build.getPreviousBuild()) {
-            CoverageBuildAction action = build.getAction(CoverageBuildAction.class);
-            if (action != null) {
-                return Optional.of(action);
+            List<CoverageBuildAction> actions = build.getActions(CoverageBuildAction.class);
+            for (CoverageBuildAction action : actions) {
+                if (action.getUrlName().equals(id)) {
+                    return Optional.of(action);
+                }
             }
         }
         return Optional.empty();

diff --git a/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/DeltaComputationITest.java b/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/DeltaComputationITest.java
@@ -32,7 +32,7 @@ void shouldComputeDeltaInFreestyleJob() {
         Run<?, ?> firstBuild = buildSuccessfully(project);
         verifyFirstBuild(firstBuild);
 
-        // update parser pattern to pick only the coding style results
+        // update the parser pattern to pick only the coding style results
         project.getPublishersList().get(CoverageRecorder.class).getTools().get(0).setPattern(JACOCO_CODING_STYLE_FILE);
 
         Run<?, ?> secondBuild = buildSuccessfully(project);
@@ -48,7 +48,24 @@ void shouldComputeDeltaInPipeline() {
         Run<?, ?> firstBuild = buildSuccessfully(job);
         verifyFirstBuild(firstBuild);
 
-        // update parser pattern to pick only the codingstyle results
+        computeDeltaInSecondBuild(job, firstBuild);
+    }
+
+    @Test
+    void shouldSelectResultByIdInReferenceBuild() {
+        WorkflowJob job = createPipelineWithWorkspaceFiles(JACOCO_ANALYSIS_MODEL_FILE, JACOCO_CODING_STYLE_FILE, "mutations.xml");
+
+        // Create a build with two different actions
+        setPipelineScript(job,
+                "recordCoverage tools: [[parser: '" + Parser.PIT.name() + "', pattern: '**/mutations.xml']], id: 'pit'\n"
+                + "recordCoverage tools: [[parser: '" + Parser.JACOCO.name() + "', pattern: '**/jacoco*xml']]\n");
+
+        Run<?, ?> firstBuild = buildSuccessfully(job);
+
+        computeDeltaInSecondBuild(job, firstBuild);
+    }
+
+    private void computeDeltaInSecondBuild(final WorkflowJob job, final Run<?, ?> firstBuild) {
         setPipelineScript(job,
                 "recordCoverage tools: [[parser: 'JACOCO', pattern: '" + JACOCO_CODING_STYLE_FILE + "']]");
 
@@ -119,8 +136,8 @@ private void verifyDeltaComputation(final Run<?, ?> firstBuild, final Run<?, ?>
     }
 
     /**
-     * Verifies the calculated modified lines coverage including the modified lines coverage delta and the code delta. This makes sure
-     * these metrics are set properly even if there are no code changes.
+     * Verifies the calculated modified lines coverage including the modified lines coverage delta and the code delta.
+     * This makes sure these metrics are set properly even if there are no code changes.
      *
      * @param action
      *         The created Jenkins action