Fix quality gate definition in Job DSL.

jenkinsci · Jan 2, 2024 · 0ec09b2 · 0ec09b2
1 parent 58afecf
commit 0ec09b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/integrations/JobDslITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/integrations/JobDslITest.java
@@ -15,9 +15,11 @@
 import io.jenkins.plugins.analysis.core.steps.IssuesRecorder;
 import io.jenkins.plugins.analysis.core.testutil.IntegrationTestWithJenkinsPerTest;
 import io.jenkins.plugins.analysis.core.util.TrendChartType;
+import io.jenkins.plugins.analysis.core.util.WarningsQualityGate.QualityGateType;
 import io.jenkins.plugins.analysis.warnings.Java;
 import io.jenkins.plugins.casc.ConfigurationAsCode;
 import io.jenkins.plugins.casc.ConfiguratorException;
+import io.jenkins.plugins.util.QualityGate.QualityGateCriticality;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -107,12 +109,15 @@ void shouldCreateFreestyleJobUsingJobDslAndVerifyIssueRecorderWithValuesSet() {
         assertThat(recorder.getSourceCodeEncoding()).isEqualTo("UTF-8");
         assertThat(recorder.getUnhealthy()).isEqualTo(50);
         assertThat(recorder.getReferenceJobName()).isEqualTo("test-job");
-        assertThat(recorder.getQualityGates()).hasSize(1);
+        assertThat(recorder.getQualityGates()).hasSize(1)
+                .first().satisfies(gate -> {
+                    assertThat(gate.getThreshold()).isEqualTo(10.0);
+                    assertThat(gate.getType()).isEqualTo(QualityGateType.TOTAL);
+                    assertThat(gate.getCriticality()).isEqualTo(QualityGateCriticality.FAILURE);
+                });
 
         List<Tool> tools = recorder.getTools();
-        assertThat(tools).hasSize(2);
-        assertThat(tools.get(0)).isInstanceOf(Java.class);
-
+        assertThat(tools).hasSize(2).first().isInstanceOf(Java.class);
     }
 
     /**

diff --git a/...test/resources/io/jenkins/plugins/analysis/warnings/integrations/job-dsl-warnings-ng.yaml b/...test/resources/io/jenkins/plugins/analysis/warnings/integrations/job-dsl-warnings-ng.yaml
@@ -6,7 +6,6 @@ jobs:
                     trendChartType('NONE')
                     aggregatingResults(true)
                     blameDisabled(true)
-                    forensicsDisabled(true)
                     enabledForFailure(true)
                     quiet(false)
                     healthy(10)
@@ -20,10 +19,10 @@ jobs:
                     unhealthy(50)
                     referenceJobName('test-job')
                     qualityGates {
-                        qualityGate {
+                        warningsQualityGate {
                             threshold(10)
                             type('TOTAL')
-                            unstable(true)
+                            criticality('FAILURE')
                         }
                     }
                     tools {