Use JUnit 5 for integration tests

plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>5.19.0</version>
+    <version>5.22.0</version>
     <relativePath />
   </parent>
 
@@ -30,7 +30,7 @@
     <data-tables-api.version>1.11.4-4</data-tables-api.version>
     <forensics-api.version>1.12.0</forensics-api.version>
     <pull-request-monitoring.version>1.7.8</pull-request-monitoring.version>
-    <plugin-util-api.version>2.15.0</plugin-util-api.version>
+    <plugin-util-api.version>2.16.0</plugin-util-api.version>
     <fontawesome-api.version>6.0.0-1</fontawesome-api.version>
     <bootstrap5-api.version>5.1.3-6</bootstrap5-api.version>
     <jquery3-api.version>3.6.0-2</jquery3-api.version>
@@ -40,6 +40,7 @@
     <gson.version>2.9.0</gson.version>
     <prism-api.version>1.26.0-2</prism-api.version>
     <docker-fixtures.version>1.11</docker-fixtures.version>
+    <testcontainers.version>1.16.3</testcontainers.version>
   </properties>
 
   <developers>
@@ -216,37 +217,54 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- Docker Agents -->
     <dependency>
-      <groupId>org.jenkins-ci.test</groupId>
-      <artifactId>docker-fixtures</artifactId>
-      <version>${docker-fixtures.version}</version>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>credentials</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>ssh-slaves</artifactId>
+      <artifactId>git</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>credentials</artifactId>
+      <artifactId>git-client</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>git</artifactId>
+      <artifactId>timestamper</artifactId>
+      <version>1.17</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>git-client</artifactId>
+      <artifactId>ssh-credentials</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>timestamper</artifactId>
-      <version>1.17</version>
+      <artifactId>ssh-slaves</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
+      <version>${testcontainers.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

plugin/src/main/resources/index.jelly

@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <div>
-    This plugin serves as API to integrate and publish multiple coverage report types.
+    Collects code coverage results of different tools (JaCoCo, Cobertura, etc.) and visualizes the results.
 </div>

plugin/src/test/java/io/jenkins/plugins/coverage/model/AbstractCoverageTest.java

@@ -18,7 +18,7 @@
  *
  * @author Ullrich Hafner
  */
-public class AbstractCoverageTest extends ResourceTest {
+public abstract class AbstractCoverageTest extends ResourceTest {
     static final double PRECISION = 0.01;
     static final CoverageMetric MODULE = CoverageMetric.MODULE;
     static final CoverageMetric PACKAGE = CoverageMetric.PACKAGE;

plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePlugin0vsOkITest.java

@@ -2,7 +2,7 @@
 
 import java.util.Collections;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -15,14 +15,14 @@
 /**
  * Tests if 0 reports fail vs ok.
  */
-public class CoveragePlugin0vsOkITest extends IntegrationTestWithJenkinsPerSuite {
+class CoveragePlugin0vsOkITest extends IntegrationTestWithJenkinsPerSuite {
     private static final String JACOCO_ANALYSIS_MODEL_FILE = "jacoco-analysis-model.xml";
 
     /**
      * Adapter reads no file and failNoReports is set true in freestyle project.
      */
     @Test
-    public void freeStyleNoFileAndFailNoReportsTrue() {
+    void freeStyleNoFileAndFailNoReportsTrue() {
         FreeStyleProject project = createFreeStyleProjectWithFailNoReports(true, "");
 
         buildSuccessfully(project);
@@ -32,7 +32,7 @@ public void freeStyleNoFileAndFailNoReportsTrue() {
      * Adapter reads no file and failNoReports is set false in freestyle project.
      */
     @Test
-    public void freeStyleNoFileAndFailNoReportsFalse() {
+    void freeStyleNoFileAndFailNoReportsFalse() {
         FreeStyleProject project = createFreeStyleProjectWithFailNoReports(false, "");
 
         buildSuccessfully(project);
@@ -42,7 +42,7 @@ public void freeStyleNoFileAndFailNoReportsFalse() {
      * Adapter reads one file and failNoReports is set true in freestyle project.
      */
     @Test
-    public void freeStyleWithFileAndFailNoReportsTrue() {
+    void freeStyleWithFileAndFailNoReportsTrue() {
         FreeStyleProject project = createFreeStyleProjectWithFailNoReports(true, JACOCO_ANALYSIS_MODEL_FILE);
 
         buildSuccessfully(project);
@@ -52,7 +52,7 @@ public void freeStyleWithFileAndFailNoReportsTrue() {
      * Adapter reads one file and failNoReports is set false in freestyle project.
      */
     @Test
-    public void freeStyleWithFileAndFailNoReportsFalse() {
+    void freeStyleWithFileAndFailNoReportsFalse() {
         FreeStyleProject project = createFreeStyleProjectWithFailNoReports(false, JACOCO_ANALYSIS_MODEL_FILE);
 
         buildSuccessfully(project);
@@ -62,7 +62,7 @@ public void freeStyleWithFileAndFailNoReportsFalse() {
      * Adapter reads one file and failNoReports is set false in freestyle project.
      */
     @Test
-    public void freeStyleWithFileWildcardAndFailNoReportsTrue() {
+    void freeStyleWithFileWildcardAndFailNoReportsTrue() {
         FreeStyleProject project = createFreeStyleProjectWithFailNoReports(true, "**/*.xml");
 
         buildSuccessfully(project);
@@ -72,7 +72,7 @@ public void freeStyleWithFileWildcardAndFailNoReportsTrue() {
      * Adapter reads one file and failNoReports is set false in freestyle project.
      */
     @Test
-    public void freeStyleWithFileWildcardAndFailNoReportsFalse() {
+    void freeStyleWithFileWildcardAndFailNoReportsFalse() {
         FreeStyleProject project = createFreeStyleProjectWithFailNoReports(false, "**/*.xml");
 
         buildSuccessfully(project);
@@ -82,7 +82,7 @@ public void freeStyleWithFileWildcardAndFailNoReportsFalse() {
      * Adapter reads no file and failNoReports is set true in pipeline project.
      */
     @Test
-    public void pipelineNoFileAndFailNoReportsTrue() {
+    void pipelineNoFileAndFailNoReportsTrue() {
         WorkflowJob job = getPipelineProjectWithJacoco(true, "");
 
         buildSuccessfully(job);
@@ -92,7 +92,7 @@ public void pipelineNoFileAndFailNoReportsTrue() {
      * Adapter reads no file and failNoReports is set false in pipeline project.
      */
     @Test
-    public void pipelineNoFileAndFailNoReportsFalse() {
+    void pipelineNoFileAndFailNoReportsFalse() {
         WorkflowJob job = getPipelineProjectWithJacoco(false, "");
 
         buildSuccessfully(job);
@@ -102,7 +102,7 @@ public void pipelineNoFileAndFailNoReportsFalse() {
      * Adapter reads one file and failNoReports is set true in pipeline project.
      */
     @Test
-    public void pipelineWithFileAndFailNoReportsTrue() {
+    void pipelineWithFileAndFailNoReportsTrue() {
         WorkflowJob job = getPipelineProjectWithJacoco(true, JACOCO_ANALYSIS_MODEL_FILE);
 
         buildSuccessfully(job);
@@ -112,7 +112,7 @@ public void pipelineWithFileAndFailNoReportsTrue() {
      * Adapter reads one file and failNoReports is set false in pipeline project.
      */
     @Test
-    public void pipelineWithFileAndFailNoReportsFalse() {
+    void pipelineWithFileAndFailNoReportsFalse() {
         WorkflowJob job = getPipelineProjectWithJacoco(false, JACOCO_ANALYSIS_MODEL_FILE);
 
         buildSuccessfully(job);
@@ -122,7 +122,7 @@ public void pipelineWithFileAndFailNoReportsFalse() {
      * Adapter reads one file and failNoReports is set false in pipeline project.
      */
     @Test
-    public void pipelineWithFileWildcardAndFailNoReportsTrue() {
+    void pipelineWithFileWildcardAndFailNoReportsTrue() {
         WorkflowJob job = getPipelineProjectWithJacoco(true, "**/*.xml");
 
         buildSuccessfully(job);
@@ -132,7 +132,7 @@ public void pipelineWithFileWildcardAndFailNoReportsTrue() {
      * Adapter reads one file and failNoReports is set false in pipeline project.
      */
     @Test
-    public void pipelineWithFileWildcardAndFailNoReportsFalse() {
+    void pipelineWithFileWildcardAndFailNoReportsFalse() {
         WorkflowJob job = getPipelineProjectWithJacoco(false, "**/*.xml");
 
         buildSuccessfully(job);