Return the created action from the test method.

jenkinsci · Oct 15, 2024 · 641de01 · 641de01
1 parent dab14c5
commit 641de01
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/ParsersITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/ParsersITest.java
@@ -15,6 +15,7 @@
 import io.jenkins.plugins.analysis.core.model.AnalysisModelParser;
 import io.jenkins.plugins.analysis.core.model.AnalysisResult;
 import io.jenkins.plugins.analysis.core.model.ReportScanningTool;
+import io.jenkins.plugins.analysis.core.model.ResultAction;
 import io.jenkins.plugins.analysis.core.model.StaticAnalysisLabelProvider;
 import io.jenkins.plugins.analysis.core.model.Tool;
 import io.jenkins.plugins.analysis.core.testutil.IntegrationTestWithJenkinsPerSuite;
@@ -1045,29 +1046,30 @@ void shouldFindAllGrypeIssues() {
         shouldFindIssuesOfTool(3, new Grype(), "grype-report.json");
     }
 
-    private void shouldFindIssuesOfTool(final int expectedSizeOfIssues, final ReportScanningTool tool,
+    private ResultAction shouldFindIssuesOfTool(final int expectedSizeOfIssues, final ReportScanningTool tool,
             final String... fileNames) {
         String defaultPipelineDefinition = "recordIssues tool: %s(pattern:'**/%s', reportEncoding:'UTF-8')";
 
-        findIssuesInPipeline(defaultPipelineDefinition,
+        var action = findIssuesInPipeline(defaultPipelineDefinition,
                 expectedSizeOfIssues, tool, fileNames);
 
         String ansiPipelineDefinition = "wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {\n"
                 + "  " + defaultPipelineDefinition + "\n"
                 + "}";
 
-        findIssuesInPipeline(ansiPipelineDefinition,
-                expectedSizeOfIssues, tool, fileNames);
+        findIssuesInPipeline(ansiPipelineDefinition, expectedSizeOfIssues, tool, fileNames);
+
+        return action;
     }
 
-    private Report findIssuesWithoutAnsiColorPlugin(final int expectedSizeOfIssues, final ReportScanningTool tool,
+    private ResultAction findIssuesWithoutAnsiColorPlugin(final int expectedSizeOfIssues, final ReportScanningTool tool,
             final String... fileNames) {
         return findIssuesInPipeline(
                 "recordIssues tool: %s(pattern:'**/%s', reportEncoding:'UTF-8')", expectedSizeOfIssues, tool,
                 fileNames);
     }
 
-    private Report findIssuesWithAnsiColorPlugin(final int expectedSizeOfIssues,
+    private ResultAction findIssuesWithAnsiColorPlugin(final int expectedSizeOfIssues,
             final ReportScanningTool tool, final String... fileNames) {
         String pipelineDefinition = "wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {\n"
                 + "  recordIssues tool: %s(pattern:'**/%s', reportEncoding:'UTF-8')\n"
@@ -1076,7 +1078,7 @@ private Report findIssuesWithAnsiColorPlugin(final int expectedSizeOfIssues,
     }
 
     @SuppressWarnings({"illegalcatch", "OverlyBroadCatchBlock", "PMD.LinguisticNaming"})
-    private Report findIssuesInPipeline(final String pipelineDefinition,
+    private ResultAction findIssuesInPipeline(final String pipelineDefinition,
             final int expectedSizeOfIssues, final ReportScanningTool tool, final String... fileNames) {
         try {
             WorkflowJob job = createPipeline();
@@ -1095,7 +1097,7 @@ private Report findIssuesInPipeline(final String pipelineDefinition,
             assertThat(report.filter(issue -> issue.getOrigin().equals(tool.getActualId())))
                     .hasSize(expectedSizeOfIssues);
 
-            return report;
+            return result.getOwner().getAction(ResultAction.class);
         }
         catch (Exception exception) {
             throw new AssertionError(exception);