Make API method of quality result accessible.

jenkinsci · Jan 2, 2024 · 69d72f5 · 69d72f5
1 parent afb3d2a
commit 69d72f5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -51,7 +51,7 @@
     <argLine>-Djava.awt.headless=true -Xmx1024m -Djenkins.test.timeout=1000 --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
 
     <prism-api.version>1.29.0-8</prism-api.version>
-    <plugin-util-api.version>3.9.0-rc848.2d5e600a_712a_</plugin-util-api.version>
+    <plugin-util-api.version>3.9.0-rc849.401125b_7782e</plugin-util-api.version>
 
   </properties>
 

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/WarningsQualityGate.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/WarningsQualityGate.java
@@ -6,6 +6,7 @@
 
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.verb.POST;
 import hudson.Extension;
@@ -53,15 +54,35 @@ public WarningsQualityGate(final int threshold, final QualityGateType type) {
      *         the minimum number of issues that fails the quality gate
      * @param type
      *         the type of the quality gate
-     * @param criticality the criticality of the quality gate
+     * @param criticality
+     *         the criticality of the quality gate
      */
-    public WarningsQualityGate(final int threshold, final QualityGateType type, final QualityGateCriticality criticality) {
+    public WarningsQualityGate(final int threshold, final QualityGateType type,
+            final QualityGateCriticality criticality) {
         super(threshold);
 
         this.type = type;
         setCriticality(criticality);
     }
 
+    /**
+     * Sets the criticality of the quality gate.
+     *
+     * @param unstable
+     *         the criticality of the quality gate
+     * @deprecated use {@link #setCriticality(QualityGateCriticality)} instead
+     */
+    @DataBoundSetter
+    @Deprecated
+    public void setUnstable(final boolean unstable) {
+        if (unstable) {
+            setCriticality(QualityGateCriticality.UNSTABLE);
+        }
+        else {
+            setCriticality(QualityGateCriticality.FAILURE);
+        }
+    }
+
     /**
      * Returns the method that should be used to determine the actual number of issues in the build.
      *

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/ReferenceFinderITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/ReferenceFinderITest.java
@@ -328,8 +328,7 @@ void shouldCreateUnstableResultWithNotIgnoredUnstableInBetween() {
         // #3 UNSTABLE (Reference #2)
         cleanAndCopy(project, "eclipse8Warnings.txt");
         issuesRecorder.setQualityGates(List.of(
-                new WarningsQualityGate(3, QualityGateType.NEW, QualityGateCriticality.UNSTABLE)));
-        issuesRecorder.setQualityGates(List.of(
+                new WarningsQualityGate(3, QualityGateType.NEW, QualityGateCriticality.UNSTABLE),
                 new WarningsQualityGate(9, QualityGateType.TOTAL, QualityGateCriticality.UNSTABLE)));
 
         scheduleBuildAndAssertStatus(project, Result.UNSTABLE, analysisResult -> assertThat(analysisResult)
@@ -636,11 +635,10 @@ void shouldCreateUnstableResultWithNotIgnoredUnstableInBetweenWithReferenceBuild
         FreeStyleProject project = createJob(JOB_NAME, "eclipse8Warnings.txt");
         enableWarnings(project, recorder -> {
             recorder.setQualityGates(List.of(
-                    new WarningsQualityGate(3, QualityGateType.NEW, QualityGateCriticality.UNSTABLE)));
+                    new WarningsQualityGate(3, QualityGateType.NEW, QualityGateCriticality.UNSTABLE),
+                    new WarningsQualityGate(9, QualityGateType.TOTAL, QualityGateCriticality.UNSTABLE)));
             recorder.setReferenceJobName(REFERENCE_JOB_NAME);
             recorder.setIgnoreQualityGate(true);
-            recorder.setQualityGates(List.of(
-                    new WarningsQualityGate(9, QualityGateType.TOTAL, QualityGateCriticality.UNSTABLE)));
         });
         scheduleBuildAndAssertStatus(project, Result.UNSTABLE, analysisResult -> assertThat(analysisResult)
                 .hasTotalSize(8)

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/StepsITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/StepsITest.java
@@ -274,7 +274,7 @@ private void configurePublisher(final WorkflowJob job, final String fileName, fi
                 + "         echo '[name=' + action.getDisplayName() + ']' \n"
                 + "         echo '[isSuccessful=' + action.isSuccessful() + ']' \n"
                 + "         def result = action.getResult()\n"
-                + "         def status = result.getQualityGateStatus()\n"
+                + "         def status = result.getQualityGateResult()\n"
                 + "         echo '[status=' + status + ']' \n"
                 + "         echo '[isSuccessfulQualityGate=' + status.isSuccessful() + ']' \n"
                 + "         def totals = result.getTotals()\n"
@@ -1101,7 +1101,7 @@ void publishIssuesShouldMarkStepWithWarningAction() {
         assertThat(publishIssuesNode).isNotNull();
         WarningAction warningAction = publishIssuesNode.getPersistentAction(WarningAction.class);
         assertThat(warningAction).isNotNull();
-        assertThat(warningAction.getMessage()).isEqualTo(
+        assertThat(warningAction.getMessage()).endsWith(
                 "Some quality gates have been missed: overall result is UNSTABLE");
     }
 
@@ -1123,7 +1123,7 @@ void recordIssuesShouldMarkStepWithWarningAction() {
         assertThat(publishIssuesNode).isNotNull();
         WarningAction warningAction = publishIssuesNode.getPersistentAction(WarningAction.class);
         assertThat(warningAction).isNotNull();
-        assertThat(warningAction.getMessage()).isEqualTo(
+        assertThat(warningAction.getMessage()).endsWith(
                 "Some quality gates have been missed: overall result is UNSTABLE");
     }