Fix some tests.

jenkinsci · Jan 1, 2024 · afb3d2a · afb3d2a
1 parent 8c97e58
commit afb3d2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 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-rc847.81820ecdfde2</plugin-util-api.version>
+    <plugin-util-api.version>3.9.0-rc848.2d5e600a_712a_</plugin-util-api.version>
 
   </properties>
 

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AnalysisResult.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AnalysisResult.java
@@ -52,7 +52,7 @@
  * @author Ullrich Hafner
  */
 @SuppressFBWarnings(value = "SE, DESERIALIZATION_GADGET", justification = "transient fields are restored using a Jenkins callback (or are checked for null)")
-@SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveClassLength", "PMD.GodClass", "checkstyle:ClassFanOutComplexity"})
+@SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessiveClassLength", "PMD.GodClass", "checkstyle:ClassFanOutComplexity", "checkstyle:ClassDataAbstractionCoupling"})
 public class AnalysisResult implements Serializable, StaticAnalysisRun {
     private static final long serialVersionUID = 1110545450292087475L;
 
@@ -551,12 +551,12 @@ public int getSuccessfulSinceBuild() {
      * @see QualityGateEvaluator
      */
     public boolean isSuccessful() {
-        return qualityGateStatus.isSuccessful();
+        return qualityGateResult.isSuccessful();
     }
 
     @Override
     public QualityGateStatus getQualityGateStatus() {
-        return qualityGateStatus;
+        return qualityGateResult.getOverallStatus();
     }
 
     @Whitelisted

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/FilesScannerITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/FilesScannerITest.java
@@ -213,7 +213,9 @@ void findNoIssuesWithMultipleFilesReachableWithSymlinksWithSkipSymbolicLinks() {
 
         assertThat(result).hasTotalSize(0);
         assertThat(result).hasInfoMessages(
-                "-> PASSED - Total (any severity): 0 - Quality Gate: 6");
+                "-> All quality gates have been passed",
+                "-> Details for each quality gate:",
+                "   - [Total (any severity)]: ≪Success≫ - (Actual value: 0, Quality gate: 6.00)");
     }
 
     private AnalysisModelParser createTool(final AnalysisModelParser tool, final boolean skipSymbolicLinks) {

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/QualityGateITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/QualityGateITest.java
@@ -385,7 +385,7 @@ private void scheduleBuildAndAssertStatus(final AbstractProject<?, ?> job, final
         try {
             Run<?, ?> build = getJenkins().assertBuildStatus(result, job.scheduleBuild2(0));
             ResultAction action = build.getAction(ResultAction.class);
-            assertThat(action.getResult()).hasQualityGateStatus(expectedQualityGateStatus);
+            assertThat(action.getResult().getQualityGateResult().getOverallStatus()).isEqualTo(expectedQualityGateStatus);
 
             PullRequestMonitoringPortlet portlet = new PullRequestMonitoringPortlet(action);
             assertThat(portlet.hasQualityGate()).isTrue();