percentages) {
diff --git a/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/GitForensicsITest.java b/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/GitForensicsITest.java
index 6e07f442c..b9cba9d7d 100644
--- a/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/GitForensicsITest.java
+++ b/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/GitForensicsITest.java
@@ -6,8 +6,6 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
import edu.hm.hafner.coverage.Coverage;
import edu.hm.hafner.coverage.Difference;
@@ -44,7 +42,6 @@
* @author Florian Orendi
*/
@Disabled("Docker tests are failing with Java 17 Jenkins")
-@Testcontainers(disabledWithoutDocker = true)
class GitForensicsITest extends AbstractCoverageITest {
/** The JaCoCo coverage report, generated for the commit {@link #COMMIT}. */
private static final String JACOCO_FILE = "forensics_integration.xml";
@@ -56,7 +53,6 @@ class GitForensicsITest extends AbstractCoverageITest {
private static final String REPOSITORY = "https://github.com/jenkinsci/forensics-api-plugin.git";
- @Container
private static final AgentContainer AGENT_CONTAINER = new AgentContainer();
@ParameterizedTest(name = "Source code retention {0} should store {1} files")
@@ -116,8 +112,10 @@ void shouldVerifyQualityGate(final Baseline baseline, final double threshold, fi
verifyGitRepositoryForCommit(referenceBuild, COMMIT_REFERENCE);
String qualityGate = String.format(", qualityGates: ["
- + " [threshold: %f, metric: 'LINE', baseline: '%s', criticality: 'UNSTABLE']]", threshold, baseline.name());
- project.setDefinition(createPipelineForCommit(node, COMMIT, JACOCO_FILE, SourceCodeRetention.EVERY_BUILD, qualityGate));
+ + " [threshold: %f, metric: 'LINE', baseline: '%s', criticality: 'UNSTABLE']]", threshold,
+ baseline.name());
+ project.setDefinition(
+ createPipelineForCommit(node, COMMIT, JACOCO_FILE, SourceCodeRetention.EVERY_BUILD, qualityGate));
Run, ?> build = buildWithResult(project, Result.UNSTABLE);
verifyCoverage(build.getAction(CoverageBuildAction.class), referenceBuild.getAction(CoverageBuildAction.class));
@@ -127,10 +125,12 @@ void shouldVerifyQualityGate(final Baseline baseline, final double threshold, fi
if (baseline == Baseline.PROJECT_DELTA
|| baseline == Baseline.MODIFIED_FILES_DELTA
|| baseline == Baseline.MODIFIED_LINES_DELTA) {
- assertThat(getConsoleLog(build)).contains("≪Unstable≫ - (Actual value: %+.2f%%, Quality gate: %.2f)".formatted(value, threshold));
+ assertThat(getConsoleLog(build)).contains(
+ "≪Unstable≫ - (Actual value: %+.2f%%, Quality gate: %.2f)".formatted(value, threshold));
}
else {
- assertThat(getConsoleLog(build)).contains("≪Unstable≫ - (Actual value: %.2f%%, Quality gate: %.2f)".formatted(value, threshold));
+ assertThat(getConsoleLog(build)).contains(
+ "≪Unstable≫ - (Actual value: %.2f%%, Quality gate: %.2f)".formatted(value, threshold));
}
}
diff --git a/pom.xml b/pom.xml
index 796c00c68..70e96fcb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.jvnet.hudson.plugins
analysis-pom
- 11.2958.v63511c4c1160
+ 12.3159.v1734d34dfb_fc
@@ -21,7 +21,7 @@
- 2
+ 3
999999-SNAPSHOT
jenkinsci/coverage-plugin
diff --git a/ui-tests/pom.xml b/ui-tests/pom.xml
index 4430dc07c..de1d06181 100644
--- a/ui-tests/pom.xml
+++ b/ui-tests/pom.xml
@@ -5,7 +5,7 @@
edu.hm.hafner
codingstyle-pom
- 5.42.0
+ 6.8.0
@@ -16,8 +16,8 @@
UI Tests of Code Coverage Plugin
- 2.556
- 3.1795.v6fb_496fc129b_
+ 2.558
+ 3.1820.ve687007a_69e5
2.3
5.1.1
${project.groupId}.code.coverage.api.ui.tests
@@ -48,12 +48,12 @@
org.jenkins-ci
acceptance-test-harness
- 6509.v07d7a_3818f74
+ 6623.v46eb_51303186
com.fasterxml.jackson.core
jackson-databind
- 2.21.0
+ 2.21.2
test
@@ -171,7 +171,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.5.4
+ 3.5.5
true
false
@@ -259,7 +259,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.5.4
+ 3.5.5
false
false
diff --git a/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/threshold/AbstractThreshold.java b/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/threshold/AbstractThreshold.java
index 42407e1e0..fb3851129 100644
--- a/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/threshold/AbstractThreshold.java
+++ b/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/threshold/AbstractThreshold.java
@@ -7,7 +7,7 @@
/**
* Used for thresholds and global thresholds.
*/
-abstract class AbstractThreshold extends PageAreaImpl {
+public abstract class AbstractThreshold extends PageAreaImpl {
private final Control thresholdTarget = control("thresholdTarget");
private final Control unhealthyThreshold = control("unhealthyThreshold");
private final Control unstableThreshold = control("unstableThreshold");
@@ -22,6 +22,7 @@ abstract class AbstractThreshold extends PageAreaImpl {
* @param path
* to threshold
*/
+ @SuppressWarnings("this-escape")
protected AbstractThreshold(final PageArea parent, final String path) {
super(parent, path);
}
@@ -70,7 +71,7 @@ public void delete() {
/**
* Ensures advanced options are activated so that Thresholds can be set.
*/
- public abstract void ensureAdvancedOptionsIsActivated();
+ abstract void ensureAdvancedOptionsIsActivated();
Control getThresholdTarget() {
return thresholdTarget;