diff --git a/plugin/pom.xml b/plugin/pom.xml
index e90d90fdd..04d4e5214 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -26,19 +26,19 @@
3.0.3
10.6
- 5.2.2-2
- 1.11.3-6
- 1.7.0
+ 5.3.0-2
+ 1.11.4-1
+ 1.8.0
1.7.8
- 2.13.0
- 5.15.4-5
- 5.1.3-4
+ 2.14.0
+ 6.0.0-1
+ 5.1.3-5
3.6.0-2
2.31.0
2.14.0
0.8.1
2.9.0
- 1.25.0-2
+ 1.26.0-2
1.11
diff --git a/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java b/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java
index 15b2c5d25..b57e9774b 100644
--- a/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java
+++ b/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java
@@ -16,6 +16,8 @@
import com.cloudbees.plugins.credentials.domains.Domain;
import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
+import edu.hm.hafner.util.PathUtil;
+
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.test.acceptance.docker.DockerContainer;
@@ -50,6 +52,7 @@ public class CoveragePluginSourceITest extends IntegrationTestWithJenkinsPerSuit
private static final String SOURCE_FILE = "AcuCobolParser.java.txt";
private static final String PACKAGE_PATH = "edu/hm/hafner/analysis/parser/";
private static final String ACU_COBOL_PARSER_COVERAGE_REPORT = "jacoco-acu-cobol-parser.xml";
+ private static final PathUtil PATH_UTIL = new PathUtil();
/** Docker container for java-maven builds. Contains also git to check out from an SCM. */
@Rule
@@ -59,20 +62,26 @@ public class CoveragePluginSourceITest extends IntegrationTestWithJenkinsPerSuit
/** Verifies that the plugin reads source code from the workspace root. */
@Test
- public void coveragePluginPipelineWithSourceCode() throws IOException {
+ public void coveragePluginPipelineWithSourceCode() {
Run, ?> workspace = runCoverageWithSourceCode("", "");
- assertThat(getConsoleLog(workspace)).contains(
- String.format("Searching for source code files in root of workspace '%s'",
- getWorkspace((TopLevelItem) workspace.getParent()).getRemote()));
+
+ assertThat(getConsoleLog(workspace)).contains(createSingleMessage(workspace));
+ }
+
+ private String createSingleMessage(final Run, ?> workspace) {
+ return String.format("Searching for source code files in '%s'", createSingleDirectory(workspace));
}
/** Verifies that the plugin reads source code in subdirectories of the workspace. */
@Test
- public void coveragePluginPipelineWithSourceCodeInSubdirectory() throws IOException {
+ public void coveragePluginPipelineWithSourceCodeInSubdirectory() {
Run, ?> workspace = runCoverageWithSourceCode("", "");
- assertThat(getConsoleLog(workspace)).contains(
- String.format("Searching for source code files in root of workspace '%s'",
- getWorkspace((TopLevelItem) workspace.getParent()).getRemote()));
+ assertThat(getConsoleLog(workspace)).contains(createSingleMessage(workspace));
+ }
+
+ private String createSingleDirectory(final Run, ?> workspace) {
+ return PATH_UTIL.getAbsolutePath(String.format("%s/src/main/java",
+ getWorkspace((TopLevelItem) workspace.getParent()).getRemote()));
}
/** Verifies that the plugin reads source code in external but approved directories. */
@@ -83,8 +92,10 @@ public void coveragePluginPipelineWithSourceCodeInPermittedDirectory() throws IO
new PermittedSourceCodeDirectory(directory)));
Run, ?> externalDirectory = runCoverageWithSourceCode("ignore", directory);
- assertThat(getConsoleLog(externalDirectory)).contains(
- String.format("Searching for source code files in '%s'", directory));
+ assertThat(getConsoleLog(externalDirectory))
+ .contains("Searching for source code files in:",
+ "-> " + createSingleDirectory(externalDirectory),
+ "-> " + directory);
}
/** Verifies that the plugin refuses source code in directories that are not approved in Jenkins' configuration. */