diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml index 10c59d222577..c5ded2eec01f 100644 --- a/its/core-it-suite/pom.xml +++ b/its/core-it-suite/pom.xml @@ -356,6 +356,12 @@ under the License. maven-it-plugin-plexus-lifecycle ${core-it-support-version} + + commons-jxpath + commons-jxpath + 1.4.0 + test + diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java index 085e48c50fcd..8f91c6184bd8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java @@ -18,18 +18,16 @@ */ package org.apache.maven.it; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Collections; - +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -182,11 +180,11 @@ public InputStream stream(String path) throws IOException { return this; } - public HttpServerBuilder source(final File source) { + public HttpServerBuilder source(final Path source) { this.source = new StreamSource() { @Override public InputStream stream(String path) throws IOException { - return new FileInputStream(new File(source, path)); + return Files.newInputStream(source.resolve(path)); } }; return this; @@ -227,7 +225,7 @@ public static void main(String[] args) throws Exception { .port(0) // .username("maven") // .password("secret") // - .source(new File("/tmp/repo")) // + .source(Path.of("/tmp/repo")) // .build(); server.start(); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java b/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java index 5e84518ccd43..0e3fdef8237c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java @@ -18,12 +18,15 @@ */ package org.apache.maven.it; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.nio.file.attribute.FileTime; import java.security.DigestInputStream; import java.security.MessageDigest; +import org.codehaus.plexus.util.FileUtils; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,60 +35,54 @@ */ class ItUtils { - public static String calcHash(File file, String algo) throws Exception { + public static String calcHash(Path file, String algo) throws Exception { MessageDigest digester = MessageDigest.getInstance(algo); - DigestInputStream dis; - try (FileInputStream is = new FileInputStream(file)) { - dis = new DigestInputStream(is, digester); - - for (byte[] buffer = new byte[1024 * 4]; dis.read(buffer) >= 0; ) { + try (InputStream is = new DigestInputStream(Files.newInputStream(file), digester)) { + byte[] buffer = new byte[1024 * 4]; + while (is.read(buffer) >= 0) { // just read it } } byte[] digest = digester.digest(); - StringBuilder hash = new StringBuilder(digest.length * 2); - for (byte aDigest : digest) { int b = aDigest & 0xFF; - if (b < 0x10) { hash.append('0'); } - hash.append(Integer.toHexString(b)); } return hash.toString(); } - /** - * @deprecated Use {@link Verifier#setUserHomeDirectory(Path)} instead. - */ - @Deprecated - public static void setUserHome(Verifier verifier, File file) { - setUserHome(verifier, file.toPath()); + public static void assertCanonicalFileEquals(Path expected, Path actual) throws IOException { + assertEquals(canonicalPath(expected), canonicalPath(actual)); + } + + public static void createFile(Path path) throws IOException { + Files.newInputStream(path, StandardOpenOption.CREATE).close(); + } + + public static long lastModified(Path path) throws IOException { + return Files.getLastModifiedTime(path).toMillis(); } - /** - * @deprecated Use {@link Verifier#setUserHomeDirectory(Path)} instead. - */ - @Deprecated - public static void setUserHome(Verifier verifier, Path home) { - verifier.setUserHomeDirectory(home); + public static void lastModified(Path path, long millis) throws IOException { + Files.setLastModifiedTime(path, FileTime.fromMillis(millis)); } - public static void assertCanonicalFileEquals(File expected, File actual) throws IOException { - assertEquals(expected.getCanonicalFile(), actual.getCanonicalFile()); + public static void deleteDirectory(Path path) throws IOException { + FileUtils.deleteDirectory(path.toFile()); } - public static void assertCanonicalFileEquals(String expected, String actual, String message) throws IOException { - assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile(), message); + public static void copyDirectoryStructure(Path src, Path dest) throws IOException { + FileUtils.copyDirectory(src.toFile(), dest.toFile()); } - public static void assertCanonicalFileEquals(String expected, String actual) throws IOException { - assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile()); + public static String canonicalPath(Path path) throws IOException { + return path.toFile().getCanonicalPath(); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java index 616b125ea7c6..eadaba2a3ce5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,8 +34,8 @@ public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0008() throws Exception { - File testDir = extractResources("/it0008"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0008"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java index 8854cb281631..db028378e8fe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; @@ -42,8 +42,8 @@ public void testit0009() throws Exception { // Inline version check: [3.1.0,) - current Maven version supports space in XML boolean supportSpaceInXml = true; - File testDir = extractResources("/it0009"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0009"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java index 3c491545de3b..46d102b18516 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenInt */ @Test public void testit0010() throws Exception { - File testDir = extractResources("/it0010"); + Path testDir = extractResources("it0010"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0010"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java index 2c229049881f..ca15013c586c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -34,8 +33,8 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest extends Abstrac */ @Test public void testit0011() throws Exception { - File testDir = extractResources("/it0011"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0011"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0011"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java index d4ace9aee189..6afdbee068a2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,8 +31,8 @@ public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTes */ @Test public void testit0012() throws Exception { - File testDir = extractResources("/it0012"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0012"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("child-project/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java index 3795ee0497db..5e4ff5d43993 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,8 +33,8 @@ public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegratio */ @Test public void testit0018() throws Exception { - File testDir = extractResources("/it0018"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0018"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.it0018"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java index 4929b9b485f3..dbb78355263c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,8 +31,8 @@ public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenInt */ @Test public void testit0019() throws Exception { - File testDir = extractResources("/it0019"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0019"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java index 25ad0788f0a2..a84d7bfb01bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase */ @Test public void testit0021() throws Exception { - File testDir = extractResources("/it0021"); + Path testDir = extractResources("it0021"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.it0021"); verifier.getSystemProperties().setProperty("includeProfile", "true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java index 39a0446c2a0d..63843869d89f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ public class MavenIT0023SettingsProfileTest extends AbstractMavenIntegrationTest */ @Test public void testit0023() throws Exception { - File testDir = extractResources("/it0023"); + Path testDir = extractResources("it0023"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java index bb33fe1e773f..030e2870e48d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenIT0024MultipleGoalExecutionsTest extends AbstractMavenIntegrat */ @Test public void testit0024() throws Exception { - File testDir = extractResources("/it0024"); + Path testDir = extractResources("it0024"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java index b0eb08a3d37c..2a8bf876f285 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenIT0025MultipleExecutionLevelConfigsTest extends AbstractMavenI */ @Test public void testit0025() throws Exception { - File testDir = extractResources("/it0025"); + Path testDir = extractResources("it0025"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java index c086b2542592..5ca590c9cdd1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,8 +32,8 @@ public class MavenIT0030DepPomDepMgmtInheritanceTest extends AbstractMavenIntegr */ @Test public void testit0030() throws Exception { - File testDir = extractResources("/it0030"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0030"); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030", "1.0-SNAPSHOT", "jar"); verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar"); verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java index 2635ea17f37b..f35b701b5446 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,9 +31,9 @@ public class MavenIT0032MavenPrerequisiteTest extends AbstractMavenIntegrationTe */ @Test public void testit0032() throws Exception { - File testDir = extractResources("/it0032"); + Path testDir = extractResources("it0032"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("initialize"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java index ed7bf847a1d8..54822c07f354 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenIT0037AlternatePomFileSameDirTest extends AbstractMavenIntegra */ @Test public void testit0037() throws Exception { - File testDir = extractResources("/it0037"); + Path testDir = extractResources("it0037"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-f"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java index a063d846a087..e11756d2bab1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenIT0038AlternatePomFileDifferentDirTest extends AbstractMavenIn */ @Test public void testit0038() throws Exception { - File testDir = extractResources("/it0038"); + Path testDir = extractResources("it0038"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("project/target"); verifier.addCliArgument("-f"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java index cc428c542107..1daeb9527edd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenIT0040PackagingFromPluginExtensionTest extends AbstractMavenIn */ @Test public void testit0040() throws Exception { - File testDir = extractResources("/it0040"); + Path testDir = extractResources("it0040"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("package"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java index 6d81d533382a..97e755b2fedb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest extends AbstractMave */ @Test public void testit0041() throws Exception { - File testDir = extractResources("/it0041"); + Path testDir = extractResources("it0041"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support", "1.2"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java index 7f25ea9daf41..421e2187bd19 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0051ReleaseProfileTest extends AbstractMavenIntegrationTestC */ @Test public void testit0051() throws Exception { - File testDir = extractResources("/it0051"); + Path testDir = extractResources("it0051"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-DperformRelease=true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java index a96088badc5a..64487950c019 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ public class MavenIT0052ReleaseProfileTest extends AbstractMavenIntegrationTestC */ @Test public void testit0052() throws Exception { - File testDir = extractResources("/it0052"); + Path testDir = extractResources("it0052"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("package"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java index d402c0050b4d..996214f84e37 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ public class MavenIT0056MultipleGoalExecutionsTest extends AbstractMavenIntegrat */ @Test public void testit0056() throws Exception { - File testDir = extractResources("/it0056"); + Path testDir = extractResources("it0056"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java index fae8e0c9cb5f..67b857ed9613 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,12 +33,12 @@ public class MavenIT0063SystemScopeDependencyTest extends AbstractMavenIntegrati */ @Test public void testit0063() throws Exception { - File testDir = extractResources("/it0063"); + Path testDir = extractResources("it0063"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.getSystemProperties().setProperty("jre.home", new File(testDir, "jdk/jre").getPath()); + verifier.getSystemProperties().setProperty("jre.home", testDir.resolve("jdk/jre").toString()); verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile"); verifier.execute(); @@ -47,8 +46,8 @@ public void testit0063() throws Exception { List lines = verifier.loadLines("target/compile.txt"); assertEquals(2, lines.size()); - assertEquals( - new File(testDir, "jdk/lib/tools.jar").getCanonicalFile(), - new File((String) lines.get(1)).getCanonicalFile()); + ItUtils.assertCanonicalFileEquals( + testDir.resolve("jdk/lib/tools.jar"), + Path.of((String) lines.get(1))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java index 05fe48b2c4c4..920f35f6f1cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,10 +32,10 @@ public class MavenIT0064MojoConfigViaSettersTest extends AbstractMavenIntegratio */ @Test public void testit0064() throws Exception { - File testDir = extractResources("/it0064"); + Path testDir = extractResources("it0064"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-setter").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-setter")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -43,7 +43,7 @@ public void testit0064() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java index 62f92b8a941f..e25710fe965b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest extends AbstractMaven */ @Test public void testit0071() throws Exception { - File testDir = extractResources("/it0071"); + Path testDir = extractResources("it0071"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-touch:touch"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java index 8dc63ad65fad..6a8a98fadf16 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenIT0072InterpolationWithDottedPropertyTest extends AbstractMave */ @Test public void testit0072() throws Exception { - File testDir = extractResources("/it0072"); + Path testDir = extractResources("it0072"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java index ecb6fce52415..62d9900f3299 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import org.junit.jupiter.api.Test; @@ -37,13 +37,13 @@ public class MavenIT0085TransitiveSystemScopeTest extends AbstractMavenIntegrati */ @Test public void testit0085() throws Exception { - File testDir = extractResources("/it0085"); + Path testDir = extractResources("it0085"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0085"); - verifier.getSystemProperties().setProperty("test.home", testDir.getAbsolutePath()); + verifier.getSystemProperties().setProperty("test.home", testDir.toString()); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java index 01897f775897..5f13b72ab8cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,8 +42,8 @@ public class MavenIT0086PluginRealmTest extends AbstractMavenIntegrationTestCase */ @Test public void testit0086() throws Exception { - File testDir = extractResources("/it0086"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0086"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java index 1f95d9e0f7dc..b23f918e7b30 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,8 +42,8 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest extends AbstractMave */ @Test public void testit0087() throws Exception { - File testDir = extractResources("/it0087"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0087"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0087"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java index dcba8988ea3c..1f063aeff204 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenIT0090EnvVarInterpolationTest extends AbstractMavenIntegration */ @Test public void testit0090() throws Exception { - File testDir = extractResources("/it0090"); + Path testDir = extractResources("it0090"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setEnvironmentVariable("MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java index 87bc11fd8917..c71ebac43155 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java @@ -18,15 +18,14 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.FileTime; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Locale; - -import org.codehaus.plexus.util.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -42,30 +41,29 @@ public class MavenIT0108SnapshotUpdateTest extends AbstractMavenIntegrationTestC private Verifier verifier; - private File artifact; + private Path artifact; - private File repository; + private Path repository; - private File localRepoFile; + private Path localRepoFile; private static final int TIME_OFFSET = 50000; @BeforeEach protected void setUp() throws Exception { - File testDir = extractResources("/it0108"); - verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("it0108"); + verifier = newVerifier(testDir); localRepoFile = getLocalRepoFile(verifier); deleteLocalArtifact(verifier, localRepoFile); - repository = new File(testDir, "repository"); + repository = testDir.resolve("repository"); recreateRemoteRepository(repository); // create artifact in repository (TODO: into verifier) - artifact = new File( - repository, + artifact = repository.resolve( "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-core-it-support-1.0-SNAPSHOT.jar"); - artifact.getParentFile().mkdirs(); - Files.writeString(artifact.getAbsoluteFile().toPath(), "originalArtifact"); + Files.createDirectories(artifact.getParent()); + Files.writeString(artifact, "originalArtifact"); verifier.verifyArtifactNotPresent("org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar"); } @@ -80,9 +78,9 @@ public void testSnapshotUpdated() throws Exception { verifyArtifactContent("originalArtifact"); // set in the past to ensure it is downloaded - localRepoFile.setLastModified(System.currentTimeMillis() - TIME_OFFSET); + Files.setLastModifiedTime(localRepoFile, FileTime.fromMillis(System.currentTimeMillis() - TIME_OFFSET)); - Files.writeString(artifact.getAbsoluteFile().toPath(), "updatedArtifact"); + Files.writeString(artifact, "updatedArtifact"); verifier.addCliArgument("package"); verifier.execute(); @@ -94,9 +92,9 @@ public void testSnapshotUpdated() throws Exception { @Test public void testSnapshotUpdatedWithMetadata() throws Exception { - File metadata = new File(repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); + Path metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); Files.writeString( - metadata.getAbsoluteFile().toPath(), + metadata, constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, true)); verifier.addCliArgument("package"); @@ -106,10 +104,10 @@ public void testSnapshotUpdatedWithMetadata() throws Exception { verifyArtifactContent("originalArtifact"); - Files.writeString(artifact.getAbsoluteFile().toPath(), "updatedArtifact"); - metadata = new File(repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); + Files.writeString(artifact, "updatedArtifact"); + metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); Files.writeString( - metadata.getAbsoluteFile().toPath(), constructMetadata("2", System.currentTimeMillis(), true)); + metadata, constructMetadata("2", System.currentTimeMillis(), true)); verifier.addCliArgument("package"); verifier.execute(); @@ -121,15 +119,15 @@ public void testSnapshotUpdatedWithMetadata() throws Exception { @Test public void testSnapshotUpdatedWithLocalMetadata() throws Exception { - File localMetadata = getMetadataFile("org/apache/maven", "maven-core-it-support", "1.0-SNAPSHOT"); + Path localMetadata = getMetadataFile("org/apache/maven", "maven-core-it-support", "1.0-SNAPSHOT"); - FileUtils.deleteDirectory(localMetadata.getParentFile()); - assertFalse(localMetadata.getParentFile().exists()); - localMetadata.getParentFile().mkdirs(); + ItUtils.deleteDirectory(localMetadata.getParent()); + assertFalse(Files.exists(localMetadata.getParent())); + Files.createDirectories(localMetadata.getParent()); - File metadata = new File(repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); + Path metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); Files.writeString( - metadata.getAbsoluteFile().toPath(), + metadata, constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, true)); verifier.addCliArgument("package"); @@ -138,14 +136,14 @@ public void testSnapshotUpdatedWithLocalMetadata() throws Exception { verifier.verifyErrorFreeLog(); verifyArtifactContent("originalArtifact"); - assertFalse(localMetadata.exists()); + assertFalse(Files.exists(localMetadata)); - Files.writeString(localRepoFile.getAbsoluteFile().toPath(), "localArtifact"); + Files.writeString(localRepoFile, "localArtifact"); Files.writeString( - localMetadata.getAbsoluteFile().toPath(), + localMetadata, constructLocalMetadata("org.apache.maven", "maven-core-it-support", System.currentTimeMillis(), true)); // update the remote file, but we shouldn't be looking - artifact.setLastModified(System.currentTimeMillis()); + Files.setLastModifiedTime(artifact, FileTime.fromMillis(System.currentTimeMillis())); verifier.addCliArgument("package"); verifier.execute(); @@ -157,11 +155,11 @@ public void testSnapshotUpdatedWithLocalMetadata() throws Exception { Calendar cal = Calendar.getInstance(); cal.add(Calendar.YEAR, -1); Files.writeString( - localMetadata.getAbsoluteFile().toPath(), + localMetadata, constructLocalMetadata("org.apache.maven", "maven-core-it-support", cal.getTimeInMillis(), true)); Files.writeString( - metadata.getAbsoluteFile().toPath(), constructMetadata("2", System.currentTimeMillis() - 2000, true)); - artifact.setLastModified(System.currentTimeMillis()); + metadata, constructMetadata("2", System.currentTimeMillis() - 2000, true)); + Files.setLastModifiedTime(artifact, FileTime.fromMillis(System.currentTimeMillis())); verifier.addCliArgument("package"); verifier.execute(); @@ -173,11 +171,11 @@ public void testSnapshotUpdatedWithLocalMetadata() throws Exception { @Test public void testSnapshotUpdatedWithMetadataUsingFileTimestamp() throws Exception { - File metadata = new File(repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); + Path metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); Files.writeString( - metadata.getAbsoluteFile().toPath(), + metadata, constructMetadata("1", System.currentTimeMillis() - TIME_OFFSET, false)); - metadata.setLastModified(System.currentTimeMillis() - TIME_OFFSET); + Files.setLastModifiedTime(metadata, FileTime.fromMillis(System.currentTimeMillis() - TIME_OFFSET)); verifier.addCliArgument("package"); verifier.execute(); @@ -186,10 +184,10 @@ public void testSnapshotUpdatedWithMetadataUsingFileTimestamp() throws Exception verifyArtifactContent("originalArtifact"); - Files.writeString(artifact.getAbsoluteFile().toPath(), "updatedArtifact"); - metadata = new File(repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); + Files.writeString(artifact, "updatedArtifact"); + metadata = repository.resolve("org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml"); Files.writeString( - metadata.getAbsoluteFile().toPath(), constructMetadata("2", System.currentTimeMillis(), false)); + metadata, constructMetadata("2", System.currentTimeMillis(), false)); verifier.addCliArgument("package"); verifier.execute(); @@ -199,8 +197,8 @@ public void testSnapshotUpdatedWithMetadataUsingFileTimestamp() throws Exception verifier.verifyErrorFreeLog(); } - private File getMetadataFile(String groupId, String artifactId, String version) { - return new File(verifier.getArtifactMetadataPath(groupId, artifactId, version, "maven-metadata-local.xml")); + private Path getMetadataFile(String groupId, String artifactId, String version) { + return verifier.getArtifactMetadataPath(groupId, artifactId, version, "maven-metadata-local.xml"); } private void verifyArtifactContent(String s) throws IOException, VerificationException { @@ -208,22 +206,22 @@ private void verifyArtifactContent(String s) throws IOException, VerificationExc verifier.verifyArtifactContent("org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar", s); } - private static File deleteLocalArtifact(Verifier verifier, File localRepoFile) throws IOException { + private static Path deleteLocalArtifact(Verifier verifier, Path localRepoFile) throws IOException { verifier.deleteArtifact("org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar"); // this is to delete metadata - TODO: incorporate into deleteArtifact in verifier - FileUtils.deleteDirectory(localRepoFile.getParentFile()); + ItUtils.deleteDirectory(localRepoFile.getParent()); return localRepoFile; } - private static File getLocalRepoFile(Verifier verifier) { - return new File(verifier.getArtifactPath("org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar")); + private static Path getLocalRepoFile(Verifier verifier) { + return verifier.getArtifactPath("org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar"); } - private static void recreateRemoteRepository(File repository) throws IOException { + private static void recreateRemoteRepository(Path repository) throws IOException { // create a repository (TODO: into verifier) - FileUtils.deleteDirectory(repository); - assertFalse(repository.exists()); - repository.mkdirs(); + ItUtils.deleteDirectory(repository); + assertFalse(Files.exists(repository)); + Files.createDirectories(repository); } private String constructMetadata(String buildNumber, long timestamp, boolean writeLastUpdated) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java index 2330bfa28df8..e31888b2a4be 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest extends Abstr */ @Test public void testit0113() throws Exception { - File testDir = extractResources("/it0113"); + Path testDir = extractResources("it0113"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java index 9a7a04ed783f..42b8a46b4526 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0130CleanLifecycleTest extends AbstractMavenIntegrationTestC */ @Test public void testit0130() throws Exception { - File testDir = extractResources("/it0130"); + Path testDir = extractResources("it0130"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("clean"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java index 35705e12b66d..96b59a56a04e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0131SiteLifecycleTest extends AbstractMavenIntegrationTestCa */ @Test public void testit0131() throws Exception { - File testDir = extractResources("/it0131"); + Path testDir = extractResources("it0131"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("site-deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java index bc225cf4d0d7..90a0c241dc69 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0132PomLifecycleTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0132() throws Exception { - File testDir = extractResources("/it0132"); + Path testDir = extractResources("it0132"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java index 5214843cc75b..161fab2a35c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0133JarLifecycleTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0133() throws Exception { - File testDir = extractResources("/it0133"); + Path testDir = extractResources("it0133"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java index d75f9307fcc8..dce86ae750a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0134WarLifecycleTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0134() throws Exception { - File testDir = extractResources("/it0134"); + Path testDir = extractResources("it0134"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java index 18cceed81eac..cde5158c81c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0135EjbLifecycleTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0135() throws Exception { - File testDir = extractResources("/it0135"); + Path testDir = extractResources("it0135"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java index 6f194b42a2f4..58e09365cd70 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0136RarLifecycleTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0136() throws Exception { - File testDir = extractResources("/it0136"); + Path testDir = extractResources("it0136"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java index bb61e482dcc2..6e1eec95d08e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0137EarLifecycleTest extends AbstractMavenIntegrationTestCas */ @Test public void testit0137() throws Exception { - File testDir = extractResources("/it0137"); + Path testDir = extractResources("it0137"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java index e7dd44ed0cc6..44ff2f9b4bc0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenIT0138PluginLifecycleTest extends AbstractMavenIntegrationTest */ @Test public void testit0138() throws Exception { - File testDir = extractResources("/it0138"); + Path testDir = extractResources("it0138"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java index fd321c401be8..b6da8c2d4acd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,10 +39,10 @@ public class MavenIT0139InterpolationWithProjectPrefixTest extends AbstractMaven */ @Test public void testit0139() throws Exception { - File testDir = extractResources("/it0139"); - File child = new File(testDir, "child"); + Path testDir = extractResources("it0139"); + Path child = testDir.resolve("child"); - Verifier verifier = newVerifier(child.getAbsolutePath()); + Verifier verifier = newVerifier(child); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); @@ -53,7 +52,7 @@ public void testit0139() throws Exception { Properties props = verifier.loadProperties("target/interpolated.properties"); String prefix = "project.properties."; - assertEquals(child.getCanonicalFile(), new File(props.getProperty(prefix + "projectDir")).getCanonicalFile()); + ItUtils.assertCanonicalFileEquals(child, Path.of(props.getProperty(prefix + "projectDir"))); assertEquals("org.apache.maven.its.it0139.child", props.getProperty(prefix + "projectGroupId")); assertEquals("child", props.getProperty(prefix + "projectArtifactId")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java index ccba8249be21..0d4fe2136dc0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -44,10 +43,10 @@ public class MavenIT0140InterpolationWithPomPrefixTest extends AbstractMavenInte */ @Test public void testit0140() throws Exception { - File testDir = extractResources("/it0140"); - File child = new File(testDir, "child"); + Path testDir = extractResources("it0140"); + Path child = testDir.resolve("child"); - Verifier verifier = newVerifier(child.getAbsolutePath()); + Verifier verifier = newVerifier(child); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); @@ -57,7 +56,7 @@ public void testit0140() throws Exception { Properties props = verifier.loadProperties("target/interpolated.properties"); String prefix = "project.properties."; - assertEquals(child.getCanonicalFile(), new File(props.getProperty(prefix + "projectDir")).getCanonicalFile()); + ItUtils.assertCanonicalFileEquals(child, Path.of(props.getProperty(prefix + "projectDir"))); assertEquals("org.apache.maven.its.it0140.child", props.getProperty(prefix + "projectGroupId")); assertEquals("child", props.getProperty(prefix + "projectArtifactId")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java index 35ee6c113520..04cbe6b8c1e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ public class MavenIT0142DirectDependencyScopesTest extends AbstractMavenIntegrat */ @Test public void testit0142() throws Exception { - File testDir = extractResources("/it0142"); + Path testDir = extractResources("it0142"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0142"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java index bb9784731fb8..41599187ead0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -237,9 +237,9 @@ public void testitTestScope() throws Exception { } private Verifier run(String scope) throws Exception { - File testDir = extractResources("/it0143"); + Path testDir = extractResources("it0143"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target-" + scope); verifier.deleteArtifacts("org.apache.maven.its.it0143"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java index 8d54d8315c38..346c3d38df4b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -39,9 +39,9 @@ public class MavenIT0144LifecycleExecutionOrderTest extends AbstractMavenIntegra */ @Test public void testit0144() throws Exception { - File testDir = extractResources("/it0144"); + Path testDir = extractResources("it0144"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArguments("post-clean", "deploy", "site-deploy"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java index a6d1bcb52046..2734e74afeb1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; import java.net.InetAddress; +import java.nio.file.Path; import java.util.Map; - import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; @@ -41,17 +40,17 @@ public class MavenIT0146InstallerSnapshotNaming extends AbstractMavenIntegration private int port; - private final File testDir; + private final Path testDir; public MavenIT0146InstallerSnapshotNaming() throws IOException { super(); - testDir = extractResources("/it0146"); + testDir = extractResources("it0146"); } @BeforeEach protected void setUp() throws Exception { ResourceHandler resourceHandler = new ResourceHandler(); - resourceHandler.setResourceBase(new File(testDir, "repo").getAbsolutePath()); + resourceHandler.setResourceBase(testDir.resolve("repo").toString()); HandlerList handlers = new HandlerList(); handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()}); @@ -75,7 +74,7 @@ protected void tearDown() throws Exception { @Test public void testitRemoteDownloadTimestampedName() throws Exception { - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Map properties = verifier.newDefaultFilterMap(); properties.put("@host@", InetAddress.getLoopbackAddress().getCanonicalHostName()); @@ -101,7 +100,7 @@ public void testitRemoteDownloadTimestampedName() throws Exception { @Test public void testitNonTimestampedNameWithInstalledSNAPSHOT() throws Exception { - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.it0146"); verifier.addCliArgument("-f"); verifier.addCliArgument("project/pom.xml"); @@ -112,7 +111,7 @@ public void testitNonTimestampedNameWithInstalledSNAPSHOT() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); Map properties = verifier.newDefaultFilterMap(); properties.put("@host@", InetAddress.getLoopbackAddress().getCanonicalHostName()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java index 58c5c7098df6..b67ee15aa839 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTestCase { @@ -39,8 +38,8 @@ public void testit0199() throws Exception { } private void build(String module, String expectedArtifact) throws Exception { - File testDir = extractResources("/cyclic-import-scope"); - Verifier verifier = newVerifier(new File(testDir.getAbsolutePath(), module).getAbsolutePath()); + Path testDir = extractResources("cyclic-import-scope"); + Verifier verifier = newVerifier(testDir.resolve(module)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java index 0c13751f484f..407a9cfa2e5a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITBootstrapTest extends AbstractMavenIntegrationTestCase { */ @Test public void testBootstrap() throws Exception { - File testDir = extractResources("/bootstrap"); + Path testDir = extractResources("bootstrap"); - Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote"); + Verifier verifier = newVerifier(testDir.toString(), "remote"); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java index f0d735dad0da..64fde45f8a8c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITMissingNamespaceTest extends AbstractMavenIntegrationTestCase { @@ -32,8 +31,8 @@ public MavenITMissingNamespaceTest() { */ @Test public void testMissingNamespace() throws Exception { - File testDir = extractResources("/missing-namespace"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("missing-namespace"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java index 63fcaad34f52..fc8152f2842b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10210SettingsXmlDecryptTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; - import org.junit.Assert; import org.junit.jupiter.api.Test; @@ -33,10 +32,10 @@ class MavenITgh10210SettingsXmlDecryptTest extends AbstractMavenIntegrationTestC @Test void testItPass() throws Exception { - File testDir = extractResources("/gh-10210-settings-xml-decrypt"); + Path testDir = extractResources("gh-10210-settings-xml-decrypt"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); - verifier.setUserHomeDirectory(testDir.toPath().resolve("HOME")); + Verifier verifier = newVerifier(testDir); + verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.addCliArgument("-s"); verifier.addCliArgument("settings-passes.xml"); verifier.addCliArgument("process-resources"); @@ -51,15 +50,15 @@ void testItPass() throws Exception { "prop5=Hello Oleg {L6L/HbmrY+cH+sNkphnq3fguYepTpM04WlIXb8nB1pk=} is this a password?", "prop6=password", "prop7=password"), - Files.readAllLines(testDir.toPath().resolve("target/classes/file.properties"))); + Files.readAllLines(testDir.resolve("target/classes/file.properties"))); } @Test void testItFail() throws Exception { - File testDir = extractResources("/gh-10210-settings-xml-decrypt"); + Path testDir = extractResources("gh-10210-settings-xml-decrypt"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); - verifier.setUserHomeDirectory(testDir.toPath().resolve("HOME")); + Verifier verifier = newVerifier(testDir); + verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.addCliArgument("-s"); verifier.addCliArgument("settings-fails.xml"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java index e0c810701037..ac371829e7ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.JRE; @@ -32,15 +31,18 @@ */ class MavenITgh10312TerminallyDeprecatedMethodInGuiceTest extends AbstractMavenIntegrationTestCase { + private static final String RESOURCE_PATH = "gh-10312-terminally-deprecated-method-in-guice"; + MavenITgh10312TerminallyDeprecatedMethodInGuiceTest() {} @Test @EnabledForJreRange(min = JRE.JAVA_24) void worryingShouldNotBePrinted() throws Exception { - File testDir = extractResources("/gh-10312-terminally-deprecated-method-in-guice"); + Path testDir = extractResources(RESOURCE_PATH); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.setForkJvm(true); + verifier.setLogFileName("log-no-warning.txt"); verifier.addCliArgument("validate"); verifier.execute(); @@ -56,10 +58,11 @@ void worryingShouldNotBePrinted() throws Exception { @Test @EnabledForJreRange(min = JRE.JAVA_24, max = JRE.JAVA_25) void allowOverwriteByUser() throws Exception { - File testDir = extractResources("/gh-10312-terminally-deprecated-method-in-guice"); + Path testDir = extractResources(RESOURCE_PATH); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.setForkJvm(true); + verifier.setLogFileName("log-warning.txt"); verifier.addCliArgument("validate"); verifier.addCliArgument("-Dguice_custom_class_loading=BRIDGE"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java index 9d954afb4f35..78301da83b9f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java @@ -38,9 +38,9 @@ class MavenITgh10937QuotedPipesInMavenOptsTest extends AbstractMavenIntegrationT @Test void testIt() throws Exception { Path basedir = - extractResources("/gh-10937-pipes-maven-opts").getAbsoluteFile().toPath(); + extractResources("gh-10937-pipes-maven-opts"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.setEnvironmentVariable("MAVEN_OPTS", "-Dprop.maven-opts=\"foo|bar\""); verifier.addCliArguments("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11055DIServiceInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11055DIServiceInjectionTest.java index 89fe0445e011..a30027ed25db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11055DIServiceInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11055DIServiceInjectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITgh11055DIServiceInjectionTest extends AbstractMavenIntegrationTestC @Test void testGetServiceSucceeds() throws Exception { - File testDir = extractResources("/gh-11055-di-service-injection"); + Path testDir = extractResources("gh-11055-di-service-injection"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11084ReactorReaderPreferConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11084ReactorReaderPreferConsumerPomTest.java index 3dce0d548ff8..cd8edd13215c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11084ReactorReaderPreferConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11084ReactorReaderPreferConsumerPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,17 +31,17 @@ class MavenITgh11084ReactorReaderPreferConsumerPomTest extends AbstractMavenInte @Test void partialReactorShouldResolveUsingConsumerPom() throws Exception { - File testDir = extractResources("/gh-11084-reactorreader-prefer-consumer-pom"); + Path testDir = extractResources("gh-11084-reactorreader-prefer-consumer-pom"); // First build module a to populate project-local-repo with artifacts including consumer POM - Verifier v1 = newVerifier(testDir.getAbsolutePath()); + Verifier v1 = newVerifier(testDir); v1.addCliArguments("clean", "package", "-X", "-Dmaven.consumer.pom.flatten=true"); v1.setLogFileName("log-1.txt"); v1.execute(); v1.verifyErrorFreeLog(); // Now build only module b; ReactorReader should pick consumer POM from project-local-repo - Verifier v2 = newVerifier(testDir.getAbsolutePath()); + Verifier v2 = newVerifier(testDir); v2.setLogFileName("log-2.txt"); v2.addCliArguments("clean", "compile", "-f", "b", "-X", "-Dmaven.consumer.pom.flatten=true"); v2.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoDmUnresolvedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoDmUnresolvedTest.java index b52844511dad..9a7335ce4809 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoDmUnresolvedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoDmUnresolvedTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,8 +31,8 @@ class MavenITgh11140RepoDmUnresolvedTest extends AbstractMavenIntegrationTestCas @Test void testFailsOnUnresolvedPlaceholders() throws Exception { - File testDir = extractResources("/gh-11140-repo-dm-unresolved"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("gh-11140-repo-dm-unresolved"); + Verifier verifier = newVerifier(testDir); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java index 2c52e8046166..1e0c21570295 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11140RepoInterpolationTest.java @@ -18,10 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -35,12 +33,11 @@ class MavenITgh11140RepoInterpolationTest extends AbstractMavenIntegrationTestCa @Test void testInterpolationFromEnvAndProps() throws Exception { - File testDir = extractResources("/gh-11140-repo-interpolation"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("gh-11140-repo-interpolation"); + Verifier verifier = newVerifier(testDir); // Provide env vars consumed by POM via ${env.*} - Path base = testDir.toPath().toAbsolutePath(); - String baseUri = getBaseUri(base); + String baseUri = getBaseUri(testDir); verifier.setEnvironmentVariable("IT_REPO_BASE", baseUri); verifier.setEnvironmentVariable("IT_DM_BASE", baseUri); @@ -72,8 +69,8 @@ private static String getBaseUri(Path base) { @Test void testUnresolvedPlaceholderFailsResolution() throws Exception { - File testDir = extractResources("/gh-11140-repo-interpolation"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("gh-11140-repo-interpolation"); + Verifier verifier = newVerifier(testDir); // Do NOT set env vars, so placeholders stay verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11162ConsumerPomScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11162ConsumerPomScopesTest.java index 25f350717c00..5787c88f8d78 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11162ConsumerPomScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11162ConsumerPomScopesTest.java @@ -40,9 +40,9 @@ class MavenITgh11162ConsumerPomScopesTest extends AbstractMavenIntegrationTestCa @Test void testConsumerPomFiltersScopes() throws Exception { - Path basedir = extractResources("/gh-11162-consumer-pom-scopes").toPath(); + Path basedir = extractResources("gh-11162-consumer-pom-scopes"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("install"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java index 8639439232ca..1ce9ed20d7d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11181CoreExtensionsMetaVersionsTest.java @@ -35,11 +35,9 @@ class MavenITgh11181CoreExtensionsMetaVersionsTest extends AbstractMavenIntegrat */ @Test void pwMetaVersionIsInvalid() throws Exception { - Path testDir = extractResources("/gh-11181-core-extensions-meta-versions") - .toPath() - .toAbsolutePath() + Path testDir = extractResources("gh-11181-core-extensions-meta-versions") .resolve("pw-metaversion-is-invalid"); - Verifier verifier = newVerifier(testDir.toString()); + Verifier verifier = newVerifier(testDir); verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.setAutoclean(false); verifier.addCliArgument("validate"); @@ -57,11 +55,9 @@ void pwMetaVersionIsInvalid() throws Exception { */ @Test void uwMetaVersionIsValid() throws Exception { - Path testDir = extractResources("/gh-11181-core-extensions-meta-versions") - .toPath() - .toAbsolutePath() + Path testDir = extractResources("gh-11181-core-extensions-meta-versions") .resolve("uw-metaversion-is-valid"); - Verifier verifier = newVerifier(testDir.toString()); + Verifier verifier = newVerifier(testDir); verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.setHandleLocalRepoTail(false); verifier.setAutoclean(false); @@ -76,11 +72,9 @@ void uwMetaVersionIsValid() throws Exception { */ @Test void uwPwDifferentVersionIsConflict() throws Exception { - Path testDir = extractResources("/gh-11181-core-extensions-meta-versions") - .toPath() - .toAbsolutePath() + Path testDir = extractResources("gh-11181-core-extensions-meta-versions") .resolve("uw-pw-different-version-is-conflict"); - Verifier verifier = newVerifier(testDir.toString()); + Verifier verifier = newVerifier(testDir); verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.setHandleLocalRepoTail(false); verifier.setAutoclean(false); @@ -97,11 +91,9 @@ void uwPwDifferentVersionIsConflict() throws Exception { */ @Test void uwPwSameVersionIsNotConflict() throws Exception { - Path testDir = extractResources("/gh-11181-core-extensions-meta-versions") - .toPath() - .toAbsolutePath() + Path testDir = extractResources("gh-11181-core-extensions-meta-versions") .resolve("uw-pw-same-version-is-not-conflict"); - Verifier verifier = newVerifier(testDir.toString()); + Verifier verifier = newVerifier(testDir); verifier.setUserHomeDirectory(testDir.resolve("HOME")); verifier.setHandleLocalRepoTail(false); verifier.setAutoclean(false); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11196CIFriendlyProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11196CIFriendlyProfilesTest.java index 60a3d1c0624b..f765d4bc7151 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11196CIFriendlyProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11196CIFriendlyProfilesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ class MavenITgh11196CIFriendlyProfilesTest extends AbstractMavenIntegrationTestC */ @Test void testCiFriendlyVersionWithoutProfile() throws Exception { - File testDir = extractResources("/gh-11196-ci-friendly-profiles"); + Path testDir = extractResources("gh-11196-ci-friendly-profiles"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); @@ -65,9 +65,9 @@ void testCiFriendlyVersionWithoutProfile() throws Exception { */ @Test void testCiFriendlyVersionWithReleaseProfile() throws Exception { - File testDir = extractResources("/gh-11196-ci-friendly-profiles"); + Path testDir = extractResources("gh-11196-ci-friendly-profiles"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-PreleaseBuild"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java index 764c2bf5b86c..3cf5c0a70236 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11280DuplicateDependencyConsumerPomTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -61,9 +60,9 @@ class MavenITgh11280DuplicateDependencyConsumerPomTest extends AbstractMavenInte */ @Test void testDuplicateDependencyWithNullAndEmptyClassifier() throws Exception { - File testDir = extractResources("/gh-11280-duplicate-dependency-consumer-pom"); + Path testDir = extractResources("gh-11280-duplicate-dependency-consumer-pom"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.addCliArgument("install"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java index 1c32e8a31acd..cb60292a98db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -45,25 +44,25 @@ public class MavenITgh11314PluginInjectionTest extends AbstractMavenIntegrationT */ @Test public void testV3MojoWithMavenContainerInjection() throws Exception { - File testDir = extractResources("/gh-11314-v3-mojo-injection"); + Path testDir = extractResources("gh-11314-v3-mojo-injection"); // Before, build and install the parent POM - Verifier parentVerifier = newVerifier(testDir.getAbsolutePath(), false); + Verifier parentVerifier = newVerifier(testDir, false); parentVerifier.addCliArgument("-N"); parentVerifier.addCliArgument("install"); parentVerifier.execute(); parentVerifier.verifyErrorFreeLog(); // First, build and install the test plugin - File pluginDir = new File(testDir, "plugin"); - Verifier pluginVerifier = newVerifier(pluginDir.getAbsolutePath(), false); + Path pluginDir = testDir.resolve("plugin"); + Verifier pluginVerifier = newVerifier(pluginDir, false); pluginVerifier.addCliArgument("install"); pluginVerifier.execute(); pluginVerifier.verifyErrorFreeLog(); // Now run the test project that uses the plugin - File consumerDir = new File(testDir, "consumer"); - Verifier verifier = newVerifier(consumerDir.getAbsolutePath(), false); + Path consumerDir = testDir.resolve("consumer"); + Verifier verifier = newVerifier(consumerDir, false); verifier.addCliArguments("test:test-goal"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11321Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11321Test.java index 60dbb49c2423..d7caa57a6644 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11321Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11321Test.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -42,17 +42,17 @@ public class MavenITgh11321Test extends AbstractMavenIntegrationTestCase { */ @Test public void testParentAboveRootDirectoryRejected() throws Exception { - File testDir = extractResources("/gh-11321-parent-above-root"); + Path testDir = extractResources("gh-11321-parent-above-root"); // First, verify that normal build works from the actual root - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); // Now test with -f pointing to the subdirectory that contains .mvn // This should fail with a proper error message about parent being above root - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-f"); verifier.addCliArgument("deps"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java index a161e8ae7934..7702810e69a2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11346DependencyManagementOverrideTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; - import org.apache.maven.api.Constants; import org.junit.jupiter.api.Test; @@ -57,9 +56,9 @@ public class MavenITgh11346DependencyManagementOverrideTest extends AbstractMave */ @Test public void testDependencyManagementOverride() throws Exception { - File testDir = extractResources("/gh-11346-dependency-management-override"); + Path testDir = extractResources("gh-11346-dependency-management-override"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng.depman"); // Test with dependency manager transitivity disabled instead of consumer POM flattening verifier.addCliArgument("-D" + Constants.MAVEN_CONSUMER_POM_FLATTEN + "=false"); @@ -89,9 +88,9 @@ public void testDependencyManagementOverride() throws Exception { @Test public void testDependencyManagementOverrideNoTransitive() throws Exception { - File testDir = extractResources("/gh-11346-dependency-management-override"); + Path testDir = extractResources("gh-11346-dependency-management-override"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng.depman"); // Test with dependency manager transitivity disabled instead of consumer POM flattening verifier.addCliArgument("-D" + Constants.MAVEN_CONSUMER_POM_FLATTEN + "=false"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java index 1b00323acdab..44d3bbed29f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11356InvalidTransitiveRepositoryTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -31,10 +31,10 @@ public class MavenITgh11356InvalidTransitiveRepositoryTest extends AbstractMaven @Test public void testInvalidTransitiveRepository() throws Exception { - File testDir = extractResources("/gh-11356-invalid-transitive-repository"); + Path testDir = extractResources("gh-11356-invalid-transitive-repository"); // First, verify that normal build works from the actual root - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("compile"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java index 33d68092f11c..0b048d1af070 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11381ResourceTargetPathTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -40,9 +39,9 @@ class MavenITgh11381ResourceTargetPathTest extends AbstractMavenIntegrationTestC */ @Test void testRelativeTargetPathInResources() throws Exception { - File testDir = extractResources("/gh-11381"); + Path testDir = extractResources("gh-11381"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java index 5c60d9082091..eacfd1bf5e8e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11384RecursiveVariableReferenceTest.java @@ -38,9 +38,9 @@ class MavenITgh11384RecursiveVariableReferenceTest extends AbstractMavenIntegrat */ @Test void testIt() throws Exception { - Path basedir = extractResources("/gh-11384").getAbsoluteFile().toPath(); + Path basedir = extractResources("gh-11384"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("help:effective-pom"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java index b5ecf4e42011..e3f614a72b22 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11399FlattenPluginParentCycleTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -45,9 +44,9 @@ class MavenITgh11399FlattenPluginParentCycleTest extends AbstractMavenIntegratio */ @Test void testFlattenPluginWithParentExpansionDoesNotCauseCycle() throws Exception { - File testDir = extractResources("/gh-11399-flatten-plugin-parent-cycle"); + Path testDir = extractResources("gh-11399-flatten-plugin-parent-cycle"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng8750"); verifier.addCliArgument("install"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java index 9ac7fcc9c4c8..87431e066a6d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2532DuplicateDependencyEffectiveModelTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -57,9 +56,9 @@ class MavenITgh2532DuplicateDependencyEffectiveModelTest extends AbstractMavenIn */ @Test void testDuplicateDependencyWithPropertyPlaceholders() throws Exception { - File testDir = extractResources("/gh-2532-duplicate-dependency-effective-model"); + Path testDir = extractResources("gh-2532-duplicate-dependency-effective-model"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.setLogFileName("testDuplicateDependencyWithPropertyPlaceholders.txt"); verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java index 294cd20ed2b5..25136424c4fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh2576ItrNotHonoredTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -34,23 +34,23 @@ class MavenITgh2576ItrNotHonoredTest extends AbstractMavenIntegrationTestCase { @Test void testItrNotHonored() throws Exception { - File testDir = extractResources("/gh-2576-itr-not-honored").getAbsoluteFile(); + Path testDir = extractResources("gh-2576-itr-not-honored"); - Verifier verifier = new Verifier(testDir.toString()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.gh2576"); - verifier = new Verifier(new File(testDir, "parent").toString()); + verifier = newVerifier(testDir.resolve("parent")); verifier.addCliArguments("install:install-file", "-Dfile=pom.xml", "-DpomFile=pom.xml", "-DlocalRepositoryPath=../repo/"); verifier.execute(); verifier.verifyErrorFreeLog(); // use maven 3 personality so that we don't flatten the pom - verifier = new Verifier(new File(testDir, "dep").toString()); + verifier = newVerifier(testDir.resolve("dep")); verifier.addCliArguments("install", "-Dmaven.maven3Personality"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = new Verifier(new File(testDir, "consumer").toString()); + verifier = newVerifier(testDir.resolve("consumer")); verifier.addCliArguments("install", "-itr"); assertThrows(VerificationException.class, verifier::execute); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java index 93843b5b7261..025e1f20febf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0095ReactorFailureBehaviorTest extends AbstractMavenInteg */ @Test public void testitFailFast() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); @@ -70,9 +70,9 @@ public void testitFailFast() throws Exception { */ @Test public void testitFailNever() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); @@ -98,9 +98,9 @@ public void testitFailNever() throws Exception { */ @Test public void testitFailAtEnd() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java index 5f0660084e2c..41e6c40fe3b1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -44,9 +44,9 @@ public class MavenITmng0187CollectedProjectsTest extends AbstractMavenIntegratio */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-0187"); + Path testDir = extractResources("mng-0187"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java index 68acc78d26b5..54e42b459b68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng0249ResolveDepsFromReactorTest extends AbstractMavenInteg */ @Test public void testitMNG0249() throws Exception { - File testDir = extractResources("/mng-0249"); + Path testDir = extractResources("mng-0249"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java index d3aee5a0c3de..9a6df5c047f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,10 +37,10 @@ public class MavenITmng0282NonReactorExecWhenProjectIndependentTest extends Abst */ @Test public void testitMNG282() throws Exception { - File testDir = extractResources("/mng-0282"); + Path testDir = extractResources("mng-0282"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-no-project").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-no-project")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -48,7 +48,7 @@ public void testitMNG282() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index c11dfeb17eac..675307a42b5c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -18,8 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; import org.junit.jupiter.api.Test; /** @@ -37,9 +38,9 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest extends AbstractMavenI */ @Test public void testitMNG294() throws Exception { - File testDir = extractResources("/mng-0294"); + Path testDir = extractResources("mng-0294"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java index e8d841abf69b..68ad6178629c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0377PluginLookupFromPrefixTest extends AbstractMavenInteg */ @Test public void testitMNG377() throws Exception { - File testDir = extractResources("/mng-0377"); + Path testDir = extractResources("mng-0377"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0377"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java index a18e7d3f12ac..2b4a8cb01dea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,10 +38,10 @@ public class MavenITmng0449PluginVersionResolutionTest extends AbstractMavenInte */ @Test public void testitLifecycleInvocation() throws Exception { - File testDir = extractResources("/mng-0449"); - testDir = new File(testDir, "lifecycle"); + Path testDir = extractResources("mng-0449"); + testDir = testDir.resolve("lifecycle"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { @@ -71,10 +71,10 @@ public void testitLifecycleInvocation() throws Exception { */ @Test public void testitCliInvocation() throws Exception { - File testDir = extractResources("/mng-0449"); - testDir = new File(testDir, "direct"); + Path testDir = extractResources("mng-0449"); + testDir = testDir.resolve("direct"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java index 0b453e8c621e..85277722e34e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng0461TolerateMissingDependencyPomTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-0461"); + Path testDir = extractResources("mng-0461"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0461"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java index a477e9299012..0eba2ba5b52b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng0469ReportConfigTest extends AbstractMavenIntegrationTest */ @Test public void testitBuildConfigDominantDuringBuild() throws Exception { - File testDir = extractResources("/mng-0469/test1"); + Path testDir = extractResources("mng-0469/test1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config"); @@ -60,9 +60,9 @@ public void testitBuildConfigDominantDuringBuild() throws Exception { */ @Test public void testitBuildConfigIrrelevantForReports() throws Exception { - File testDir = extractResources("/mng-0469/test2"); + Path testDir = extractResources("mng-0469/test2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); // Inline version check: (,3.0-alpha-1) - current Maven version doesn't match this range diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java index b48c06bca648..5277e8b298c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng0471CustomLifecycleTest extends AbstractMavenIntegrationT */ @Test public void testitMNG471() throws Exception { - File testDir = extractResources("/mng-0471"); + Path testDir = extractResources("mng-0471"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArguments( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java index 082b7e364aee..a3d6ccc5a9ec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,11 +40,11 @@ public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrat */ @Test public void testitModel() throws Exception { - File testDir = extractResources("/mng-0479"); + Path testDir = extractResources("mng-0479"); // Phase 1: Ensure the test plugin is downloaded before the test cuts off access to central - File child1 = new File(testDir, "setup"); - Verifier verifier = newVerifier(child1.getAbsolutePath()); + Path child1 = testDir.resolve("setup"); + Verifier verifier = newVerifier(child1); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -54,8 +53,8 @@ public void testitModel() throws Exception { verifier.verifyErrorFreeLog(); // Phase 2: Now run the test - File child2 = new File(testDir, "test"); - verifier = newVerifier(child2.getAbsolutePath()); + Path child2 = testDir.resolve("test"); + verifier = newVerifier(child2); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -112,9 +111,9 @@ public void testitModel() throws Exception { */ @Test public void testitResolution() throws Exception { - File testDir = extractResources("/mng-0479"); + Path testDir = extractResources("mng-0479"); - Verifier verifier = newVerifier(new File(testDir, "test-1").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("test-1")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0479"); @@ -133,7 +132,7 @@ public void testitResolution() throws Exception { verifier.verifyArtifactPresent("org.apache.maven.its.mng0479", "b", "0.1-SNAPSHOT", "jar"); verifier.verifyArtifactPresent("org.apache.maven.its.mng0479", "b", "0.1-SNAPSHOT", "pom"); - verifier = newVerifier(new File(testDir, "test-2").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test-2")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -150,7 +149,7 @@ public void testitResolution() throws Exception { verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0479", "parent", "0.1", "pom"); - verifier = newVerifier(new File(testDir, "test-3").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test-3")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -168,7 +167,7 @@ public void testitResolution() throws Exception { verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0479", "a", "0.1", "jar"); verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0479", "a", "0.1", "pom"); - verifier = newVerifier(new File(testDir, "test-4").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test-4")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java index 4a76127e9da4..c20dae026eb4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0496IgnoreUnknownPluginParametersTest extends AbstractMav */ @Test public void testitMNG496() throws Exception { - File testDir = extractResources("/mng-0496"); + Path testDir = extractResources("mng-0496"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java index 7ed9ce6e6e9a..428356067c20 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import org.junit.jupiter.api.Test; @@ -45,9 +45,9 @@ public class MavenITmng0505VersionRangeTest extends AbstractMavenIntegrationTest */ @Test public void testitMNG505() throws Exception { - File testDir = extractResources("/mng-0505"); + Path testDir = extractResources("mng-0505"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0505"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java index 3c5a9c26c6fc..b49badaf79fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng0507ArtifactRelocationTest extends AbstractMavenIntegrati */ @Test public void testitMNG507() throws Exception { - File testDir = extractResources("/mng-0507"); + Path testDir = extractResources("mng-0507"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support", "1.1"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java index d9c3e10b497d..268fc6f2d876 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng0522InheritedPluginMgmtConfigTest extends AbstractMavenIn */ @Test public void testitMNG522() throws Exception { - File testDir = extractResources("/mng-0522"); + Path testDir = extractResources("mng-0522"); - Verifier verifier = newVerifier(new File(testDir, "child-project").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child-project")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index 03937ea337cf..fc34fbd38828 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -50,7 +49,7 @@ @Disabled("Bounds: [2.1.0,3.0-alpha-1),[3.0-alpha-3,4.0.0-beta-4]") public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; private Server server; @@ -58,7 +57,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenInte @BeforeEach protected void setUp() throws Exception { - testDir = extractResources("/mng-0553"); + testDir = extractResources("mng-0553"); Constraint constraint = new Constraint(__BASIC_AUTH, "user"); constraint.setAuthenticate(true); @@ -79,7 +78,7 @@ protected void setUp() throws Exception { securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping}); ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(new File(testDir, "repo").getAbsolutePath()); + repoHandler.setResourceBase(testDir.resolve("repo").toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(securityHandler); @@ -110,17 +109,17 @@ protected void tearDown() throws Exception { */ @Test public void testitBasic() throws Exception { - testDir = new File(testDir, "test-1"); + testDir = testDir.resolve("test-1"); Map filterProps = new HashMap<>(); filterProps.put("@port@", Integer.toString(port)); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng0553"); verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar"); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); - verifier.setUserHomeDirectory(new File(testDir, "userhome").toPath()); + verifier.setUserHomeDirectory(testDir.resolve("userhome")); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("validate"); @@ -138,16 +137,16 @@ public void testitBasic() throws Exception { */ @Test public void testitRelocation() throws Exception { - testDir = new File(testDir, "test-2"); + testDir = testDir.resolve("test-2"); Map filterProps = new HashMap<>(); filterProps.put("@port@", Integer.toString(port)); // NOTE: The upper-case scheme name is essential part of the test String secUrl = "FILE://" - + new File(testDir, "relocated-settings-security.xml").toURI().getRawPath(); + + testDir.resolve("relocated-settings-security.xml").toUri().getRawPath(); filterProps.put("@relocation@", secUrl); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng0553"); verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar"); @@ -161,7 +160,7 @@ public void testitRelocation() throws Exception { // NOTE: The selection of the Turkish language for the JVM locale is essential part of the test verifier.setEnvironmentVariable( "MAVEN_OPTS", - "-Dsettings.security=" + new File(testDir, "settings~security.xml").getAbsolutePath() + "-Dsettings.security=" + testDir.resolve("settings~security.xml") + " -Duser.language=tr"); verifier.addCliArgument("validate"); verifier.execute(); @@ -179,11 +178,11 @@ public void testitRelocation() throws Exception { public void testitEncryption() throws Exception { // requiresMavenVersion("[2.1.0,3.0-alpha-1),[3.0-alpha-7,)"); - testDir = new File(testDir, "test-3"); + testDir = testDir.resolve("test-3"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); - verifier.setUserHomeDirectory(new File(testDir, "userhome").toPath()); + verifier.setUserHomeDirectory(testDir.resolve("userhome")); verifier.addCliArgument("--encrypt-master-password"); verifier.addCliArgument("test"); verifier.setLogFileName("log-emp.txt"); @@ -194,9 +193,9 @@ public void testitEncryption() throws Exception { List log = verifier.loadLogLines(); assertNotNull(findPassword(log)); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); - verifier.setUserHomeDirectory(new File(testDir, "userhome").toPath()); + verifier.setUserHomeDirectory(testDir.resolve("userhome")); verifier.addCliArgument("--encrypt-password"); verifier.addCliArgument("testpass"); verifier.setLogFileName("log-ep.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java index 895a4e22ffd5..a2edc59ad2c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng0557UserSettingsCliOptionTest extends AbstractMavenIntegr */ @Test public void testitMNG557() throws Exception { - File testDir = extractResources("/mng-0557"); + Path testDir = extractResources("mng-0557"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java index 08a4015bf74f..2d0209a738d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -39,20 +39,20 @@ public class MavenITmng0612NewestConflictResolverTest extends AbstractMavenInteg */ @Test public void testitMNG612() throws Exception { - File testDir = extractResources("/mng-0612/dependency"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-0612/dependency"); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - testDir = extractResources("/mng-0612/plugin"); - verifier = newVerifier(testDir.getAbsolutePath()); + testDir = extractResources("mng-0612/plugin"); + verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - testDir = extractResources("/mng-0612/project"); - verifier = newVerifier(testDir.getAbsolutePath()); + testDir = extractResources("mng-0612/project"); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java index 76623c418324..97d2a57515db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng0666IgnoreLegacyPomTest extends AbstractMavenIntegrationT */ @Test public void testitMNG666() throws Exception { - File testDir = extractResources("/mng-0666"); + Path testDir = extractResources("mng-0666"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0059"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java index fe04f7cfc108..6645b584e3d0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng0674PluginParameterAliasTest extends AbstractMavenIntegra */ @Test public void testitLifecycle() throws Exception { - File testDir = extractResources("/mng-0674"); + Path testDir = extractResources("mng-0674"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-lifecycle.txt"); @@ -64,9 +64,9 @@ public void testitLifecycle() throws Exception { */ @Test public void testitCli() throws Exception { - File testDir = extractResources("/mng-0674"); + Path testDir = extractResources("mng-0674"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-cli.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java index 3135fc0eae7f..3fbe159d4b35 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,13 +39,11 @@ public class MavenITmng0680ParentBasedirTest extends AbstractMavenIntegrationTes */ @Test public void testitMNG680() throws Exception { - File testDir = extractResources("/mng-0680"); - - testDir = testDir.getCanonicalFile(); + Path testDir = extractResources("mng-0680"); - File subDir = new File(testDir, "subproject"); + Path subDir = testDir.resolve("subproject"); - Verifier verifier = newVerifier(subDir.getAbsolutePath()); + Verifier verifier = newVerifier(subDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -54,7 +51,7 @@ public void testitMNG680() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/basedir.properties"); - assertEquals(subDir, new File(props.getProperty("project.basedir"))); - assertEquals(testDir, new File(props.getProperty("project.parent.basedir"))); + assertEquals(subDir, Path.of(props.getProperty("project.basedir"))); + assertEquals(testDir, Path.of(props.getProperty("project.parent.basedir"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java index 77fefc895886..c17c856e7e60 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0761MissingSnapshotDistRepoTest extends AbstractMavenInte */ @Test public void testitMNG761() throws Exception { - File testDir = extractResources("/mng-0761"); + Path testDir = extractResources("mng-0761"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0761"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index cfbc1145af25..511f43e1b4f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; @@ -53,7 +53,7 @@ public class MavenITmng0768OfflineModeTest extends AbstractMavenIntegrationTestC */ @Test public void testitMNG768() throws Exception { - File testDir = extractResources("/mng-0768"); + Path testDir = extractResources("mng-0768"); final List requestedUris = Collections.synchronizedList(new ArrayList<>()); @@ -99,7 +99,7 @@ public void handle( int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); // phase 1: run build in online mode to fill local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0768"); @@ -117,7 +117,7 @@ public void handle( requestedUris.clear(); // phase 2: run build in offline mode to check it still passes, without network accesses - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-o"); @@ -134,7 +134,7 @@ public void handle( // phase 3: delete test artifact and run build in offline mode to check it fails now // NOTE: Adding the settings again to offer Maven the bad choice of using the remote repo - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0768"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java index 2d61abbcc618..11eff84d3e99 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest extends AbstractM */ @Test public void testitMNG773() throws Exception { - File testDir = extractResources("/mng-0773"); + Path testDir = extractResources("mng-0773"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java index 3db5b8ba079c..da4dff06f3ad 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0781PluginConfigVsExecConfigTest extends AbstractMavenInt */ @Test public void testitMNG0781() throws Exception { - File testDir = extractResources("/mng-0781"); + Path testDir = extractResources("mng-0781"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java index 3a374c15463c..7254fecd9a77 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0786ProfileAwareReactorTest extends AbstractMavenIntegrat */ @Test public void testitMNG0786() throws Exception { - File testDir = extractResources("/mng-0786"); + Path testDir = extractResources("mng-0786"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("sub1/target"); verifier.deleteDirectory("sub2/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java index 995b88cc4937..ce8b6ee81add 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng0814ExplicitProfileActivationTest extends AbstractMavenIn */ @Test public void testitMNG814() throws Exception { - File testDir = extractResources("/mng-0814"); + Path testDir = extractResources("mng-0814"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-P"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java index ea4fd1f387bf..7a3533003a2f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import java.util.Collections; @@ -41,9 +41,9 @@ public class MavenITmng0818WarDepsNotTransitiveTest extends AbstractMavenIntegra */ @Test public void testitMNG0818() throws Exception { - File testDir = extractResources("/mng-0818"); + Path testDir = extractResources("mng-0818"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0080"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java index 154a2bad6667..c91c21d0aa1b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng0820ConflictResolutionTest extends AbstractMavenIntegrati */ @Test public void testitMNG0820() throws Exception { - File testDir = extractResources("/mng-0820"); + Path testDir = extractResources("mng-0820"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0820"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java index 5e0feca52b54..b943f622c00d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,10 +37,10 @@ public class MavenITmng0823MojoContextPassingTest extends AbstractMavenIntegrati */ @Test public void testitMNG0823() throws Exception { - File testDir = extractResources("/mng-0823"); + Path testDir = extractResources("mng-0823"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-context-passing").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-context-passing")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -48,7 +48,7 @@ public void testitMNG0823() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArguments( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java index 9529b6875315..eff32cb162bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,9 +42,9 @@ public class MavenITmng0828PluginConfigValuesInDebugTest extends AbstractMavenIn */ @Test public void testitMNG0828() throws Exception { - File testDir = extractResources("/mng-0828"); + Path testDir = extractResources("mng-0828"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-X"); @@ -56,7 +55,7 @@ public void testitMNG0828() throws Exception { String log = verifier.loadLogContent(); checkLog(log, "[DEBUG] (f) aliasDefaultExpressionParam = test"); - checkLog(log, "[DEBUG] (f) basedir = " + testDir.getCanonicalPath()); + checkLog(log, "[DEBUG] (f) basedir = " + testDir); checkLog( log, "[DEBUG] (f) beanParam = org.apache.maven.plugin.coreit.Bean[fieldParam=field, setterParam=setter, setterCalled=true]"); @@ -80,7 +79,7 @@ public void testitMNG0828() throws Exception { checkLog(log, "[DEBUG] (f) doubleParam = -1.5"); checkLog(log, "[DEBUG] (f) fieldParam = field"); - checkLog(log, "[DEBUG] (f) fileParam = " + new File(testDir, "pom.xml").getCanonicalPath()); + checkLog(log, "[DEBUG] (f) fileParam = " + testDir.resolve("pom.xml")); checkLog(log, "[DEBUG] (f) floatParam = 0.0"); checkLog(log, "[DEBUG] (f) integerParam = 0"); checkLog(log, "[DEBUG] (f) listParam = [one, two, three, four]"); @@ -91,7 +90,7 @@ public void testitMNG0828() throws Exception { checkLog( log, "[DEBUG] (f) propertiesFile = " - + new File(testDir, "target/plugin-config.properties").getCanonicalPath()); + + testDir.resolve("target/plugin-config.properties")); // Properties item order is not guaranteed, so only check begin of params ... checkLog(log, "[DEBUG] (f) propertiesParam = {key"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java index f35870f684bf..87016b52d720 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng0836PluginParentResolutionTest extends AbstractMavenInteg */ @Test public void testitMNG836() throws Exception { - File testDir = extractResources("/mng-0836"); + Path testDir = extractResources("mng-0836"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng836"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java index 2f57a3f6d2b6..bde887244442 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng0848UserPropertyOverridesDefaultValueTest extends Abstrac */ @Test public void testitMNG848() throws Exception { - File testDir = extractResources("/mng-0848"); + Path testDir = extractResources("mng-0848"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dconfig.aliasDefaultExpressionParam=PASSED"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java index b7dd90604471..f1ec519545d3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng0866EvaluateDefaultValueTest extends AbstractMavenIntegra */ @Test public void testitMNG866() throws Exception { - File testDir = extractResources("/mng-0866"); + Path testDir = extractResources("mng-0866"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java index 8c5646f03f0a..05cdffaca428 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest extends AbstractMaven */ @Test public void testitMNG0870() throws Exception { - File testDir = extractResources("/mng-0870"); + Path testDir = extractResources("mng-0870"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("project/target"); verifier.deleteArtifacts("org.apache.maven.its.mng0870"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index fd9ae60c58f8..4e6bf0abb848 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ public class MavenITmng0947OptionalDependencyTest extends AbstractMavenIntegrati public void testit() throws Exception { // failingMavenVersions("(,3.1.0-alpha-1)"); - File testDir = extractResources("/mng-0947"); + Path testDir = extractResources("mng-0947"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0947"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java index 04db046509c1..7081b207761e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,8 +40,8 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest extend */ @Test public void testitMNG0956() throws Exception { - File testDir = extractResources("/mng-0956"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-0956"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng0956"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java index 53e55e6f4075..f8b33fe83402 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,8 +39,8 @@ public class MavenITmng0985NonExecutedPluginMgmtGoalsTest extends AbstractMavenI */ @Test public void testitMNG0985() throws Exception { - File testDir = extractResources("/mng-0985"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-0985"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index ff7a97683e30..e621cc132dfc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -18,8 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -40,8 +41,8 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest extends AbstractMavenI */ @Test public void testitMNG1021() throws Exception { - File testDir = extractResources("/mng-1021"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-1021"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("repo"); verifier.deleteArtifacts("org.apache.maven.its.mng1021"); @@ -54,7 +55,7 @@ public void testitMNG1021() throws Exception { verifier.verifyArtifactPresent("org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "jar"); String dir = "repo/org/apache/maven/its/mng1021/test/"; - String snapshot = getSnapshotVersion(new File(testDir, dir + "1-SNAPSHOT")); + String snapshot = getSnapshotVersion(testDir.resolve(dir + "1-SNAPSHOT")); assertTrue(snapshot.endsWith("-1"), snapshot); verifier.verifyFilePresent(dir + "maven-metadata.xml"); @@ -74,14 +75,15 @@ public void testitMNG1021() throws Exception { verifier.verifyFilePresent(dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar.sha1"); } - private String getSnapshotVersion(File artifactDir) { - File[] files = artifactDir.listFiles(); - for (File file : files) { - String name = file.getName(); - if (name.endsWith(".pom")) { - return name.substring("test-".length(), name.length() - ".pom".length()); - } + private String getSnapshotVersion(Path artifactDir) throws IOException { + try (var stream = Files.list(artifactDir)) { + return stream + .filter(Files::isRegularFile) + .map(Path::getFileName) + .map(Path::toString) + .filter(name -> name.endsWith(".pom")) + .findFirst() + .map(pomName -> pomName.substring("test-".length(), pomName.length() - ".pom".length())) + .orElseThrow(() -> new IllegalStateException("POM not found in " + artifactDir)); } - throw new IllegalStateException("POM not found in " + artifactDir); - } -} + }} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java index 20cac281a3bd..b24ee8d47d5d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,8 +39,8 @@ public class MavenITmng1052PluginMgmtConfigTest extends AbstractMavenIntegration */ @Test public void testitMNG1052() throws Exception { - File testDir = extractResources("/mng-1052"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-1052"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java index e46e4aab2d56..3c05d8c23d52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public void testitForkLifecycle() throws Exception { // excluded 2.1.x and 2.2.x due to MNG-4325 // requiresMavenVersion("[2.0,2.1.0),[3.0-alpha-3,)"); - File testDir = extractResources("/mng-1073"); + Path testDir = extractResources("mng-1073"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub-1/target"); @@ -64,9 +64,9 @@ public void testitForkLifecycle() throws Exception { */ @Test public void testitForkGoal() throws Exception { - File testDir = extractResources("/mng-1073"); + Path testDir = extractResources("mng-1073"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java index a04c495a9448..18a4bc2d8a47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng1088ReactorPluginResolutionTest extends AbstractMavenInte */ @Test public void testitMNG1088() throws Exception { - File testDir = extractResources("/mng-1088"); + Path testDir = extractResources("mng-1088"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("client/target"); verifier.deleteArtifacts("org.apache.maven.its.mng1088"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11009StackOverflowParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11009StackOverflowParentResolutionTest.java index 841e359bbf06..5ea0a1ad0b5e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11009StackOverflowParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11009StackOverflowParentResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng11009StackOverflowParentResolutionTest extends AbstractMa */ @Test public void testStackOverflowInParentResolution() throws Exception { - File testDir = extractResources("/mng-11009-stackoverflow-parent-resolution"); + Path testDir = extractResources("mng-11009-stackoverflow-parent-resolution"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng11009"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java index c8d859e23075..9186185f85c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -57,9 +57,9 @@ public void testitBA() throws Exception { } private void testit(String project) throws Exception { - File testDir = extractResources("/mng-1142"); + Path testDir = extractResources("mng-1142"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng1142"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java index 161f976f0420..99d42eff3f59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng1144MultipleDefaultGoalsTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-1144"); + Path testDir = extractResources("mng-1144"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java index 9f23a2f51ff6..c3cdec569605 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng1233WarDepWithProvidedScopeTest extends AbstractMavenInte */ @Test public void testitMNG1233() throws Exception { - File testDir = extractResources("/mng-1233"); + Path testDir = extractResources("mng-1233"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it0083"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java index 5d88f8b58dfa..d3710b79c18f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng1323AntrunDependenciesTest extends AbstractMavenIntegrati */ @Test public void testitMNG1323() throws Exception { - File testDir = extractResources("/mng-1323"); + Path testDir = extractResources("mng-1323"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("a/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java index 788196386572..2518bb776600 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng1349ChecksumFormatsTest extends AbstractMavenIntegrationT */ @Test public void testitMNG1349() throws Exception { - File testDir = extractResources("/mng-1349"); + Path testDir = extractResources("mng-1349"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng1349"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java index 3b97e25993d3..a1e6b36726bd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng1412DependenciesOrderTest extends AbstractMavenIntegratio @Test public void testitMNG1412() throws Exception { - File testDir = extractResources("/mng-1412"); + Path testDir = extractResources("mng-1412"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng1412"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java index c97ac838b43c..83d077d0dc54 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng1415QuotedSystemPropertiesTest extends AbstractMavenInteg */ @Test public void testitMNG1415() throws Exception { - File testDir = extractResources("/mng-1415"); + Path testDir = extractResources("mng-1415"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dtest.property=Test Property"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java index 52f55fcc1137..15314a032f87 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,9 +31,9 @@ public class MavenITmng1491ReactorArtifactIdCollisionTest extends AbstractMavenI @Test public void testitMNG1491() throws Exception { - File testDir = extractResources("/mng-1491"); + Path testDir = extractResources("mng-1491"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java index f2a50a1dad0b..fdd6862fd5b6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,11 +31,11 @@ public class MavenITmng1493NonStandardModulePomNamesTest extends AbstractMavenIn @Test public void testitMNG1493() throws Exception { - File testDir = extractResources("/mng-1493"); + Path testDir = extractResources("mng-1493"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java index c465f9238b1f..1c2efb4d7bc6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng1701DuplicatePluginTest extends AbstractMavenIntegrationT */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-1701"); + Path testDir = extractResources("mng-1701"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java index 10cfd9042ef8..e5e5bf1278f2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,9 +41,9 @@ public class MavenITmng1703PluginMgmtDepInheritanceTest extends AbstractMavenInt */ @Test public void testitMNG1703() throws Exception { - File testDir = extractResources("/mng-1703"); + Path testDir = extractResources("mng-1703"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java index b903b41734d1..1094d26a583f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,17 +42,17 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest extends Abst */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-1751"); + Path testDir = extractResources("mng-1751"); - File dir = new File(testDir, "repo/org/apache/maven/its/mng1751/dep/0.1-SNAPSHOT"); - File templateMetadataFile = new File(dir, "template-metadata.xml"); - File metadataFile = new File(dir, "maven-metadata.xml"); - Files.copy(templateMetadataFile.toPath(), metadataFile.toPath(), StandardCopyOption.REPLACE_EXISTING); + Path dir = testDir.resolve("repo/org/apache/maven/its/mng1751/dep/0.1-SNAPSHOT"); + Path templateMetadataFile = dir.resolve("template-metadata.xml"); + Path metadataFile = dir.resolve("maven-metadata.xml"); + Files.copy(templateMetadataFile, metadataFile, StandardCopyOption.REPLACE_EXISTING); String checksum = ItUtils.calcHash(metadataFile, "SHA-1"); - Files.writeString(metadataFile.toPath().getParent().resolve(metadataFile.getName() + ".sha1"), checksum); + Files.writeString(metadataFile.getParent().resolve(metadataFile.getFileName() + ".sha1"), checksum); // phase 1: deploy a new snapshot, this should update the metadata despite its future timestamp - Verifier verifier = newVerifier(new File(testDir, "dep").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("dep")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng1751"); verifier.addCliArgument("validate"); @@ -61,7 +60,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // phase 2: resolve snapshot, if the previous deployment didn't update the metadata, we get the wrong file - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng1751"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java index a8b87b4058bf..949a633c3122 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest extends Abst */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-1803"); + Path testDir = extractResources("mng-1803"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java index 7f5f19fb2c25..09d83d8e2658 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -42,9 +42,9 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte */ @Test public void testitDirectVsIndirect() throws Exception { - File testDir = extractResources("/mng-1895/direct-vs-indirect"); + Path testDir = extractResources("mng-1895/direct-vs-indirect"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng1895"); verifier.deleteDirectory("target"); @@ -209,9 +209,9 @@ public void testitProvidedVsTest() throws Exception { } private Verifier run(String scopeB, String scopeA) throws Exception { - File testDir = extractResources("/mng-1895/strong-vs-weak"); + Path testDir = extractResources("mng-1895/strong-vs-weak"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng1895"); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java index 9044d8d722d2..fc7d0a83f63a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng1957JdkActivationWithVersionRangeTest extends AbstractMav */ @Test public void testitMNG1957() throws Exception { - File testDir = extractResources("/mng-1957"); + Path testDir = extractResources("mng-1957"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java index 6a799aac835f..0ca64fa3dc61 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng1992SystemPropOverridesPomPropTest extends AbstractMavenI */ @Test public void testitMNG1992() throws Exception { - File testDir = extractResources("/mng-1992"); + Path testDir = extractResources("mng-1992"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.getSystemProperties().setProperty("config.stringParam", "PASSED"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java index 02d2ba8c3dd6..acefe1221e7d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng1995InterpolateBooleanModelElementsTest extends AbstractM */ @Test public void testitMNG1995() throws Exception { - File testDir = extractResources("/mng-1995"); + Path testDir = extractResources("mng-1995"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java index 4b28a93ae82e..8705cecf19f7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,9 +40,9 @@ public class MavenITmng2006ChildPathAwareUrlInheritanceTest extends AbstractMave */ @Test public void testitMNG2006() throws Exception { - File testDir = extractResources("/mng-2006"); + Path testDir = extractResources("mng-2006"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java index 212397101c2f..7d342bbc80ab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest extends Abstra @Test public void testitMNG2045() throws Exception { - File testDir = extractResources("/mng-2045"); + Path testDir = extractResources("mng-2045"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("test-user/target"); verifier.deleteArtifacts("org.apache.maven.its.mng2045"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java index 62d713dd2297..358b554d4182 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest extends */ @Test public void testitMNG2052() throws Exception { - File testDir = extractResources("/mng-2052"); + Path testDir = extractResources("mng-2052"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java index 94affd8f1e01..fd5686a0e625 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,8 +40,8 @@ public class MavenITmng2054PluginExecutionInheritanceTest extends AbstractMavenI */ @Test public void testitMNG2054() throws Exception { - File testDir = extractResources("/mng-2054"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2054"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("project/project-level2/project-level3/project-jar/target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index 5a880aa64f89..3eca5494db6e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -43,10 +42,10 @@ public class MavenITmng2068ReactorRelativeParentsTest extends AbstractMavenInteg */ @Test public void testitInheritedIdFields() throws Exception { - File testDir = extractResources("/mng-2068/test-1"); - File projectDir = new File(testDir, "parent"); + Path testDir = extractResources("mng-2068/test-1"); + Path projectDir = testDir.resolve("parent"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + Verifier verifier = newVerifier(projectDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2068"); verifier.addCliArgument("validate"); @@ -61,10 +60,10 @@ public void testitInheritedIdFields() throws Exception { */ @Test public void testitExplicitIdFields() throws Exception { - File testDir = extractResources("/mng-2068/test-2"); - File projectDir = new File(testDir, "parent"); + Path testDir = extractResources("mng-2068/test-2"); + Path projectDir = testDir.resolve("parent"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + Verifier verifier = newVerifier(projectDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2068"); verifier.addCliArgument("validate"); @@ -79,10 +78,10 @@ public void testitExplicitIdFields() throws Exception { */ @Test public void testitComplex() throws Exception { - File testDir = extractResources("/mng-2068/test-3"); - File projectDir = testDir; + Path testDir = extractResources("mng-2068/test-3"); + Path projectDir = testDir; - Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + Verifier verifier = newVerifier(projectDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2068"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java index ed68fb5af3de..6c85b410a3d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2098"); + Path testDir = extractResources("mng-2098"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2098"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java index 5186ce723be5..65213410ed52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng2103PluginExecutionInheritanceTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2103"); + Path testDir = extractResources("mng-2103"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("child-1/target"); verifier.deleteDirectory("child-2/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java index 66e316b0e169..567ea71bb8d0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ public class MavenITmng2123VersionRangeDependencyTest extends AbstractMavenInteg @Test public void testitMNG2123() throws Exception { - File testDir = extractResources("/mng-2123"); + Path testDir = extractResources("mng-2123"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2123"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java index 43799711c71a..6e65c28b07f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,10 +37,10 @@ public class MavenITmng2124PomInterpolationWithParentValuesTest extends Abstract */ @Test public void testitMNG2124() throws Exception { - File testDir = extractResources("/mng-2124"); - File child = new File(testDir, "parent/child"); + Path testDir = extractResources("mng-2124"); + Path child = testDir.resolve("parent/child"); - Verifier verifier = newVerifier(child.getAbsolutePath()); + Verifier verifier = newVerifier(child); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java index 6245e730f3a1..dc3311c19eb5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng2130ParentLookupFromReactorCacheTest extends AbstractMave */ @Test public void testitMNG2130() throws Exception { - File testDir = extractResources("/mng-2130"); + Path testDir = extractResources("mng-2130"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.mng2130"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java index f893e03475d8..d574db1f2ee9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng2135PluginBuildInReactorTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2135"); + Path testDir = extractResources("mng-2135"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("plugin/target"); verifier.deleteDirectory("project/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java index 11aaa527e8e6..95548cc78055 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,14 +40,14 @@ public class MavenITmng2136ActiveByDefaultProfileTest extends AbstractMavenInteg */ @Test public void testitMNG2136() throws Exception { - File testDir = extractResources("/mng-2136"); + Path testDir = extractResources("mng-2136"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument( - "-Dexpression.outputFile=" + new File(testDir, "target/expression.properties").getPath()); + "-Dexpression.outputFile=" + testDir.resolve("target/expression.properties")); verifier.addCliArgument("-Dexpression.expressions=project/properties"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java index a608addfa69f..292492f43f2a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2140"); + Path testDir = extractResources("mng-2140"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java index 700c97f21d50..d57898b59e9a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng2174PluginDepsManagedByParentProfileTest extends Abstract */ @Test public void testitMNG2174() throws Exception { - File testDir = extractResources("/mng-2174"); + Path testDir = extractResources("mng-2174"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2174"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java index 8aebd9bf0ce5..2d0e3727ec50 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng2196ParentResolutionTest extends AbstractMavenIntegration */ @Test public void testitMNG2196() throws Exception { - File testDir = extractResources("/mng-2196"); + Path testDir = extractResources("mng-2196"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2196"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index c64b8dfcd121..21dfa777999d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; @@ -34,9 +34,9 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exception { // failingMavenVersions("(3.2.2,3.5.0-alpha-0)"); Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/valid-inclusive-upper-bound"); + Path testDir = extractResources("mng-2199-parent-version-range/valid-inclusive-upper-bound"); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-U"); verifier.setAutoclean(false); verifier.addCliArgument("verify"); @@ -46,7 +46,7 @@ public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exceptio // All Maven versions not supporting remote parent version ranges will log a warning message whenever // building a parent fails. The build succeeds without any parent. If that warning message appears in the // log, parent resolution failed. - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found."); } @@ -54,9 +54,9 @@ public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exceptio public void testValidParentVersionRangeWithExclusiveUpperBound() throws Exception { // failingMavenVersions("(3.2.2,3.5.0-alpha-0)"); Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/valid-exclusive-upper-bound"); + Path testDir = extractResources("mng-2199-parent-version-range/valid-exclusive-upper-bound"); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-U"); verifier.setAutoclean(false); verifier.addCliArgument("verify"); @@ -66,17 +66,17 @@ public void testValidParentVersionRangeWithExclusiveUpperBound() throws Exceptio // All Maven versions not supporting remote parent version ranges will log a warning message whenever // building a parent fails. The build succeeds without any parent. If that warning message appears in the // log, parent resolution failed. - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found."); } @Test public void testInvalidParentVersionRangeWithoutUpperBound() throws Exception { Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/invalid"); + Path testDir = extractResources("mng-2199-parent-version-range/invalid"); try { - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-U"); verifier.addCliArgument("verify"); @@ -84,7 +84,7 @@ public void testInvalidParentVersionRangeWithoutUpperBound() throws Exception { fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { assertNotNull(verifier); - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); assertTrue( indexOf(lines, ".*(parent)? version range.*does not specify an upper bound.*") >= 0, "Expected error message not found."); @@ -94,10 +94,10 @@ public void testInvalidParentVersionRangeWithoutUpperBound() throws Exception { @Test public void testValidParentVersionRangeInvalidVersionExpression() throws Exception { Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/expression"); + Path testDir = extractResources("mng-2199-parent-version-range/expression"); try { - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-U"); verifier.addCliArgument("verify"); @@ -105,7 +105,7 @@ public void testValidParentVersionRangeInvalidVersionExpression() throws Excepti fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { assertNotNull(verifier); - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*"); assertTrue(msg >= 0, "Expected error message not found."); } @@ -114,10 +114,10 @@ public void testValidParentVersionRangeInvalidVersionExpression() throws Excepti @Test public void testValidParentVersionRangeInvalidVersionInheritance() throws Exception { Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/inherited"); + Path testDir = extractResources("mng-2199-parent-version-range/inherited"); try { - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-U"); verifier.addCliArgument("verify"); @@ -125,7 +125,7 @@ public void testValidParentVersionRangeInvalidVersionInheritance() throws Except fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { assertNotNull(verifier); - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*"); assertTrue(msg >= 0, "Expected error message not found."); } @@ -135,9 +135,9 @@ public void testValidParentVersionRangeInvalidVersionInheritance() throws Except public void testValidLocalParentVersionRange() throws Exception { // failingMavenVersions("(,3.3.0),(3.3.9,3.5.0-alpha-0)"); Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/valid-local/child"); + Path testDir = extractResources("mng-2199-parent-version-range/valid-local/child"); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -147,7 +147,7 @@ public void testValidLocalParentVersionRange() throws Exception { // log, parent resolution failed. For this test, this really just tests the project on disk getting tested // is not corrupt. It's expected to find the local parent and not fall back to remote resolution. If it // falls back to remote resolution, this just catches the test project to be broken. - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found."); } @@ -156,16 +156,16 @@ public void testInvalidLocalParentVersionRange() throws Exception { // failingMavenVersions("[3.3.0,3.3.9)"); // Fallback to remote resolution not tested here. Remote parent expected to not be available anywhere. Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/invalid-local/child"); + Path testDir = extractResources("mng-2199-parent-version-range/invalid-local/child"); try { - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { assertNotNull(verifier); - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, ".*Non-resolvable parent POM org.apache.maven.its.mng2199:local-parent:\\[2,3\\].*"); assertTrue(msg >= 0, "Expected error message not found."); @@ -176,9 +176,9 @@ public void testInvalidLocalParentVersionRange() throws Exception { public void testInvalidLocalParentVersionRangeFallingBackToRemote() throws Exception { // failingMavenVersions("[3.3.9]"); Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/local-fallback-to-remote/child"); + Path testDir = extractResources("mng-2199-parent-version-range/local-fallback-to-remote/child"); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -188,7 +188,7 @@ public void testInvalidLocalParentVersionRangeFallingBackToRemote() throws Excep // log, parent resolution failed. For this test, local parent resolution falls back to remote parent // resolution with a version range in use. If the warning message is in the logs, that remote parent // resolution failed unexpectedly. - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found."); } @@ -196,16 +196,16 @@ public void testInvalidLocalParentVersionRangeFallingBackToRemote() throws Excep public void testValidLocalParentVersionRangeInvalidVersionExpression() throws Exception { // failingMavenVersions("(,3.5.0-alpha-0)"); Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/expression-local/child"); + Path testDir = extractResources("mng-2199-parent-version-range/expression-local/child"); try { - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { assertNotNull(verifier); - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*"); assertTrue(msg >= 0, "Expected error message not found."); } @@ -215,16 +215,16 @@ public void testValidLocalParentVersionRangeInvalidVersionExpression() throws Ex public void testValidLocalParentVersionRangeInvalidVersionInheritance() throws Exception { // failingMavenVersions("(,3.5.0-alpha-0)"); Verifier verifier = null; - File testDir = extractResources("/mng-2199-parent-version-range/inherited-local/child"); + Path testDir = extractResources("mng-2199-parent-version-range/inherited-local/child"); try { - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { assertNotNull(verifier); - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*"); assertTrue(msg >= 0, "Expected error message not found."); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index 78cadbca6c34..139e02817d3b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -39,8 +38,8 @@ public class MavenITmng2201PluginConfigInterpolationTest extends AbstractMavenIn */ @Test public void testitMNG2201() throws Exception { - File testDir = extractResources("/mng-2201"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2201"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -48,11 +47,11 @@ public void testitMNG2201() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/config.properties"); - ItUtils.assertCanonicalFileEquals(new File(testDir, "target"), new File(props.getProperty("stringParam"))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("target"), Path.of(props.getProperty("stringParam"))); ItUtils.assertCanonicalFileEquals( - new File(testDir, "target"), new File(props.getProperty("propertiesParam.buildDir"))); + testDir.resolve("target"), Path.of(props.getProperty("propertiesParam.buildDir"))); ItUtils.assertCanonicalFileEquals( - new File(testDir, "target"), new File(props.getProperty("mapParam.buildDir"))); + testDir.resolve("target"), Path.of(props.getProperty("mapParam.buildDir"))); assertEquals("4.0.0", props.getProperty("domParam.children.modelVersion.0.value")); assertEquals("org.apache.maven.its.it0104", props.getProperty("domParam.children.groupId.0.value")); assertEquals("1.0-SNAPSHOT", props.getProperty("domParam.children.version.0.value")); @@ -60,10 +59,10 @@ public void testitMNG2201() throws Exception { assertEquals("http://maven.apache.org", props.getProperty("domParam.children.url.0.value")); assertEquals("Apache", props.getProperty("domParam.children.organization.0.children.name.0.value")); ItUtils.assertCanonicalFileEquals( - new File(testDir, "target"), - new File(props.getProperty("domParam.children.build.0.children.directory.0.value"))); + testDir.resolve("target"), + Path.of(props.getProperty("domParam.children.build.0.children.directory.0.value"))); ItUtils.assertCanonicalFileEquals( - new File(testDir, "target/classes"), - new File(props.getProperty("domParam.children.build.0.children.outputDirectory.0.value"))); + testDir.resolve("target/classes"), + Path.of(props.getProperty("domParam.children.build.0.children.outputDirectory.0.value"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java index 66836c68c270..9adf0a742eff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng2222OutputDirectoryReactorResolutionTest extends Abstract */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2222"); + Path testDir = extractResources("mng-2222"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("mod-a/target"); verifier.deleteDirectory("mod-b/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java index 3e24cc9745cd..47c7558ac01c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,8 +41,8 @@ public class MavenITmng2228ComponentInjectionTest extends AbstractMavenIntegrati */ @Test public void testitMNG2228() throws Exception { - File testDir = extractResources("/mng-2228"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2228"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2228"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java index 18944f1e7bb5..bc99f27c0040 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest extends AbstractMavenI */ @Test public void testitMNG2234() throws Exception { - File testDir = extractResources("/mng-2234"); + Path testDir = extractResources("mng-2234"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java index c74184524d86..af0b0d3d9133 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ public class MavenITmng2254PomEncodingTest extends AbstractMavenIntegrationTestC */ @Test public void testitMNG2254() throws Exception { - File testDir = extractResources("/mng-2254"); + Path testDir = extractResources("mng-2254"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("utf-8/target"); verifier.deleteDirectory("latin-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java index 4975c9527c68..6b8ac984c4af 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest extends Abstr */ @Test public void testitActivation() throws Exception { - File testDir = extractResources("/mng-2276"); + Path testDir = extractResources("mng-2276"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); @@ -63,9 +63,9 @@ public void testitActivation() throws Exception { */ @Test public void testitCliWins() throws Exception { - File testDir = extractResources("/mng-2276"); + Path testDir = extractResources("mng-2276"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java index 88f29f58dd0e..aa74f2d007ca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ public class MavenITmng2277AggregatorAndResolutionPluginsTest extends AbstractMa @Test public void testitMNG2277() throws Exception { - File testDir = extractResources("/mng-2277"); + Path testDir = extractResources("mng-2277"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2277"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java index 05c488e1e788..51be7edd56b7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java @@ -18,15 +18,13 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Path; import java.util.List; import java.util.Map; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.NetworkConnector; @@ -57,16 +55,16 @@ public class MavenITmng2305MultipleProxiesTest extends AbstractMavenIntegrationT */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2305"); + Path testDir = extractResources("mng-2305"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); // NOTE: trust store cannot be reliably configured for the current JVM verifier.setForkJvm(true); // keytool -genkey -alias https.mngit -keypass key-passwd -keystore keystore -storepass store-passwd \ // -validity 4096 -dname "cn=https.mngit, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -keyalg RSA - String storePath = new File(testDir, "keystore").getAbsolutePath(); + Path storePath = testDir.resolve("keystore"); String storePwd = "store-passwd"; String keyPwd = "key-passwd"; @@ -117,8 +115,8 @@ public void testit() throws Exception { assertTrue(cp.contains("https-0.1.jar"), cp.toString()); } - private void addHttpsConnector(Server server, String keyStorePath, String keyStorePassword, String keyPassword) { - SslContextFactory sslContextFactory = new SslContextFactory(keyStorePath); + private void addHttpsConnector(Server server, Path keyStorePath, String keyStorePassword, String keyPassword) { + SslContextFactory sslContextFactory = new SslContextFactory(keyStorePath.toString()); sslContextFactory.setKeyStorePassword(keyStorePassword); sslContextFactory.setKeyManagerPassword(keyPassword); HttpConfiguration httpConfiguration = new HttpConfiguration(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java index dc20f405051b..4e54ea8dee7c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng2309ProfileInjectionOrderTest extends AbstractMavenIntegr */ @Test public void testitMNG2309() throws Exception { - File testDir = extractResources("/mng-2309"); + Path testDir = extractResources("mng-2309"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java index fee0b15ed636..7731ffae2f88 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng2318LocalParentResolutionTest extends AbstractMavenIntegr */ @Test public void testitMNG2318() throws Exception { - File testDir = extractResources("/mng-2318"); + Path testDir = extractResources("mng-2318"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java index c969599a3257..659d0da82e46 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,11 +34,11 @@ public class MavenITmng2339BadProjectInterpolationTest extends AbstractMavenInte @Test public void testitMNG2339a() throws Exception { - File testDir = extractResources("/mng-2339/a"); + Path testDir = extractResources("mng-2339/a"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-Dversion=foo"); @@ -53,11 +53,11 @@ public void testitMNG2339a() throws Exception { @Disabled("Requires Maven version: (2.0.8,4.0.0-alpha-1)") public void testitMNG2339b() throws Exception { // requiresMavenVersion("(2.0.8,4.0.0-alpha-1)"); - File testDir = extractResources("/mng-2339/b"); + Path testDir = extractResources("mng-2339/b"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -66,12 +66,12 @@ public void testitMNG2339b() throws Exception { verifier.execute(); assertTrue( - new File(testDir, "target/touch-1.txt").exists(), + Files.exists(testDir.resolve("target/touch-1.txt")), "Touchfile using ${project.version} for ${version} does not exist."); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -83,7 +83,7 @@ public void testitMNG2339b() throws Exception { verifier.verifyErrorFreeLog(); assertTrue( - new File(testDir, "target/touch-2.txt").exists(), + Files.exists(testDir.resolve("target/touch-2.txt")), "Touchfile using CLI-specified ${version} does not exist."); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index 90dcf12f59a4..0a1414be0962 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,9 +40,9 @@ public class MavenITmng2362DeployedPomEncodingTest extends AbstractMavenIntegrat */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2362"); + Path testDir = extractResources("mng-2362"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("utf-8/target"); verifier.deleteDirectory("latin-1/target"); @@ -52,34 +51,34 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File pomFile; + Path pomFile; - pomFile = new File(verifier.getArtifactPath("org.apache.maven.its.mng2362", "utf-8", "0.1", "pom")); + pomFile = verifier.getArtifactPath("org.apache.maven.its.mng2362", "utf-8", "0.1", "pom"); assertPomUtf8(pomFile); - pomFile = new File(testDir, "utf-8/target/repo/org/apache/maven/its/mng2362/utf-8/0.1/utf-8-0.1.pom"); + pomFile = testDir.resolve("utf-8/target/repo/org/apache/maven/its/mng2362/utf-8/0.1/utf-8-0.1.pom"); assertPomUtf8(pomFile); - pomFile = new File(verifier.getArtifactPath("org.apache.maven.its.mng2362", "latin-1", "0.1", "pom")); + pomFile = verifier.getArtifactPath("org.apache.maven.its.mng2362", "latin-1", "0.1", "pom"); assertPomLatin1(pomFile); - pomFile = new File(testDir, "latin-1/target/repo/org/apache/maven/its/mng2362/latin-1/0.1/latin-1-0.1.pom"); + pomFile = testDir.resolve("latin-1/target/repo/org/apache/maven/its/mng2362/latin-1/0.1/latin-1-0.1.pom"); assertPomLatin1(pomFile); } - private void assertPomUtf8(File pomFile) throws Exception { - String pom = Files.readString(pomFile.toPath()); + private void assertPomUtf8(Path pomFile) throws Exception { + String pom = Files.readString(pomFile); String chars = "\u00DF\u0131\u03A3\u042F\u05D0\u20AC"; assertPom(pomFile, pom, chars); } - private void assertPomLatin1(File pomFile) throws Exception { - String pom = Files.readString(pomFile.toPath(), StandardCharsets.ISO_8859_1); + private void assertPomLatin1(Path pomFile) throws Exception { + String pom = Files.readString(pomFile, StandardCharsets.ISO_8859_1); String chars = "\u00C4\u00D6\u00DC\u00E4\u00F6\u00FC\u00DF"; assertPom(pomFile, pom, chars); } - private void assertPom(File pomFile, String pom, String chars) throws Exception { + private void assertPom(Path pomFile, String pom, String chars) throws Exception { String prefix = "TEST-CHARS: "; int pos = pom.indexOf(prefix); assertTrue( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java index 8d75da7b83c3..e831eb250a35 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng2363BasedirAwareFileActivatorTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2363"); + Path testDir = extractResources("mng-2363"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub-a/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java index 2039efd8d012..315d3424db91 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.net.InetAddress; +import java.nio.file.Path; import java.util.Map; - import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; @@ -47,14 +46,14 @@ public class MavenITmng2387InactiveProxyTest extends AbstractMavenIntegrationTes private int proxyPort; - private File testDir; + private Path testDir; @BeforeEach protected void setUp() throws Exception { - testDir = extractResources("/mng-2387"); + testDir = extractResources("mng-2387"); ResourceHandler resourceHandler = new ResourceHandler(); - resourceHandler.setResourceBase(new File(testDir, "repo").getAbsolutePath()); + resourceHandler.setResourceBase(testDir.resolve("repo").toAbsolutePath().toString()); HandlerList handlers = new HandlerList(); handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()}); @@ -69,7 +68,7 @@ protected void setUp() throws Exception { System.out.println("Bound server socket to the HTTP port " + port); resourceHandler = new ResourceHandler(); - resourceHandler.setResourceBase(new File(testDir, "proxy").getAbsolutePath()); + resourceHandler.setResourceBase(testDir.resolve("proxy").toAbsolutePath().toString()); handlers = new HandlerList(); handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()}); @@ -103,7 +102,7 @@ protected void tearDown() throws Exception { */ @Test public void testit() throws Exception { - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Map properties = verifier.newDefaultFilterMap(); properties.put("@host@", InetAddress.getLoopbackAddress().getCanonicalHostName()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java index bd9c9ac72fd3..9424ef602c95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng2432PluginPrefixOrderTest extends AbstractMavenIntegratio */ @Test public void testitMNG2432() throws Exception { - File testDir = extractResources("/mng-2432"); + Path testDir = extractResources("mng-2432"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2432.pom"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java index 007d3ed4b011..546a6b93e972 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,11 +41,11 @@ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2486"); + Path testDir = extractResources("mng-2486"); Verifier verifier; - verifier = newVerifier(new File(testDir, "dep-a").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("dep-a")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2486"); @@ -53,21 +53,21 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("parent")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "dep-b").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("dep-b")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); // enforce remote resolution diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java index e9702a4dfba4..85110a75cb41 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; @@ -37,9 +37,9 @@ public class MavenITmng2562Timestamp322Test extends AbstractMavenIntegrationTest @Test public void testitDefaultFormat() throws Exception { - File testDir = extractResources("/mng-2562/default"); + Path testDir = extractResources("mng-2562/default"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -61,9 +61,9 @@ public void testitDefaultFormat() throws Exception { @Test public void testitCustomFormat() throws Exception { - File testDir = extractResources("/mng-2562/custom"); + Path testDir = extractResources("mng-2562/custom"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -81,9 +81,9 @@ public void testitCustomFormat() throws Exception { @Test public void testitSameValueAcrossModules() throws Exception { - File testDir = extractResources("/mng-2562/reactor"); + Path testDir = extractResources("mng-2562/reactor"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("child-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java index f7ac12d3fef4..606c941a365b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ private void clean(Verifier verifier) throws Exception { */ @Test public void testitMakeOnlyList() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -70,9 +70,9 @@ public void testitMakeOnlyList() throws Exception { */ @Test public void testitMakeUpstream() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -97,9 +97,9 @@ public void testitMakeUpstream() throws Exception { */ @Test public void testitMakeDownstream() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -124,9 +124,9 @@ public void testitMakeDownstream() throws Exception { */ @Test public void testitMakeBoth() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -152,9 +152,9 @@ public void testitMakeBoth() throws Exception { */ @Test public void testitMatchesByBasedir() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.verifyFileNotPresent("sub-d/pom.xml"); @@ -182,9 +182,9 @@ public void testitMatchesByBasedirPlus() throws Exception { // as per MNG-5230 // requiresMavenVersion("[3.2,)"); - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.verifyFileNotPresent("sub-d/pom.xml"); @@ -208,9 +208,9 @@ public void testitMatchesByBasedirPlus() throws Exception { */ @Test public void testitMatchesById() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -237,9 +237,9 @@ public void testitMatchesByArtifactId() throws Exception { // as per MNG-4244 // requiresMavenVersion("[3.0-alpha-3,)"); - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -263,9 +263,9 @@ public void testitMatchesByArtifactId() throws Exception { */ @Test public void testitResumeFrom() throws Exception { - File testDir = extractResources("/mng-2576"); + Path testDir = extractResources("mng-2576"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-rf"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java index cfd1b4260ad9..ef274e28dda6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -19,8 +19,8 @@ package org.apache.maven.it; import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -39,9 +39,9 @@ public class MavenITmng2577SettingsXmlInterpolationTest extends AbstractMavenInt */ @Test public void testitEnvVars() throws Exception { - File testDir = extractResources("/mng-2577"); + Path testDir = extractResources("mng-2577"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); @@ -65,9 +65,9 @@ public void testitEnvVars() throws Exception { public void testitSystemProps() throws Exception { // requiresMavenVersion("[3.0-alpha-1,)"); - File testDir = extractResources("/mng-2577"); + Path testDir = extractResources("mng-2577"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java index 040d53a55af4..2401667e09c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -56,8 +56,8 @@ public void testitWithProfile() throws Exception { } private void testit(String project) throws Exception { - File testDir = extractResources("/mng-2591/" + project); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2591/" + project); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("subproject/target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java index bcf8d6d1308d..e9355faf8880 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng2605BogusProfileActivationTest extends AbstractMavenInteg */ @Test public void testitMNG2605() throws Exception { - File testDir = extractResources("/mng-2605"); + Path testDir = extractResources("mng-2605"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index b34c9c81d92b..6b00fcf89ef7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,9 +31,9 @@ public class MavenITmng2668UsePluginDependenciesForSortingTest extends AbstractM @Test public void testitMNG2668() throws Exception { - File testDir = extractResources("/mng-2668"); + Path testDir = extractResources("mng-2668"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2668"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java index 48e5d9ebf35f..85a6e99afe79 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.List; import java.util.regex.Pattern; @@ -44,16 +44,16 @@ class MavenITmng2690MojoLoadingErrorsTest extends AbstractMavenIntegrationTestCa @Test public void testNoClassDefFromMojoLoad() throws IOException, VerificationException { - File testDir = extractResources("/mng-2690/noclassdef-mojo"); + Path testDir = extractResources("mng-2690/noclassdef-mojo"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution."); - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, "(?i).*required class is missing.*"); assertTrue(msg >= 0, "User-friendly message was not found in output."); @@ -64,36 +64,36 @@ public void testNoClassDefFromMojoLoad() throws IOException, VerificationExcepti @Test public void testNoClassDefFromMojoConfiguration() throws IOException, VerificationException { - File testDir = extractResources("/mng-2690/noclassdef-param"); + Path testDir = extractResources("mng-2690/noclassdef-param"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution."); - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, "(?i).*required class (i|wa)s missing( during (mojo )?configuration)?.*"); assertTrue(msg >= 0, "User-friendly message was not found in output."); - int cls = lines.get(msg).toString().replace('/', '.').indexOf("junit.framework.TestCase"); + int cls = lines.get(msg).replace('/', '.').indexOf("junit.framework.TestCase"); assertTrue(cls >= 0, "Missing class name was not found in output."); } @Test public void testMojoComponentLookupException() throws IOException, VerificationException { - File testDir = extractResources("/mng-2690/mojo-complookup"); + Path testDir = extractResources("mng-2690/mojo-complookup"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution."); - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); String compLookupMsg = "(?i).*unable to .* mojo 'mojo-component-lookup-exception' .* plugin " + "'org\\.apache\\.maven\\.its\\.plugins:maven-it-plugin-error.*"; @@ -103,16 +103,16 @@ public void testMojoComponentLookupException() throws IOException, VerificationE @Test public void testMojoRequirementComponentLookupException() throws IOException, VerificationException { - File testDir = extractResources("/mng-2690/requirement-complookup"); + Path testDir = extractResources("mng-2690/requirement-complookup"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution."); - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); String compLookupMsg = "(?i).*unable to .* mojo 'requirement-component-lookup-exception' .* plugin " + "'org\\.apache\\.maven\\.its\\.plugins:maven-it-plugin-error.*"; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java index a51335ec8fdb..78dc5ee71ed3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,8 +40,8 @@ public class MavenITmng2693SitePluginRealmTest extends AbstractMavenIntegrationT */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2693"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2693"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("pre-site"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index 8b78fbaeb2fc..585dc6afdf9c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,11 +39,11 @@ public class MavenITmng2695OfflinePluginSnapshotsTest extends AbstractMavenInteg */ @Test public void testitMNG2695() throws Exception { - File testDir = extractResources("/mng-2695"); + Path testDir = extractResources("mng-2695"); Verifier verifier; // phase 1: run build in online mode to fill local repo - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2695"); verifier.setAutoclean(false); @@ -58,7 +58,7 @@ public void testitMNG2695() throws Exception { verifier.verifyErrorFreeLog(); // phase 2: run build in offline mode to check it still passes - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.setAutoclean(false); verifier.setLogFileName("log2.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java index 7b91ee322f0c..c49772d982e4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ public class MavenITmng2720SiblingClasspathArtifactsTest extends AbstractMavenIn @Test public void testIT() throws Exception { - File testDir = extractResources("/mng-2720"); + Path testDir = extractResources("mng-2720"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("child2/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java index 9d54e61631e8..42541d11545d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2738"); + Path testDir = extractResources("mng-2738"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pe"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java index c5fa5804b0d1..fdf6f5995d8a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -38,23 +38,23 @@ public class MavenITmng2739RequiredRepositoryElementsTest extends AbstractMavenI @Test public void testitMNG2739RepositoryId() throws Exception { - File testDir = extractResources("/mng-2739/repo-id"); + Path testDir = extractResources("mng-2739/repo-id"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); verifier.execute(); - fail("POM should NOT validate: repository element is missing in: " + new File(testDir, "pom.xml")); + fail("POM should NOT validate: repository element is missing in: " + testDir.resolve("pom.xml")); } catch (VerificationException e) { // expected } - List listing = verifier.loadFile(new File(testDir, "log.txt"), false); + List listing = verifier.loadFile(testDir.resolve("log.txt")); boolean foundNpe = false; for (String line : listing) { if (line.contains("NullPointerException")) { @@ -70,23 +70,23 @@ public void testitMNG2739RepositoryId() throws Exception { public void testitMNG2739RepositoryUrl() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-2739/repo-url"); + Path testDir = extractResources("mng-2739/repo-url"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); verifier.execute(); - fail("POM should NOT validate: repository element is missing in: " + new File(testDir, "pom.xml")); + fail("POM should NOT validate: repository element is missing in: " + testDir.resolve("pom.xml")); } catch (VerificationException e) { // expected } - List listing = verifier.loadFile(new File(testDir, "log.txt"), false); + List listing = verifier.loadFile(testDir.resolve("log.txt")); boolean foundNpe = false; for (String line : listing) { if (line.contains("NullPointerException")) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java index 9269ed05484a..4bb0aa9560a2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -53,9 +53,9 @@ public void testitVersion() throws Exception { } private void testit(String test, String goal) throws Exception { - File testDir = extractResources("/mng-2741"); + Path testDir = extractResources("mng-2741"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-" + test + ".txt"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java index 5b49a87396cb..a1620ded6787 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng2744checksumVerificationTest extends AbstractMavenIntegra */ @Test public void testitMNG2744() throws Exception { - File testDir = extractResources("/mng-2744"); + Path testDir = extractResources("mng-2744"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2744"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java index 08ffac899d30..064c1edf45e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,8 +41,8 @@ public class MavenITmng2749ExtensionAvailableToPluginTest extends AbstractMavenI */ @Test public void testitMNG2749() throws Exception { - File testDir = extractResources("/mng-2749"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2749"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2749"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java index 52e0215eff28..179166481ff0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -39,20 +39,20 @@ public class MavenITmng2771PomExtensionComponentOverrideTest extends AbstractMav */ @Test public void testitMNG2771() throws Exception { - File testDir = extractResources("/mng-2771/extension"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2771/extension"); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - testDir = extractResources("/mng-2771/plugin"); - verifier = newVerifier(testDir.getAbsolutePath()); + testDir = extractResources("mng-2771/plugin"); + verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - testDir = extractResources("/mng-2771/project"); - verifier = newVerifier(testDir.getAbsolutePath()); + testDir = extractResources("mng-2771/project"); + verifier = newVerifier(testDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java index 750d7014c0bd..380bf3bde0bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java @@ -18,12 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,24 +42,24 @@ public class MavenITmng2790LastUpdatedMetadataTest extends AbstractMavenIntegrat */ @Test public void testitMNG2790() throws Exception { - File testDir = extractResources("/mng-2790"); + Path testDir = extractResources("mng-2790"); Date now = new Date(); /* * Phase 1: Install initial snapshot into local repo. */ - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng2790"); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - File metadataArtifactVersionFile = - new File(verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT")); - File metadataArtifactFile = - new File(verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project")); + Path metadataArtifactVersionFile = + verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT"); + Path metadataArtifactFile = + verifier.getArtifactMetadataPath("org.apache.maven.its.mng2790", "project"); Date artifactVersionLastUpdated1 = getLastUpdated(metadataArtifactVersionFile); Date artifactLastUpdated1 = getLastUpdated(metadataArtifactFile); @@ -79,7 +78,7 @@ public void testitMNG2790() throws Exception { /* * Phase 2: Re-install snapshot and check for proper timestamp update in local metadata. */ - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); @@ -96,8 +95,8 @@ public void testitMNG2790() throws Exception { artifactLastUpdated2.after(artifactLastUpdated1), artifactLastUpdated1 + " < " + artifactLastUpdated2); } - private Date getLastUpdated(File metadataFile) throws Exception { - String xml = Files.readString(metadataFile.toPath()); + private Date getLastUpdated(Path metadataFile) throws Exception { + String xml = Files.readString(metadataFile); String timestamp = xml.replaceAll("(?s)\\A.*\\s*([0-9]++)\\s*.*\\z", "$1"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); format.setTimeZone(TimeZone.getTimeZone("UTC")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index 3a106ea86582..748051d7318c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -39,9 +38,9 @@ public class MavenITmng2820PomCommentsTest extends AbstractMavenIntegrationTestC */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2820"); + Path testDir = extractResources("mng-2820"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng2820"); @@ -49,15 +48,15 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File installed = new File(verifier.getArtifactPath("org.apache.maven.its.mng2820", "test", "0.1", "pom")); + Path installed = verifier.getArtifactPath("org.apache.maven.its.mng2820", "test", "0.1", "pom"); assertPomComments(installed); - File deployed = new File(testDir, "target/repo/org/apache/maven/its/mng2820/test/0.1/test-0.1.pom"); + Path deployed = testDir.resolve("target/repo/org/apache/maven/its/mng2820/test/0.1/test-0.1.pom"); assertPomComments(deployed); } - private void assertPomComments(File pomFile) throws Exception { - String pom = Files.readString(pomFile.toPath()); + private void assertPomComments(Path pomFile) throws Exception { + String pom = Files.readString(pomFile); assertPomComment(pom, "DOCUMENT-COMMENT-PRE-1"); assertPomComment(pom, "DOCUMENT-COMMENT-PRE-2"); assertPomComment(pom, "DOCUMENT-COMMENT-POST-1"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java index 08465c98981e..a166640669ad 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest extends A */ @Test public void testitMNG2831() throws Exception { - File testDir = extractResources("/mng-2831"); + Path testDir = extractResources("mng-2831"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("package"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java index 85e3d513eba7..2590a2fc8320 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,10 +40,10 @@ public class MavenITmng2843PluginConfigPropertiesInjectionTest extends AbstractM */ @Test public void testitMNG2843() throws Exception { - File testDir = extractResources("/mng-2843"); + Path testDir = extractResources("mng-2843"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-uses-properties").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-uses-properties")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -51,7 +51,7 @@ public void testitMNG2843() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java index 92eaa9cbf48c..df7e39b8988a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng2848ProfileActivationByEnvironmentVariableTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2848"); + Path testDir = extractResources("mng-2848"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setEnvironmentVariable("MNG2848", "GO"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index 9f29b82f65d8..6322416ab6ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ public class MavenITmng2861RelocationsAndRangesTest extends AbstractMavenIntegra @Test public void testitMNG2861() throws Exception { - File testDir = extractResources("/mng-2861"); + Path testDir = extractResources("mng-2861"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("A/target"); verifier.deleteArtifacts("org.apache.maven.its.mng2861"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java index 4ba91391db71..5851db3f54c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -71,9 +71,9 @@ public void testitCentralRepo() throws Exception { } private void testit(String project) throws Exception { - File testDir = extractResources("/mng-2865"); + Path testDir = extractResources("mng-2865"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng2865"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java index 8acb3710e368..16c59534d0fa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,8 +40,8 @@ public class MavenITmng2871PrePackageSubartifactResolutionTest extends AbstractM */ @Test public void testitMNG2871() throws Exception { - File testDir = extractResources("/mng-2871"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2871"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.addCliArgument("compile"); @@ -51,8 +50,8 @@ public void testitMNG2871() throws Exception { List compileClassPath = verifier.loadLines("consumer/target/compile.txt"); assertEquals(2, compileClassPath.size()); - assertEquals( - new File(testDir, "ejbs/target/classes").getCanonicalFile(), - new File(compileClassPath.get(1).toString()).getCanonicalFile()); + ItUtils.assertCanonicalFileEquals( + testDir.resolve("ejbs/target/classes"), + Path.of(compileClassPath.get(1))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java index 2edaca1c3716..438ba31a171b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,8 +41,8 @@ public class MavenITmng2892HideCorePlexusUtilsTest extends AbstractMavenIntegrat */ @Test public void testitMNG2892() throws Exception { - File testDir = extractResources("/mng-2892"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2892"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java index d102b3ba412e..862978fb4811 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import org.junit.jupiter.api.Test; @@ -48,8 +48,8 @@ public class MavenITmng2921ActiveAttachedArtifactsTest extends AbstractMavenInte */ @Test public void testitMNG2921() throws Exception { - File testDir = extractResources("/mng-2921"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2921"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java index 0ad36d9f51b2..d79efccef4d4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -38,27 +38,23 @@ public class MavenITmng2926PluginPrefixOrderTest extends AbstractMavenIntegratio */ @Test public void testitMNG2926() throws Exception { - File testDir = extractResources("/mng-2926"); + Path testDir = extractResources("mng-2926"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng2926"); verifier.deleteArtifacts("org.apache.maven.plugins", "mng-2926", "0.1"); verifier.deleteArtifacts("org.apache.maven.plugins", "mng-2926", "0.1"); - new File(verifier.getArtifactMetadataPath( - "org.apache.maven.plugins", null, null, "maven-metadata-maven-core-it.xml")) - .delete(); - new File(verifier.getArtifactMetadataPath("org.apache.maven.plugins", null, null, "resolver-status.properties")) - .delete(); + Files.deleteIfExists(verifier.getArtifactMetadataPath( + "org.apache.maven.plugins", null, null, "maven-metadata-maven-core-it.xml")); + Files.deleteIfExists(verifier.getArtifactMetadataPath("org.apache.maven.plugins", null, null, "resolver-status.properties")); verifier.deleteArtifacts("org.codehaus.mojo", "mng-2926", "0.1"); verifier.deleteArtifacts("org.codehaus.mojo", "mng-2926", "0.1"); - new File(verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "maven-metadata-maven-core-it.xml")) - .delete(); - new File(verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "resolver-status.properties")) - .delete(); + Files.deleteIfExists(verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "maven-metadata-maven-core-it.xml")); + Files.deleteIfExists(verifier.getArtifactMetadataPath("org.codehaus.mojo", null, null, "resolver-status.properties")); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-default.txt"); verifier.filterFile("settings-default-template.xml", "settings-default.xml"); @@ -68,7 +64,7 @@ public void testitMNG2926() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-custom.txt"); verifier.filterFile("settings-custom-template.xml", "settings-custom.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java index 22cf74ef9180..f20fe2dd1b56 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,8 +42,8 @@ public class MavenITmng2972OverridePluginDependencyTest extends AbstractMavenInt */ @Test public void testitLifecycleInvocation() throws Exception { - File testDir = extractResources("/mng-2972/test1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2972/test1"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("org.apache.maven.its.plugins.class-loader", "dep-b", "0.2-mng-2972", "jar"); @@ -72,8 +72,8 @@ public void testitLifecycleInvocation() throws Exception { */ @Test public void testitCommandLineInvocation() throws Exception { - File testDir = extractResources("/mng-2972/test2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2972/test2"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("org.apache.maven.its.plugins.class-loader", "dep-b", "9.9-MNG-2972", "jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index 0a9f1c5ff420..200e6c821ff9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,8 +37,8 @@ public class MavenITmng2994SnapshotRangeRepositoryTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-2994"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-2994"); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng2994"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java index ae7e2cfb5db3..ee7f63d91b4f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest extends Abstr */ @Test public void testitFailFastSingleThread() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); @@ -72,9 +72,9 @@ public void testitFailFastSingleThread() throws Exception { */ @Test public void testitFailNeverSingleThread() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); @@ -101,9 +101,9 @@ public void testitFailNeverSingleThread() throws Exception { */ @Test public void testitFailAtEndSingleThread() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); @@ -134,9 +134,9 @@ public void testitFailAtEndSingleThread() throws Exception { */ @Test public void testitFailNeverTwoThreads() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); @@ -163,9 +163,9 @@ public void testitFailNeverTwoThreads() throws Exception { */ @Test public void testitFailAtEndTwoThreads() throws Exception { - File testDir = extractResources("/mng-0095"); + Path testDir = extractResources("mng-0095"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("subproject1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index ec6c227e219b..baade5d833ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,8 +41,8 @@ public class MavenITmng3012CoreClassImportTest extends AbstractMavenIntegrationT */ @Test public void testitMNG3012() throws Exception { - File testDir = extractResources("/mng-3012"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-3012"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index 059ea8a6043a..65803b0cf71f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -49,10 +49,10 @@ public class MavenITmng3023ReactorDependencyResolutionTest extends AbstractMaven */ @Test public void testitMNG3023A() throws Exception { - File testDir = extractResources("/mng-3023"); + Path testDir = extractResources("mng-3023"); // First pass. Make sure the dependency cannot be resolved. - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-a.txt"); @@ -78,13 +78,13 @@ public void testitMNG3023A() throws Exception { */ @Test public void testitMNG3023B() throws Exception { - File testDir = extractResources("/mng-3023"); + Path testDir = extractResources("mng-3023"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-b.txt"); // The IT doesn't actually run the compiler but merely mimics its effect, i.e. the creation of the output dir - new File(testDir, "dependency/dependency-classes").mkdirs(); + Files.createDirectories(testDir.resolve("dependency/dependency-classes")); verifier.deleteDirectory("consumer/target"); verifier.deleteArtifacts("org.apache.maven.its.mng3023"); @@ -113,9 +113,9 @@ public void testitMNG3023B() throws Exception { */ @Test public void testitMNG3023C() throws Exception { - File testDir = extractResources("/mng-3023"); + Path testDir = extractResources("mng-3023"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3023"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java index f3461fab5f29..03c4b4263c85 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -35,14 +34,14 @@ public class MavenITmng3038TransitiveDepManVersionTest extends AbstractMavenInte @Test public void testitMNG3038() throws Exception { - File testDirBase = extractResources("/mng-3038"); + Path testDirBase = extractResources("mng-3038"); compileDDep(testDirBase, "D1", "1.0"); compileDDep(testDirBase, "D2", "2.0"); - File testProjectDir = new File(testDirBase, "test-project"); + Path testProjectDir = testDirBase.resolve("test-project"); - Verifier verifier = newVerifier(testProjectDir.getAbsolutePath()); + Verifier verifier = newVerifier(testProjectDir); verifier.deleteArtifact("org.apache.maven.its.it0121", "A", "1.0", "pom"); verifier.deleteArtifact("org.apache.maven.its.it0121", "A", "1.0", "jar"); verifier.deleteArtifact("org.apache.maven.its.it0121", "B", "1.0", "pom"); @@ -54,10 +53,10 @@ public void testitMNG3038() throws Exception { verifier.verifyErrorFreeLog(); } - private void compileDDep(File testDirBase, String projectDDepDir, String version) + private void compileDDep(Path testDirBase, String projectDDepDir, String version) throws VerificationException, IOException { - File testOtherDepDir = new File(testDirBase, "test-other-deps/" + projectDDepDir); - Verifier verifierOtherDep = newVerifier(testOtherDepDir.getAbsolutePath()); + Path testOtherDepDir = testDirBase.resolve("test-other-deps/" + projectDDepDir); + Verifier verifierOtherDep = newVerifier(testOtherDepDir); verifierOtherDep.deleteArtifact("org.apache.maven.its.it0121", "D", version, "jar"); verifierOtherDep.deleteArtifact("org.apache.maven.its.it0121", "D", version, "pom"); verifierOtherDep.addCliArgument("install"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index 89fafabcc948..90d5202b8c8e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -43,10 +42,10 @@ public class MavenITmng3043BestEffortReactorResolutionTest extends AbstractMaven */ @Test public void testitTestPhase() throws Exception { - File testDir = extractResources("/mng-3043"); - Files.createDirectories(testDir.toPath().resolve(".mvn")); + Path testDir = extractResources("mng-3043"); + Files.createDirectories(testDir.resolve(".mvn")); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("consumer-a/target"); @@ -100,9 +99,9 @@ public void testitTestPhase() throws Exception { */ @Test public void testitPackagePhase() throws Exception { - File testDir = extractResources("/mng-3043"); + Path testDir = extractResources("mng-3043"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("consumer-a/target"); @@ -160,9 +159,9 @@ public void testitPackagePhase() throws Exception { public void testitPackagePhasesSlitted() throws Exception { // requiresMavenVersion("[4.0.0-beta-4,)"); - File testDir = extractResources("/mng-3043"); + Path testDir = extractResources("mng-3043"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("consumer-a/target"); @@ -174,7 +173,7 @@ public void testitPackagePhasesSlitted() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-package-pre.txt"); verifier.addCliArguments("--projects", ":consumer-a,:consumer-b,:consumer-c", "package"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index 46a6da3e349a..d2f87c6a3c48 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -42,9 +41,9 @@ public class MavenITmng3052DepRepoAggregationTest extends AbstractMavenIntegrati @Test public void testitMNG3052() throws Exception { - File testDir = extractResources("/mng-3052").getCanonicalFile(); + Path testDir = extractResources("mng-3052"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3052"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java index 22c1ec0a4d73..f9a56c5ec24c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Disabled; @@ -43,9 +43,9 @@ public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3092"); + Path testDir = extractResources("mng-3092"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3092"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java index dc92fd0bf959..49281cf87b85 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3099SettingsProfilesWithNoPomTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3099"); + Path testDir = extractResources("mng-3099"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3099"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java index 0422985e7ee3..243de5950125 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng3118TestClassPathOrderTest extends AbstractMavenIntegrati */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3118"); + Path testDir = extractResources("mng-3118"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java index fc1355388f76..098dd7a37812 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3122ActiveProfilesNoDuplicatesTest extends AbstractMavenI */ @Test public void testitMNG3122() throws Exception { - File testDir = extractResources("/mng-3122"); + Path testDir = extractResources("mng-3122"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java index 386655567776..ac4a8f1b5689 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3133UrlNormalizationNotBeforeInterpolationTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3133"); + Path testDir = extractResources("mng-3133"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java index eef02a5a049a..2947e723e873 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collections; import org.junit.jupiter.api.Test; @@ -38,11 +38,11 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest extends Abstra */ @Test public void testitMNG3139() throws Exception { - File testDir = extractResources("/mng-3139"); + Path testDir = extractResources("mng-3139"); // phase 1: get the metadata into the local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3139"); @@ -56,7 +56,7 @@ public void testitMNG3139() throws Exception { // phase 2: trigger blacklisting of repo (by invalid URL) and check previously downloaded metadata is still used - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.filterFile( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java index 342d6e6734e7..d80e127af8eb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -18,11 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Collections; import java.util.Iterator; import java.util.List; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ * @author Benjamin Bentmann */ @Disabled( - "This IT is testing -l, while new Verifier uses same switch to make Maven4 log to file; in short, if that is broken, all ITs would be broken as well") + "This IT is testing -l, while newVerifier uses same switch to make Maven4 log to file; in short, if that is broken, all ITs would be broken as well") public class MavenITmng3183LoggingToFileTest extends AbstractMavenIntegrationTestCase { /** @@ -45,15 +45,15 @@ public class MavenITmng3183LoggingToFileTest extends AbstractMavenIntegrationTes */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3183"); + Path testDir = extractResources("mng-3183"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-l"); verifier.addCliArgument("maven.log"); verifier.setLogFileName("stdout.txt"); - new File(testDir, "stdout.txt").delete(); - new File(testDir, "maven.log").delete(); + Files.deleteIfExists(testDir.resolve("stdout.txt")); + Files.deleteIfExists(testDir.resolve("maven.log")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java index 7ed4cae9450e..f00c34549e5f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng3203DefaultLifecycleExecIdTest extends AbstractMavenInteg public void testitMNG3203() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3203"); + Path testDir = extractResources("mng-3203"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("compile"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java index 59749230a5de..b42bcbc4324a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng3208ProfileAwareReactorSortingTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3208"); + Path testDir = extractResources("mng-3208"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pmng3208"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java index f01f6ab75e28..a521abc01ac1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3217InterPluginDependencyTest extends AbstractMavenIntegr */ @Test public void testitMNG3217() throws Exception { - File testDir = extractResources("/mng-3217"); + Path testDir = extractResources("mng-3217"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("sub-1/target"); verifier.deleteDirectory("sub-2/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java index 5ff459f9bb88..266f9ebc828e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -34,11 +34,11 @@ public class MavenITmng3220ImportScopeTest extends AbstractMavenIntegrationTestC @Test public void testitMNG3220a() throws Exception { - File testDir = extractResources("/mng-3220"); + Path testDir = extractResources("mng-3220"); - testDir = new File(testDir, "imported-pom-depMgmt"); + testDir = testDir.resolve("imported-pom-depMgmt"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3220"); @@ -52,11 +52,11 @@ public void testitMNG3220a() throws Exception { @Test public void testitMNG3220b() throws Exception { - File testDir = extractResources("/mng-3220"); + Path testDir = extractResources("mng-3220"); - testDir = new File(testDir, "depMgmt-pom-module-notImported"); + testDir = testDir.resolve("depMgmt-pom-module-notImported"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3220"); @@ -73,7 +73,7 @@ public void testitMNG3220b() throws Exception { // expected } - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); boolean found = false; for (String line : lines) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java index 75422bc4242a..72bfef4762bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,18 +36,18 @@ public class MavenITmng3259DepsDroppedInMultiModuleBuildTest extends AbstractMav @Test public void testitMNG3259() throws Exception { - File testDir = extractResources("/mng-3259"); + Path testDir = extractResources("mng-3259"); Verifier verifier; - verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("parent")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java index 6bab98fae08e..847cd5ed72da 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,11 +31,11 @@ public class MavenITmng3268MultipleHyphenPCommandLineTest extends AbstractMavenI @Test public void testMultipleProfileParams() throws Exception { - File testDir = extractResources("/mng-3268"); + Path testDir = extractResources("mng-3268"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-Pprofile1,profile2"); verifier.addCliArgument("-Pprofile3"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java index 97e72dd4b3ba..de12724df050 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ public class MavenITmng3284UsingCachedPluginsTest extends AbstractMavenIntegrati */ @Test public void testitMNG3284() throws Exception { - File testDir = extractResources("/mng-3284"); + Path testDir = extractResources("mng-3284"); /* * Phase 1: Ensure both plugin versions are already in the local repo. This is a crucial prerequisite for the @@ -44,7 +44,7 @@ public void testitMNG3284() throws Exception { * reloading of the plugin container by the DefaultPluginManager in Maven 2.x, thereby hiding the bug we want * to expose here. */ - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3284"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -57,7 +57,7 @@ public void testitMNG3284() throws Exception { /* * Phase 2: Now that the plugin versions have been downloaded to the local repo, run the actual test. */ - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("mod-a/target"); verifier.deleteDirectory("mod-b/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java index 5f35b62a3449..4e1f93492db9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3288SystemScopeDirTest extends AbstractMavenIntegrationTe */ @Test public void testitMNG3288() throws Exception { - File testDir = extractResources("/mng-3288"); + Path testDir = extractResources("mng-3288"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); assertThrows( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java index dc318d94afa7..670b449e1fad 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Properties; @@ -41,9 +41,9 @@ public class MavenITmng3297DependenciesNotLeakedToMojoTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3297"); + Path testDir = extractResources("mng-3297"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index e361757f3cde..e8c87b568190 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,10 +39,10 @@ public class MavenITmng3314OfflineSnapshotsTest extends AbstractMavenIntegration */ @Test public void testitMNG3314() throws Exception { - File testDir = extractResources("/mng-3314"); + Path testDir = extractResources("mng-3314"); // phase 1: run build in online mode to fill local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng3314"); verifier.setLogFileName("log1.txt"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -54,7 +54,7 @@ public void testitMNG3314() throws Exception { verifier.verifyErrorFreeLog(); // phase 2: run build in offline mode to check it still passes - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setLogFileName("log2.txt"); verifier.addCliArgument("-o"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java index 5ca73b9e7910..eec1986c39b4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,11 +33,11 @@ public class MavenITmng3331ModulePathNormalizationTest extends AbstractMavenInte @Test public void testitMNG3331a() throws Exception { // testMNG3331ModuleWithSpaces - File testDir = extractResources("/mng-3331/with-spaces"); + Path testDir = extractResources("mng-3331/with-spaces"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("initialize"); verifier.execute(); @@ -57,11 +57,11 @@ public void testitMNG3331a() throws Exception { @Test public void testitMNG3331b() throws Exception { // testMNG3331ModuleWithRelativeParentDirRef - File testDir = extractResources("/mng-3331/with-relative-parentDir-ref"); + Path testDir = extractResources("mng-3331/with-relative-parentDir-ref"); Verifier verifier; - verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("parent")); verifier.addCliArgument("initialize"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java index cdab4746cfb9..0d78276bd71b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,11 +33,11 @@ public class MavenITmng3355TranslatedPathInterpolationTest extends AbstractMaven @Test public void testitMNG3355() throws Exception { - File testDir = extractResources("/mng-3355"); + Path testDir = extractResources("mng-3355"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-Dversion=foo"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java index 456370e34461..686e257d47b2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -33,12 +32,12 @@ public class MavenITmng3372DirectInvocationOfPluginsTest extends AbstractMavenIn public void testitMNG3372() throws Exception { // The testdir is computed from the location of this // file. - File testBaseDir = extractResources("/mng-3372/direct-using-prefix"); - File plugin = new File(testBaseDir, "plugin"); - File project = new File(testBaseDir, "project"); - File settingsFile = new File(testBaseDir, "settings.xml"); + Path testBaseDir = extractResources("mng-3372/direct-using-prefix"); + Path plugin = testBaseDir.resolve("plugin"); + Path project = testBaseDir.resolve("project"); + Path settingsFile = testBaseDir.resolve("settings.xml"); - Verifier verifier = newVerifier(plugin.getAbsolutePath()); + Verifier verifier = newVerifier(plugin); verifier.deleteArtifacts("org.apache.maven.its.mng3372"); @@ -47,10 +46,10 @@ public void testitMNG3372() throws Exception { verifier.addCliArguments("clean", "install"); verifier.execute(); - verifier = newVerifier(project.getAbsolutePath()); + verifier = newVerifier(project); verifier.addCliArgument("-s"); - verifier.addCliArgument("\"" + settingsFile.getAbsolutePath() + "\""); + verifier.addCliArgument("\"" + settingsFile + "\""); verifier.addCliArgument("mng3372:test"); verifier.execute(); @@ -62,9 +61,9 @@ public void testitMNG3372() throws Exception { public void testDependencyTreeInvocation() throws Exception { // The testdir is computed from the location of this // file. - File testBaseDir = extractResources("/mng-3372/dependency-tree"); + Path testBaseDir = extractResources("mng-3372/dependency-tree"); - Verifier verifier = newVerifier(testBaseDir.getAbsolutePath()); + Verifier verifier = newVerifier(testBaseDir); verifier.addCliArgument("-U"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index 0e497900a576..354b5482f3bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,9 +41,9 @@ public class MavenITmng3379ParallelArtifactDownloadsTest extends AbstractMavenIn */ @Test public void testitMNG3379() throws Exception { - File testDir = extractResources("/mng-3379"); + Path testDir = extractResources("mng-3379"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3379.a"); verifier.deleteArtifacts("org.apache.maven.its.mng3379.b"); @@ -105,20 +105,20 @@ public void testitMNG3379() throws Exception { private void assertArtifact( Verifier verifier, String gid, String aid, String ver, String cls, String ext, String sha1) throws Exception { - File file = new File(verifier.getArtifactPath(gid, aid, ver, ext, cls)); - assertTrue(file.isFile(), file.getAbsolutePath()); + Path file = verifier.getArtifactPath(gid, aid, ver, ext, cls); + assertTrue(Files.isRegularFile(file), file.toString()); assertEquals(sha1, ItUtils.calcHash(file, "SHA-1")); } private void assertMetadata(Verifier verifier, String gid, String aid, String ver, String sha1) throws Exception { - File file = new File(verifier.getArtifactMetadataPath(gid, aid, ver, "maven-metadata.xml", "maven-core-it")); - assertTrue(file.isFile(), file.getAbsolutePath()); + Path file = verifier.getArtifactMetadataPath(gid, aid, ver, "maven-metadata.xml", "maven-core-it"); + assertTrue(Files.isRegularFile(file), file.toString()); assertEquals(sha1, ItUtils.calcHash(file, "SHA-1")); } private void assertMetadata(Verifier verifier, String gid, String aid, String sha1) throws Exception { - File file = new File(verifier.getArtifactMetadataPath(gid, aid, null, "maven-metadata.xml", "maven-core-it")); - assertTrue(file.isFile(), file.getAbsolutePath()); + Path file = verifier.getArtifactMetadataPath(gid, aid, null, "maven-metadata.xml", "maven-core-it"); + assertTrue(Files.isRegularFile(file), file.toString()); assertEquals(sha1, ItUtils.calcHash(file, "SHA-1")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java index 67b1214533ea..15d51b96d27e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -46,9 +46,9 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest extends AbstractMavenIn */ @Test public void testitMNG3380() throws Exception { - File testDir = extractResources("/mng-3380"); + Path testDir = extractResources("mng-3380"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3380"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index 5f3c5e8cfdd3..ed25c71843b1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -34,14 +33,14 @@ */ public class MavenITmng3394POMPluginVersionDominanceTest extends AbstractMavenIntegrationTestCase { - private static final String BASEDIR_PREFIX = "/mng-3394/"; + private static final String PROJECT_PATH = "mng-3394/"; @Test public void testitMNG3394a() throws Exception { // testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins - File testDir = extractResources(BASEDIR_PREFIX + "lifecycleMojoVersionInPluginMgmt"); + Path testDir = extractResources(PROJECT_PATH + "lifecycleMojoVersionInPluginMgmt"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); @@ -54,9 +53,9 @@ public void testitMNG3394a() throws Exception { @Test public void testitMNG3394b() throws Exception { // testShouldPreferPluginVersionFromBuildPluginsOverThatInPluginMgmt - File testDir = extractResources(BASEDIR_PREFIX + "preferBuildPluginOverPluginMgmt"); + Path testDir = extractResources(PROJECT_PATH + "preferBuildPluginOverPluginMgmt"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java index 6f617c5630aa..3d62be758c9f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -34,10 +33,10 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte @Test public void testitMNG3396() throws Exception { - String baseDir = "/mng-3396"; - File testDir = extractResources(baseDir + "/dependencies"); + String baseDir = "mng-3396"; + Path testDir = extractResources(baseDir + "/dependencies"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom"); verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar"); verifier.deleteArtifact(GROUP_ID, "B", "1.0", "pom"); @@ -48,7 +47,7 @@ public void testitMNG3396() throws Exception { testDir = extractResources(baseDir + "/plugin"); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom"); verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar"); verifier.deleteArtifact(GROUP_ID, "A", "3.0", "pom"); @@ -61,7 +60,7 @@ public void testitMNG3396() throws Exception { testDir = extractResources(baseDir + "/pluginuser"); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "pom"); verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "jar"); verifier.addCliArgument("install"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java index 378b72b57d78..3604f4c59dfe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -56,9 +56,9 @@ public void testitWithPluginManagement() throws Exception { } private void testit(String project) throws Exception { - File testDir = extractResources("/mng-3401/" + project); + Path testDir = extractResources("mng-3401/" + project); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java index df9fb321bf84..ba869846a6e2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java @@ -18,17 +18,15 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.Deque; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; @@ -45,7 +43,7 @@ * @since 2.0.8 */ public class MavenITmng3415JunkRepositoryMetadataTest extends AbstractMavenIntegrationTestCase { - private static final String RESOURCE_BASE = "/mng-3415"; + private static final String RESOURCE_BASE = "mng-3415"; public MavenITmng3415JunkRepositoryMetadataTest() { // we're going to control the test execution according to the maven version present within each test method. @@ -83,11 +81,11 @@ public MavenITmng3415JunkRepositoryMetadataTest() { public void testitTransferFailed() throws Exception { String methodName = getMethodName(); - File testDir = extractResources(RESOURCE_BASE); + Path testDir = extractResources(RESOURCE_BASE); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3415"); @@ -96,11 +94,11 @@ public void testitTransferFailed() throws Exception { Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@protocol@", "invalid"); filterProps.put("@port@", "0"); - File settings = verifier.filterFile("settings-template.xml", "settings-a.xml", filterProps); + Path settings = verifier.filterFile("settings-template.xml", "settings-a.xml", filterProps); verifier.addCliArgument("-X"); verifier.addCliArgument("-s"); - verifier.addCliArgument(settings.getName()); + verifier.addCliArgument(settings.toString()); verifier.setLogFileName("log-" + methodName + "-firstBuild.txt"); verifier.addCliArgument("validate"); @@ -154,11 +152,11 @@ private String getMethodName() { public void testShouldNotRepeatedlyUpdateOnResourceNotFoundException() throws Exception { String methodName = getMethodName(); - File testDir = extractResources(RESOURCE_BASE); + Path testDir = extractResources(RESOURCE_BASE); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3415"); @@ -193,11 +191,11 @@ public void handle( Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@protocol@", "http"); filterProps.put("@port@", Integer.toString(port)); - File settings = verifier.filterFile("settings-template.xml", "settings-b.xml", filterProps); + Path settings = verifier.filterFile("settings-template.xml", "settings-b.xml", filterProps); verifier.addCliArgument("-X"); verifier.addCliArgument("-s"); - verifier.addCliArgument(settings.getName()); + verifier.addCliArgument(settings.toString()); setupDummyDependency(verifier, testDir, true); @@ -213,8 +211,8 @@ public void handle( requestUris.clear(); - File updateCheckFile = getUpdateCheckFile(verifier); - long firstLastMod = updateCheckFile.lastModified(); + Path updateCheckFile = getUpdateCheckFile(verifier); + long firstLastMod = ItUtils.lastModified(updateCheckFile); setupDummyDependency(verifier, testDir, false); @@ -230,7 +228,7 @@ public void handle( assertEquals( firstLastMod, - updateCheckFile.lastModified(), + ItUtils.lastModified(updateCheckFile), "Last-modified time should be unchanged from first build through second build for the file we use for" + " updateInterval checks."); } finally { @@ -240,14 +238,14 @@ public void handle( } private void assertMetadataMissing(Verifier verifier) { - File metadata = getMetadataFile(verifier); + Path metadata = getMetadataFile(verifier); assertFalse( - metadata.exists(), - "Metadata file should NOT be present in local repository: " + metadata.getAbsolutePath()); + Files.exists(metadata), + "Metadata file should NOT be present in local repository: " + metadata); } - private void setupDummyDependency(Verifier verifier, File testDir, boolean resetUpdateInterval) throws IOException { + private void setupDummyDependency(Verifier verifier, Path testDir, boolean resetUpdateInterval) throws IOException { String gid = "org.apache.maven.its.mng3415"; String aid = "missing"; String version = "1.0-SNAPSHOT"; @@ -256,35 +254,35 @@ private void setupDummyDependency(Verifier verifier, File testDir, boolean reset verifier.deleteArtifacts(gid); } - File pom = new File(verifier.getArtifactPath(gid, aid, version, "pom")); + Path pom = verifier.getArtifactPath(gid, aid, version, "pom"); - File pomSrc = new File(testDir, "dependency-pom.xml"); + Path pomSrc = testDir.resolve("dependency-pom.xml"); System.out.println("Copying dependency POM\nfrom: " + pomSrc + "\nto: " + pom); - Files.createDirectories(pom.toPath().getParent()); - Files.copy(pomSrc.toPath(), pom.toPath(), StandardCopyOption.REPLACE_EXISTING); + Files.createDirectories(pom.getParent()); + Files.copy(pomSrc, pom, StandardCopyOption.REPLACE_EXISTING); } - private File getMetadataFile(Verifier verifier) { + private Path getMetadataFile(Verifier verifier) { String gid = "org.apache.maven.its.mng3415"; String aid = "missing"; String version = "1.0-SNAPSHOT"; String name = "maven-metadata-testing-repo.xml"; - return new File(verifier.getArtifactMetadataPath(gid, aid, version, name)); + return verifier.getArtifactMetadataPath(gid, aid, version, name); } /** * If the current maven version is < 3.0, we'll use the metadata file itself (old maven-artifact code)... * otherwise, use the new resolver-status.properties file (new artifact code). */ - private File getUpdateCheckFile(Verifier verifier) { + private Path getUpdateCheckFile(Verifier verifier) { String gid = "org.apache.maven.its.mng3415"; String aid = "missing"; String version = "1.0-SNAPSHOT"; // < 3.0 (including snapshots) String name = "resolver-status.properties"; - return new File(verifier.getArtifactMetadataPath(gid, aid, version, name)); + return verifier.getArtifactMetadataPath(gid, aid, version, name); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java index d4c976c3da2d..d1ddb01a3a36 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3422ActiveComponentCollectionTest extends AbstractMavenIn */ @Test public void testitMNG3422() throws Exception { - File testDir = extractResources("/mng-3422"); + Path testDir = extractResources("mng-3422"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java index e135d445c38d..bb06c16bd961 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; -import java.io.FileReader; import java.io.IOException; - -import org.codehaus.plexus.util.FileUtils; +import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -39,15 +38,15 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest extends A @Test public void testitMNG3441() throws Exception { - File testDir = extractResources("/mng-3441"); + Path testDir = extractResources("mng-3441"); - File targetRepository = new File(testDir, "target-repo"); - FileUtils.deleteDirectory(targetRepository); - FileUtils.copyDirectoryStructure(new File(testDir, "deploy-repo"), targetRepository); + Path targetRepository = testDir.resolve("target-repo"); + ItUtils.deleteDirectory(targetRepository); + ItUtils.copyDirectoryStructure(testDir.resolve("deploy-repo"), targetRepository); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); @@ -56,8 +55,8 @@ public void testitMNG3441() throws Exception { verifier.verifyErrorFreeLog(); - Xpp3Dom dom = readDom(new File( - targetRepository, "org/apache/maven/its/mng3441/test-artifact/1.0-SNAPSHOT/maven-metadata.xml")); + Xpp3Dom dom = readDom( + targetRepository.resolve("org/apache/maven/its/mng3441/test-artifact/1.0-SNAPSHOT/maven-metadata.xml")); assertEquals( "2", dom.getChild("versioning") @@ -65,14 +64,14 @@ public void testitMNG3441() throws Exception { .getChild("buildNumber") .getValue()); - dom = readDom(new File(targetRepository, "org/apache/maven/its/mng3441/maven-metadata.xml")); + dom = readDom(targetRepository.resolve("org/apache/maven/its/mng3441/maven-metadata.xml")); Xpp3Dom[] plugins = dom.getChild("plugins").getChildren(); assertEquals("other-plugin", plugins[0].getChild("prefix").getValue()); assertEquals("test-artifact", plugins[1].getChild("prefix").getValue()); } - private Xpp3Dom readDom(File file) throws XmlPullParserException, IOException { - try (FileReader reader = new FileReader(file)) { + private Xpp3Dom readDom(Path file) throws XmlPullParserException, IOException { + try (Reader reader = Files.newBufferedReader(file)) { return Xpp3DomBuilder.build(reader); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java index 82a1e6bd5e19..bca0022bb202 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.Map; @@ -48,9 +48,9 @@ public class MavenITmng3461MirrorMatchingTest extends AbstractMavenIntegrationTe */ @Test public void testitExactMatchDominatesWildcard() throws Exception { - File testDir = extractResources("/mng-3461/test-1"); + Path testDir = extractResources("mng-3461/test-1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3461"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -71,9 +71,9 @@ public void testitExactMatchDominatesWildcard() throws Exception { */ @Test public void testitExternalWildcard() throws Exception { - File testDir = extractResources("/mng-3461/test-2"); + Path testDir = extractResources("mng-3461/test-2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Handler repoHandler = new AbstractHandler() { @Override @@ -141,9 +141,9 @@ public void handle( */ @Test public void testitNonGreedyWildcard() throws Exception { - File testDir = extractResources("/mng-3461/test-3"); + Path testDir = extractResources("mng-3461/test-3"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3461"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java index e3f18c86e9ff..feb8288c46fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng3470StrictChecksumVerificationOfDependencyPomTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3470"); + Path testDir = extractResources("mng-3470"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3470"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index adbac5c6211b..c234e1c9cd0d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -42,9 +41,9 @@ public class MavenITmng3475BaseAlignedDirTest extends AbstractMavenIntegrationTe */ @Test public void testitMNG3475() throws Exception { - File testDir = extractResources("/mng-3475"); + Path testDir = extractResources("mng-3475"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -71,9 +70,9 @@ public void testitMNG3475() throws Exception { */ } - private void assertPathEquals(File basedir, String expected, String actual) throws IOException { - File actualFile = new File(actual); + private void assertPathEquals(Path basedir, String expected, String actual) throws IOException { + Path actualFile = Path.of(actual); assertTrue(actualFile.isAbsolute(), "path not absolute: " + actualFile); - ItUtils.assertCanonicalFileEquals(new File(basedir, expected), actualFile); + ItUtils.assertCanonicalFileEquals(basedir.resolve(expected), actualFile); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index 071382f5bcfd..6a2f70cbda6a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,9 +44,9 @@ class MavenITmng3477DependencyResolutionErrorMessageTest extends AbstractMavenIn * @throws Exception in case of failure */ void testit(int port, String[] logExpectPatterns, String projectFile) throws Exception { - File testDir = extractResources("/mng-3477"); + Path testDir = extractResources("mng-3477"); - Verifier verifier = newVerifier(testDir.getAbsolutePath(), ""); + Verifier verifier = newVerifier(testDir.toString(), ""); Map filterProps = new HashMap<>(); filterProps.put("@port@", Integer.toString(port)); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java index d82367238a02..437770345ac1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng3482DependencyPomInterpolationTest extends AbstractMavenI @Test public void testitMNG3482() throws Exception { - File testDir = extractResources("/mng-3482"); + Path testDir = extractResources("mng-3482"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java index 9e42be9b0432..e26af5dadc1e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,11 +31,11 @@ public class MavenITmng3485OverrideWagonExtensionTest extends AbstractMavenInteg @Test public void testitMNG3485() throws Exception { - File testDir = extractResources("/mng-3485"); + Path testDir = extractResources("mng-3485"); Verifier verifier; - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("deploy"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java index 09c8b926eb35..cc465c9cb153 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,12 +37,12 @@ public class MavenITmng3498ForkToOtherMojoTest extends AbstractMavenIntegrationT public void testitMNG3498() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3498"); + Path testDir = extractResources("mng-3498"); - File pluginDir = new File(testDir, "maven-mng3498-plugin"); - File projectDir = new File(testDir, "mng-3498-project"); + Path pluginDir = testDir.resolve("maven-mng3498-plugin"); + Path projectDir = testDir.resolve("mng-3498-project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.deleteArtifact("org.apache.maven.its.mng3498", "mavenit-mng3498-plugin", "1", "pom"); verifier.addCliArgument("install"); @@ -50,7 +50,7 @@ public void testitMNG3498() throws Exception { verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java index a0d720c7afe8..d7c15b88d0c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,10 +33,10 @@ public class MavenITmng3503Xpp3ShadingTest extends AbstractMavenIntegrationTestC @Test public void testitMNG3503NoLinkageErrors() throws Exception { - File dir = extractResources("/mng-3503/mng-3503-xpp3Shading-pu11"); + Path dir = extractResources("mng-3503/mng-3503-xpp3Shading-pu11"); // First, build the test plugin - Verifier verifier = newVerifier(new File(dir, "maven-it-plugin-plexus-utils-11").getAbsolutePath()); + Verifier verifier = newVerifier(dir.resolve("maven-it-plugin-plexus-utils-11")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -45,22 +44,22 @@ public void testitMNG3503NoLinkageErrors() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(dir.getAbsolutePath()); + verifier = newVerifier(dir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - assertEquals("", Files.readString(new File(dir, "target/serialized.xml").toPath())); + assertEquals("", Files.readString(dir.resolve("target/serialized.xml"))); } @Test public void testitMNG3503Xpp3Shading() throws Exception { - File dir = extractResources("/mng-3503/mng-3503-xpp3Shading-pu-new"); + Path dir = extractResources("mng-3503/mng-3503-xpp3Shading-pu-new"); // First, build the test plugin - Verifier verifier = newVerifier(new File(dir, "maven-it-plugin-plexus-utils-new").getAbsolutePath()); + Verifier verifier = newVerifier(dir.resolve("maven-it-plugin-plexus-utils-new")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -68,13 +67,13 @@ public void testitMNG3503Xpp3Shading() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(dir.getAbsolutePath()); + verifier = newVerifier(dir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - assertEquals("root", Files.readString(new File(dir, "target/serialized.xml").toPath())); + assertEquals("root", Files.readString(dir.resolve("target/serialized.xml"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java index 444b35141114..9476d5675646 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -43,10 +43,10 @@ public class MavenITmng3506ArtifactHandlersFromPluginsTest extends AbstractMaven @Test public void testProjectPackagingUsage() throws IOException, VerificationException { - File testDir = extractResources("/" + AID); + Path testDir = extractResources("" + AID); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "mng-3506.2/maven-it-plugin-extension2").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mng-3506.2/maven-it-plugin-extension2")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -54,7 +54,7 @@ public void testProjectPackagingUsage() throws IOException, VerificationExceptio verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteArtifacts(GID); @@ -69,33 +69,33 @@ public void testProjectPackagingUsage() throws IOException, VerificationExceptio // repo... // Parent POM - String path = verifier.getArtifactPath(GID, AID, VERSION, "pom"); - assertTrue(new File(path).exists(), path + " should have been installed."); + Path path = verifier.getArtifactPath(GID, AID, VERSION, "pom"); + assertTrue(Files.exists(path), path + " should have been installed."); // Child 1 path = verifier.getArtifactPath(GID, AID + ".1", VERSION, TYPE); - assertTrue(new File(path).exists(), path + " should have been installed."); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID + ".1", VERSION, "pom"); - assertTrue(new File(path).exists(), path + " should have been installed."); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID + ".1", VERSION, BAD_TYPE1); - assertFalse(new File(path).exists(), path + " should NOT have been installed."); + assertFalse(Files.exists(path), path + " should NOT have been installed."); path = verifier.getArtifactPath(GID, AID + ".1", VERSION, BAD_TYPE2); - assertFalse(new File(path).exists(), path + " should _NEVER_ be installed!!!"); + assertFalse(Files.exists(path), path + " should _NEVER_ be installed!!!"); // Child 2 path = verifier.getArtifactPath(GID, AID + ".2", VERSION, TYPE); - assertTrue(new File(path).exists(), path + " should have been installed."); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID + ".2", VERSION, "pom"); - assertTrue(new File(path).exists(), path + " should have been installed."); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID + ".2", VERSION, BAD_TYPE1); - assertFalse(new File(path).exists(), path + " should _NEVER_ be installed!!!"); + assertFalse(Files.exists(path), path + " should _NEVER_ be installed!!!"); path = verifier.getArtifactPath(GID, AID + ".2", VERSION, BAD_TYPE2); - assertFalse(new File(path).exists(), path + " should NOT have been installed."); + assertFalse(Files.exists(path), path + " should NOT have been installed."); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java index e9346fb60c99..f1261fe1bfa0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3529QuotedCliArgTest extends AbstractMavenIntegrationTest */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3529"); + Path testDir = extractResources("mng-3529"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // NOTE: We want to go through the launcher script verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java index 6011f29a9589..28f56404061a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,9 +31,9 @@ public class MavenITmng3535SelfReferentialPropertiesTest extends AbstractMavenIn @Test public void testitMNG3535ShouldSucceed() throws Exception { - File testDir = extractResources("/mng-3535/success"); + Path testDir = extractResources("mng-3535/success"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-X"); @@ -51,9 +51,9 @@ public void testitMNG3535ShouldSucceed() throws Exception { @Test public void testitMNG3535ShouldFail() throws Exception { - File testDir = extractResources("/mng-3535/failure"); + Path testDir = extractResources("mng-3535/failure"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-X"); verifier.addCliArgument("verify"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java index 3a78305ad84f..631bc4922855 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,17 +33,17 @@ public class MavenITmng3536AppendedAbsolutePathsTest extends AbstractMavenIntegr @Test public void testitMNG3536() throws Exception { - File testDir = extractResources("/mng-3536"); - File pluginDir = new File(testDir, "plugin"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Path testDir = extractResources("mng-3536"); + Path pluginDir = testDir.resolve("plugin"); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - File projectDir = new File(testDir, "project"); - verifier = newVerifier(projectDir.getAbsolutePath()); + Path projectDir = testDir.resolve("project"); + verifier = newVerifier(projectDir); verifier.addCliArgument("verify"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java index 44b181942f1f..910f5143769b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng3545ProfileDeactivationTest extends AbstractMavenIntegrat */ @Test public void testBasicBuildWithDefaultProfiles() throws Exception { - File testDir = extractResources("/mng-3545"); + Path testDir = extractResources("mng-3545"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log1.txt"); @@ -62,9 +62,9 @@ public void testBasicBuildWithDefaultProfiles() throws Exception { */ @Test public void testDeactivateDefaultProfilesHyphen() throws Exception { - File testDir = extractResources("/mng-3545"); + Path testDir = extractResources("mng-3545"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log2.txt"); @@ -84,9 +84,9 @@ public void testDeactivateDefaultProfilesHyphen() throws Exception { @Test public void testDeactivateDefaultProfilesExclamation() throws Exception { - File testDir = extractResources("/mng-3545"); + Path testDir = extractResources("mng-3545"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log3.txt"); @@ -112,9 +112,9 @@ public void testDeactivateDefaultProfilesExclamation() throws Exception { */ @Test public void testDeactivateActivatedByProp() throws Exception { - File testDir = extractResources("/mng-3545"); + Path testDir = extractResources("mng-3545"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log4.txt"); @@ -142,9 +142,9 @@ public void testDeactivateActivatedByProp() throws Exception { */ @Test public void testActivateThenDeactivate() throws Exception { - File testDir = extractResources("/mng-3545"); + Path testDir = extractResources("mng-3545"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log5.txt"); @@ -172,9 +172,9 @@ public void testActivateThenDeactivate() throws Exception { */ @Test public void testDefaultProfileAutoDeactivation() throws Exception { - File testDir = extractResources("/mng-3545"); + Path testDir = extractResources("mng-3545"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log6.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java index cb1489470e80..699b4c070f50 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ class MavenITmng3558PropertyEscapingTest extends AbstractMavenIntegrationTestCas @Test public void testPropertyEscaping() throws Exception { - File testDir = extractResources("/mng-3558-property-escaping"); + Path testDir = extractResources("mng-3558-property-escaping"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java index 822ffd5a248b..7fb956608f13 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng3575HexadecimalOctalPluginParameterConfigTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3575"); + Path testDir = extractResources("mng-3575"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java index c84152771377..b7548a789f10 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public MavenITmng3581PluginUsesWagonDependencyTest() { */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3581"); + Path testDir = extractResources("mng-3581"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("initialize"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java index fe0d0d8369ce..d1c94cb7eedd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,13 +41,13 @@ public class MavenITmng3586SystemScopePluginDependencyTest extends AbstractMaven */ @Test public void testitFromPlugin() throws Exception { - File testDir = extractResources("/mng-3586/test-1"); + Path testDir = extractResources("mng-3586/test-1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3586"); - verifier.getSystemProperties().setProperty("test.home", testDir.getAbsolutePath()); + verifier.getSystemProperties().setProperty("test.home", testDir.toString()); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); @@ -67,12 +67,12 @@ public void testitFromPlugin() throws Exception { */ @Test public void testitFromProject() throws Exception { - File testDir = extractResources("/mng-3586/test-2"); + Path testDir = extractResources("mng-3586/test-2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.getSystemProperties().setProperty("test.home", testDir.getAbsolutePath()); + verifier.getSystemProperties().setProperty("test.home", testDir.toString()); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index 7afc2fc384b7..f9ef5ec89f38 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -18,13 +18,11 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; import java.io.IOException; import java.nio.file.Files; - +import java.nio.file.Path; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; @@ -128,25 +126,25 @@ protected void tearDown() throws Exception { @Test public void testitUseHttpProxyForHttp() throws Exception { - File testDir = extractResources("/mng-3599-mk2"); + Path testDir = extractResources("mng-3599-mk2"); /* * NOTE: Make sure the WebDAV extension required by the test project has been pulled down into the local * repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage * for the JAR/POM of the extension and its dependencies when run against a vanilla repo. */ - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - String settings = Files.readString(new File(testDir, "settings-template.xml").toPath()); + String settings = Files.readString(testDir.resolve("settings-template.xml")); settings = StringUtils.replace(settings, "@port@", Integer.toString(port)); String newSettings = StringUtils.replace(settings, "@protocol@", "http"); - Files.writeString(new File(testDir, "settings.xml").getAbsoluteFile().toPath(), newSettings); + Files.writeString(testDir.resolve("settings.xml"), newSettings); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); @@ -170,25 +168,25 @@ public void testitUseHttpProxyForHttp() throws Exception { */ @Test public void testitUseHttpProxyForWebDAV() throws Exception { - File testDir = extractResources("/mng-3599-mk2"); + Path testDir = extractResources("mng-3599-mk2"); /* * NOTE: Make sure the WebDAV extension required by the test project has been pulled down into the local * repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage * for the JAR/POM of the extension and its dependencies when run against a vanilla repo. */ - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - String settings = Files.readString(new File(testDir, "settings-template.xml").toPath()); + String settings = Files.readString(testDir.resolve("settings-template.xml")); settings = StringUtils.replace(settings, "@port@", Integer.toString(port)); String newSettings = StringUtils.replace(settings, "@protocol@", "dav"); - Files.writeString(new File(testDir, "settings.xml").getAbsoluteFile().toPath(), newSettings); + Files.writeString(testDir.resolve("settings.xml"), newSettings); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index d9a9fa49192a..490768bf0535 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -35,11 +35,11 @@ public class MavenITmng3600DeploymentModeDefaultsTest extends AbstractMavenInteg @Test public void testitMNG3600NoSettings() throws Exception { - File testDir = extractResources("/mng-3600"); + Path testDir = extractResources("mng-3600"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); - new File(testDir, "wagon.properties").delete(); + Files.deleteIfExists(testDir.resolve("wagon.properties")); verifier.setLogFileName("log-no-settings.txt"); verifier.addCliArgument("validate"); verifier.execute(); @@ -53,11 +53,11 @@ public void testitMNG3600NoSettings() throws Exception { @Test public void testitMNG3600ServerDefaults() throws Exception { - File testDir = extractResources("/mng-3600"); + Path testDir = extractResources("mng-3600"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); - new File(testDir, "wagon.properties").delete(); + Files.deleteIfExists(testDir.resolve("wagon.properties")); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings-server-defaults.xml"); verifier.setLogFileName("log-server-defaults.txt"); @@ -73,11 +73,11 @@ public void testitMNG3600ServerDefaults() throws Exception { @Test public void testitMNG3600ModesSet() throws Exception { - File testDir = extractResources("/mng-3600"); + Path testDir = extractResources("mng-3600"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); - new File(testDir, "wagon.properties").delete(); + Files.deleteIfExists(testDir.resolve("wagon.properties")); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings-modes-set.xml"); verifier.setLogFileName("log-modes-set.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java index 4bafc06ed84f..f7425be7fe33 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.net.URI; import java.util.Properties; @@ -42,12 +42,12 @@ public class MavenITmng3607ClassLoadersUseValidUrlsTest extends AbstractMavenInt */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3607"); + Path testDir = extractResources("mng-3607"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - verifier.getSystemProperties().setProperty("test.home", testDir.getAbsolutePath()); + verifier.getSystemProperties().setProperty("test.home", testDir.toString()); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java index beda4e93ea3f..264c34678beb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3621UNCInheritedPathsTest extends AbstractMavenIntegratio */ @Test public void testitMNG3621() throws Exception { - File testDir = extractResources("/mng-3621"); + Path testDir = extractResources("mng-3621"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java index 76d00609fafa..274fe025bfb1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; @@ -38,9 +38,9 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt @Test public void testitMNG3641() throws Exception { // (0) Initialize. - File testDir = extractResources("/mng-3641"); + Path testDir = extractResources("mng-3641"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); // Delete this artifact. Just in case. @@ -58,7 +58,7 @@ public void testitMNG3641() throws Exception { assertNull(findWarning(logFile, "mng-3641-it-provided-profile")); // (2) make sure the profile was not found and a warning was printed. - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-P"); verifier.addCliArgument("mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p"); verifier.setLogFileName("log-2.txt"); @@ -71,7 +71,7 @@ public void testitMNG3641() throws Exception { // (3) make sure the first profile is found while the other is not and a warning was printed // accordingly. - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-P"); verifier.addCliArgument("mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p"); verifier.setLogFileName("log-3.txt"); @@ -84,7 +84,7 @@ public void testitMNG3641() throws Exception { assertNotNull(findWarning(logFile, "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p")); // (4) make sure the warning is only printed when the profile is missing in all projects - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-P"); verifier.addCliArgument("mng-3641-it-provided-profile-child"); verifier.setLogFileName("log-4.txt"); @@ -96,7 +96,7 @@ public void testitMNG3641() throws Exception { assertNull(findWarning(logFile, "mng-3641-it-provided-profile-child")); // (5) make sure the profile is found in subproject. Must not contain a warning. - verifier = newVerifier(new File(testDir, "child1").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("child1")); verifier.addCliArgument("-P"); verifier.addCliArgument("mng-3641-it-provided-profile-child"); verifier.setLogFileName("log-5.txt"); @@ -108,7 +108,7 @@ public void testitMNG3641() throws Exception { assertNull(findWarning(logFile, "mng-3641-it-provided-profile-child")); // (6) make sure the profile is found from parent in subproject. Must not contain a warning. - verifier = newVerifier(new File(testDir, "child1").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("child1")); verifier.addCliArgument("-P"); verifier.addCliArgument("mng-3641-it-provided-profile"); verifier.setLogFileName("log-6.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index 606446fe3334..8d7794194566 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,7 +41,7 @@ public class MavenITmng3642DynamicResourcesTest extends AbstractMavenIntegration public void testitMNG3642() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3642"); + Path testDir = extractResources("mng-3642"); Verifier verifier; @@ -52,7 +52,7 @@ public void testitMNG3642() throws Exception { * unstable test results. Fortunately, the verifier * makes it easy to do this. */ - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); /* * The Command Line Options (CLI) are passed to the @@ -76,10 +76,10 @@ public void testitMNG3642() throws Exception { */ verifier.verifyErrorFreeLog(); - File first = new File(testDir, "target/test-classes/one.txt"); - assertTrue(first.exists(), "First resource file was not present: " + first); + Path first = testDir.resolve("target/test-classes/one.txt"); + assertTrue(Files.exists(first), "First resource file was not present: " + first); - File second = new File(testDir, "target/test-classes/two.txt"); - assertTrue(second.exists(), "Second resource file was not present: " + second); + Path second = testDir.resolve("target/test-classes/two.txt"); + assertTrue(Files.exists(second), "Second resource file was not present: " + second); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java index e0b652e8de28..baa183738ffc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3645POMSyntaxErrorTest extends AbstractMavenIntegrationTe */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3645"); + Path testDir = extractResources("mng-3645"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index 1eb4e06aa716..b70369b04395 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -18,13 +18,12 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; @@ -102,16 +101,16 @@ protected void tearDown() throws Exception { */ @Test public void testmng3652UnConfiguredHttp() throws Exception { - File testDir = extractResources("/mng-3652"); - File pluginDir = new File(testDir, "test-plugin"); - File projectDir = new File(testDir, "test-project"); + Path testDir = extractResources("mng-3652"); + Path pluginDir = testDir.resolve("test-plugin"); + Path projectDir = testDir.resolve("test-project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("-DtestPort=" + port); verifier.addCliArgument("-X"); @@ -124,10 +123,10 @@ public void testmng3652UnConfiguredHttp() throws Exception { String userAgent = this.userAgent; assertNotNull(userAgent); - File touchFile = new File(projectDir, "target/touch.txt"); - assertTrue(touchFile.exists()); + Path touchFile = projectDir.resolve("target/touch.txt"); + assertTrue(Files.exists(touchFile)); - List lines = verifier.loadFile(touchFile, false); + List lines = verifier.loadFile(touchFile); // NOTE: system property for maven.version may not exist if you use -Dtest // surefire parameter to run this single test. Therefore, the plugin writes @@ -145,16 +144,16 @@ public void testmng3652UnConfiguredHttp() throws Exception { @Test public void testmng3652UnConfiguredDAV() throws Exception { - File testDir = extractResources("/mng-3652"); - File pluginDir = new File(testDir, "test-plugin"); - File projectDir = new File(testDir, "test-project"); + Path testDir = extractResources("mng-3652"); + Path pluginDir = testDir.resolve("test-plugin"); + Path projectDir = testDir.resolve("test-project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); // test webdav verifier.addCliArgument("-DtestPort=" + port); @@ -166,10 +165,10 @@ public void testmng3652UnConfiguredDAV() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File touchFile = new File(projectDir, "target/touch.txt"); - assertTrue(touchFile.exists()); + Path touchFile = projectDir.resolve("target/touch.txt"); + assertTrue(Files.exists(touchFile)); - List lines = verifier.loadFile(touchFile, false); + List lines = verifier.loadFile(touchFile); // NOTE: system property for maven.version may not exist if you use -Dtest // surefire parameter to run this single test. Therefore, the plugin writes @@ -190,16 +189,16 @@ public void testmng3652UnConfiguredDAV() throws Exception { @Test public void testmng3652ConfigurationInSettingsWithoutUserAgent() throws Exception { - File testDir = extractResources("/mng-3652"); - File pluginDir = new File(testDir, "test-plugin"); - File projectDir = new File(testDir, "test-project"); + Path testDir = extractResources("mng-3652"); + Path pluginDir = testDir.resolve("test-plugin"); + Path projectDir = testDir.resolve("test-project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); // test settings with no config @@ -213,10 +212,10 @@ public void testmng3652ConfigurationInSettingsWithoutUserAgent() throws Exceptio verifier.execute(); verifier.verifyErrorFreeLog(); - File touchFile = new File(projectDir, "target/touch.txt"); - assertTrue(touchFile.exists()); + Path touchFile = projectDir.resolve("target/touch.txt"); + assertTrue(Files.exists(touchFile)); - List lines = verifier.loadFile(touchFile, false); + List lines = verifier.loadFile(touchFile); // NOTE: system property for maven.version may not exist if you use -Dtest // surefire parameter to run this single test. Therefore, the plugin writes @@ -237,16 +236,16 @@ public void testmng3652ConfigurationInSettingsWithoutUserAgent() throws Exceptio @Test public void testmng3652UserAgentConfiguredInSettings() throws Exception { - File testDir = extractResources("/mng-3652"); - File pluginDir = new File(testDir, "test-plugin"); - File projectDir = new File(testDir, "test-project"); + Path testDir = extractResources("mng-3652"); + Path pluginDir = testDir.resolve("test-plugin"); + Path projectDir = testDir.resolve("test-project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); // test settings with config @@ -269,16 +268,16 @@ public void testmng3652UserAgentConfiguredInSettings() throws Exception { @Test public void testmng3652AdditionnalHttpHeaderConfiguredInSettings() throws Exception { - File testDir = extractResources("/mng-3652"); - File pluginDir = new File(testDir, "test-plugin"); - File projectDir = new File(testDir, "test-project"); + Path testDir = extractResources("mng-3652"); + Path pluginDir = testDir.resolve("test-plugin"); + Path projectDir = testDir.resolve("test-project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); // test settings with config diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java index 3e80b23c91e3..83743adaacca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng3667ResolveDepsWithBadPomVersionTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3667"); + Path testDir = extractResources("mng-3667"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3667"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java index dc249e4dcc50..c7a48e218c88 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3671PluginLevelDepInterpolationTest extends AbstractMaven public void testitMNG3671() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3671"); + Path testDir = extractResources("mng-3671"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("compile"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java index 3b33837a5c8a..216e213890ae 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,9 +33,9 @@ public class MavenITmng3679PluginExecIdInterpolationTest extends AbstractMavenIn @Test public void testitMNG3679() throws Exception { - File testDir = extractResources("/mng-3679"); + Path testDir = extractResources("mng-3679"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java index 7789963e266d..ca6a13b0e642 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3680InvalidDependencyPOMTest extends AbstractMavenIntegra */ @Test public void testitMNG3680() throws Exception { - File testDir = extractResources("/mng-3680"); + Path testDir = extractResources("mng-3680"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3680"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java index 0e5cccae43c0..6f04e93bc8ca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,17 +33,17 @@ public class MavenITmng3684BuildPluginParameterTest extends AbstractMavenIntegra @Test public void testitMNG3684() throws Exception { - File testDir = extractResources("/mng-3684"); - File pluginDir = new File(testDir, "maven-mng3684-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3684"); + Path pluginDir = testDir.resolve("maven-mng3684-plugin"); + Path projectDir = testDir.resolve("project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("log-validate.txt"); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java index 7a0dba9f2a3d..d119c4ea353a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java @@ -18,9 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - -import org.codehaus.plexus.util.FileUtils; +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -36,27 +34,26 @@ public class MavenITmng3693PomFileBasedirChangeTest extends AbstractMavenIntegra @Test public void testitMNG3693() throws Exception { - File testDir = extractResources("/mng-3693"); + Path testDir = extractResources("mng-3693"); - File pluginDir = new File(testDir, "maven-mng3693-plugin"); - File projectsDir = new File(testDir, "projects"); + Path pluginDir = testDir.resolve("maven-mng3693-plugin"); + Path projectsDir = testDir.resolve("projects"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - String depPath = verifier.getArtifactPath("org.apache.maven.its.mng3693", "dep", "1", "pom"); + Path depPath = verifier.getArtifactPath("org.apache.maven.its.mng3693", "dep", "1", "pom"); - File dep = new File(depPath); - dep = dep.getParentFile().getParentFile(); + Path dep = depPath.getParent().getParent(); // remove the dependency from the local repository. - FileUtils.deleteDirectory(dep); + ItUtils.deleteDirectory(dep); - verifier = newVerifier(projectsDir.getAbsolutePath()); + verifier = newVerifier(projectsDir); verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java index 635f0c2d5032..6a10f1fc6a9e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -33,18 +33,18 @@ public class MavenITmng3694ReactorProjectsDynamismTest extends AbstractMavenInte @Test public void testitMNG3694() throws Exception { - File testDir = extractResources("/mng-3694"); + Path testDir = extractResources("mng-3694"); - File pluginDir = new File(testDir, "maven-mng3694-plugin"); - File projectDir = new File(testDir, "projects"); + Path pluginDir = testDir.resolve("maven-mng3694-plugin"); + Path projectDir = testDir.resolve("projects"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java index 3909e2df6607..e2172dd17951 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3701ImplicitProfileIdTest extends AbstractMavenIntegratio */ @Test public void testitMNG3701() throws Exception { - File testDir = extractResources("/mng-3701"); + Path testDir = extractResources("mng-3701"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java index 4694d92e9f1d..e101a07d8f62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,20 +36,20 @@ public class MavenITmng3703ExecutionProjectWithRelativePathsTest extends Abstrac @Test public void testForkFromMojo() throws Exception { - File testDir = extractResources("/mng-3703"); - File pluginDir = new File(testDir, "maven-mng3703-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3703"); + Path pluginDir = testDir.resolve("maven-mng3703-plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("log-mojo.txt"); verifier.addCliArgument("package"); @@ -60,20 +60,20 @@ public void testForkFromMojo() throws Exception { @Test public void testForkFromReport() throws Exception { - File testDir = extractResources("/mng-3703"); - File pluginDir = new File(testDir, "maven-mng3703-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3703"); + Path pluginDir = testDir.resolve("maven-mng3703-plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("log-report.txt"); verifier.addCliArgument("site"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java index 5ac17473ffec..9776a9ad2aa7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -40,54 +40,50 @@ public class MavenITmng3710PollutedClonedPluginsTest extends AbstractMavenIntegr @Test public void testitMNG3710POMInheritance() throws Exception { - File testDir = extractResources("/mng-3710/pom-inheritance"); - File pluginDir = new File(testDir, "maven-mng3710-pomInheritance-plugin"); - File projectsDir = new File(testDir, "projects"); + Path testDir = extractResources("mng-3710/pom-inheritance"); + Path pluginDir = testDir.resolve("maven-mng3710-pomInheritance-plugin"); + Path projectsDir = testDir.resolve("projects"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectsDir.getAbsolutePath()); + verifier = newVerifier(projectsDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - File topLevelTouchFile = new File(projectsDir, "target/touch.txt"); - assertFalse(topLevelTouchFile.exists(), "Top-level touch file should NOT be created in projects tree."); + Path topLevelTouchFile = projectsDir.resolve("target/touch.txt"); + assertFalse(Files.exists(topLevelTouchFile), "Top-level touch file should NOT be created in projects tree."); - File midLevelTouchFile = new File(projectsDir, "middle/target/touch.txt"); - assertTrue(midLevelTouchFile.exists(), "Mid-level touch file should have been created in projects tree."); + Path midLevelTouchFile = projectsDir.resolve("middle/target/touch.txt"); + assertTrue(Files.exists(topLevelTouchFile), "Mid-level touch file should have been created in projects tree."); - File childLevelTouchFile = new File(projectsDir, "middle/child/target/touch.txt"); - assertTrue(childLevelTouchFile.exists(), "Child-level touch file should have been created in projects tree."); + Path childLevelTouchFile = projectsDir.resolve("middle/child/target/touch.txt"); + assertTrue(Files.exists(topLevelTouchFile), "Child-level touch file should have been created in projects tree."); } @Test public void testitMNG3710OriginalModel() throws Exception { - File testDir = extractResources("/mng-3710/original-model"); - File pluginsDir = new File(testDir, "plugins"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3710/original-model"); + Path pluginsDir = testDir.resolve("plugins"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginsDir.getAbsolutePath()); + verifier = newVerifier(pluginsDir); verifier.addCliArgument("install"); verifier.execute(); - verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); - + verifier = newVerifier(projectDir); verifier.addCliArguments("org.apache.maven.its.mng3710:mavenit-mng3710-directInvoke-plugin:1:run", "validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java index dba7f43049e2..a5cf9157bbab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -18,10 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,17 +41,17 @@ public class MavenITmng3714ToolchainsCliOptionTest extends AbstractMavenIntegrat */ @Test public void testitMNG3714() throws Exception { - File testDir = extractResources("/mng-3714"); + Path testDir = extractResources("mng-3714"); - File javaHome = new File(testDir, "javaHome"); - javaHome.mkdirs(); - new File(javaHome, "bin").mkdirs(); - new File(javaHome, "bin/javac").createNewFile(); - new File(javaHome, "bin/javac.exe").createNewFile(); + Path javaHome = testDir.resolve("javaHome"); + Path binDir = testDir.resolve("bin"); + Files.createDirectories(binDir); + ItUtils.createFile(binDir.resolve("javac")); + ItUtils.createFile(binDir.resolve("javac.exe")); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Map properties = verifier.newDefaultFilterMap(); - properties.put("@javaHome@", javaHome.getAbsolutePath()); + properties.put("@javaHome@", javaHome.toString()); verifier.filterFile("toolchains.xml", "toolchains.xml", properties); @@ -69,7 +69,7 @@ public void testitMNG3714() throws Exception { if (tool.endsWith(".exe")) { tool = tool.substring(0, tool.length() - 4); } - assertEquals(new File(javaHome, "bin/javac").getAbsolutePath(), tool); + assertEquals(javaHome.resolve( "bin/javac"), Path.of(tool)); verifier.verifyFilePresent("target/tool.properties"); Properties toolProps = verifier.loadProperties("target/tool.properties"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java index 94433fc6d567..00fa634b843d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -37,19 +36,19 @@ public class MavenITmng3716AggregatorForkingTest extends AbstractMavenIntegratio @Test public void testitMNG3716() throws Exception { - File testDir = extractResources("/mng-3716"); - File pluginDir = new File(testDir, "maven-mng3716-plugin"); - File projectsDir = new File(testDir, "projects"); + Path testDir = extractResources("mng-3716"); + Path pluginDir = testDir.resolve("maven-mng3716-plugin"); + Path projectsDir = testDir.resolve("projects"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectsDir.getAbsolutePath()); + verifier = newVerifier(projectsDir); verifier.addCliArgument("org.apache.maven.its.mng3716:mavenit-mng3716-plugin:1:run"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java index aeb6d0e1bfb9..e476d2357ec0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -44,9 +44,9 @@ public class MavenITmng3719PomExecutionOrderingTest extends AbstractMavenIntegra */ @Test public void testitMNG3719() throws Exception { - File testDir = extractResources("/mng-3719"); + Path testDir = extractResources("mng-3719"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java index 9ee7a4311716..4c4a88da8d68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -42,19 +42,19 @@ public class MavenITmng3723ConcreteParentProjectTest extends AbstractMavenIntegr public void testitMNG3723() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3723"); - File pluginDir = new File(testDir, "maven-mng3723-plugin"); - File projectDir = new File(testDir, "projects"); + Path testDir = extractResources("mng-3723"); + Path pluginDir = testDir.resolve("maven-mng3723-plugin"); + Path projectDir = testDir.resolve("projects"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java index 013a93a8dba2..3d58d2efdcd1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,19 +37,19 @@ public class MavenITmng3724ExecutionProjectSyncTest extends AbstractMavenIntegra @Test public void testitMNG3724() throws Exception { - File testDir = extractResources("/mng-3724"); - File pluginDir = new File(testDir, "maven-mng3724-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3724"); + Path pluginDir = testDir.resolve("maven-mng3724-plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index e5e6e9d31538..583ad1c6bdce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -49,19 +49,19 @@ public class MavenITmng3729MultiForkAggregatorsTest extends AbstractMavenIntegra @Test public void testitMNG3729() throws Exception { - File testDir = extractResources("/mng-3729"); - File pluginDir = new File(testDir, "maven-mng3729-plugin"); - File projectDir = new File(testDir, "projects"); + Path testDir = extractResources("mng-3729"); + Path pluginDir = testDir.resolve("maven-mng3729-plugin"); + Path projectDir = testDir.resolve("projects"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java index 3c5284a9bd00..37069e390aa4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -43,9 +43,9 @@ public class MavenITmng3732ActiveProfilesTest extends AbstractMavenIntegrationTe */ @Test public void testitMNG3732() throws Exception { - File testDir = extractResources("/mng-3732"); + Path testDir = extractResources("mng-3732"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java index 200164931fcc..ca8f26686c4d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,18 +39,18 @@ public class MavenITmng3740SelfReferentialReactorProjectsTest extends AbstractMa @Test public void testitMNG3740() throws Exception { - File testDir = extractResources("/mng-3740"); - File v1 = new File(testDir, "projects.v1"); - File v2 = new File(testDir, "projects.v2"); + Path testDir = extractResources("mng-3740"); + Path v1 = testDir.resolve("projects.v1"); + Path v2 = testDir.resolve("projects.v2"); Verifier verifier; - verifier = newVerifier(v1.getAbsolutePath()); + verifier = newVerifier(v1); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(v2.getAbsolutePath()); + verifier = newVerifier(v2); verifier.addCliArgument("package"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java index ea63aec7bc8a..68e6bc6c5746 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,19 +38,19 @@ public class MavenITmng3746POMPropertyOverrideTest extends AbstractMavenIntegrat public void testitMNG3746UsingDefaultSystemProperty() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3746"); - File pluginDir = new File(testDir, "maven-mng3746-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3746"); + Path pluginDir = testDir.resolve("maven-mng3746-plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.setLogFileName("log-sys.txt"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("log-sys.txt"); verifier.addCliArgument("validate"); verifier.execute(); @@ -61,19 +61,19 @@ public void testitMNG3746UsingDefaultSystemProperty() throws Exception { public void testitMNG3746UsingCLIProperty() throws Exception { // The testdir is computed from the location of this // file. - File testDir = extractResources("/mng-3746"); - File pluginDir = new File(testDir, "maven-mng3746-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-3746"); + Path pluginDir = testDir.resolve("maven-mng3746-plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.setLogFileName("log-cli.txt"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("log-cli.txt"); verifier.addCliArgument("-Dtest.verification=cli"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index 5ab13cd0ca79..43dee862b2c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3747PrefixedPathExpressionTest extends AbstractMavenInteg @Test public void testitMNG3747() throws Exception { - File testDir = extractResources("/mng-3747"); + Path testDir = extractResources("mng-3747"); - Verifier verifier = newVerifier(testDir.getCanonicalPath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -51,7 +51,7 @@ public void testitMNG3747() throws Exception { Properties props = verifier.loadProperties("target/config.properties"); assertEquals( - "path is: " + new File(testDir, "relative").getCanonicalPath() + "/somepath", + "path is: " + testDir.resolve("relative") + "/somepath", props.getProperty("stringParam")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java index 5dc2fc5ff767..41e0e765c6a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Disabled; @@ -44,9 +44,9 @@ public class MavenITmng3748BadSettingsXmlTest extends AbstractMavenIntegrationTe @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3748"); + Path testDir = extractResources("mng-3748"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java index 8916bae52604..869d193f1ff5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3766ToolchainsFromExtensionTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3766"); + Path testDir = extractResources("mng-3766"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--toolchains"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java index cd58eed0d4c6..ee2bcb84ede7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collections; import java.util.List; @@ -45,9 +45,9 @@ public MavenITmng3769ExclusionRelocatedTransdepsTest() { */ @Test public void testitMNG3769() throws Exception { - File testDir = extractResources("/mng-3769"); + Path testDir = extractResources("mng-3769"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3769"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java index 4435dd752c20..1d72a0cea1af 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -68,9 +67,9 @@ public void testitCBA() throws Exception { * be revised. */ private void testit(String project) throws Exception { - File testDir = extractResources("/mng-3775"); + Path testDir = extractResources("mng-3775"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3775"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java index 291daca5c4fb..1ec55efd33fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,8 +41,8 @@ public class MavenITmng3796ClassImportInconsistencyTest extends AbstractMavenInt */ @Test public void testitMNG3796() throws Exception { - File testDir = extractResources("/mng-3796"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-3796"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java index bebe98a07dfd..b6ea81aacd70 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,8 +42,8 @@ public class MavenITmng3805ExtensionClassPathOrderingTest extends AbstractMavenI */ @Test public void testitMNG3805() throws Exception { - File testDir = extractResources("/mng-3805"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-3805"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3805"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java index 11935850e449..82bf09922517 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,8 +42,8 @@ public class MavenITmng3807PluginConfigExpressionEvaluationTest extends Abstract */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3807"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-3807"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java index 549ba7f998c6..2e19b8c0500e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,10 +40,10 @@ public class MavenITmng3808ReportInheritanceOrderingTest extends AbstractMavenIn */ @Test public void testitMNG3808() throws Exception { - File testDir = extractResources("/mng-3808"); - testDir = new File(testDir, "child"); + Path testDir = extractResources("mng-3808"); + testDir = testDir.resolve("child"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java index b83931b7322d..220312454ea7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ public class MavenITmng3810BadProfileActivationTest extends AbstractMavenIntegra @Test public void testitMNG3810Property() throws Exception { - File testDir = extractResources("/mng-3810/property"); + Path testDir = extractResources("mng-3810/property"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java index 7a66026c67c6..bceefdca2a44 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ public MavenITmng3811ReportingPluginConfigurationInheritanceTest() { */ @Test public void testitMNG3811() throws Exception { - File testDir = extractResources("/mng-3811"); + Path testDir = extractResources("mng-3811"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java index 257f8cc2e414..838c54ecac3e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3813PluginClassPathOrderingTest extends AbstractMavenInte */ @Test public void testitMNG3813() throws Exception { - File testDir = extractResources("/mng-3813"); + Path testDir = extractResources("mng-3813"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3813"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java index a47ca5a7efc5..d3043764d3f7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng3814BogusProjectCycleTest extends AbstractMavenIntegratio */ @Test public void testitMNG3814() throws Exception { - File testDir = extractResources("/mng-3814"); + Path testDir = extractResources("mng-3814"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3814"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java index f72d512fca6e..c2ee337ef7e8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3821EqualPluginExecIdsTest extends AbstractMavenIntegrati */ @Test public void testitMNG3821() throws Exception { - File testDir = extractResources("/mng-3821"); + Path testDir = extractResources("mng-3821"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java index 3b273778074c..a93ec1862691 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java @@ -18,12 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Properties; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -41,9 +40,9 @@ public class MavenITmng3822BasedirAlignedInterpolationTest extends AbstractMaven */ @Test public void testitMNG3822() throws Exception { - File testDir = extractResources("/mng-3822"); + Path testDir = extractResources("mng-3822"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); @@ -60,9 +59,9 @@ public void testitMNG3822() throws Exception { assertEquals(testDir, "target/site", pomProps.getProperty("project.properties.siteOut")); } - private void assertEquals(File testDir, String buildDir, String interpolatedPath) throws Exception { - File actual = new File(interpolatedPath); - File expected = new File(testDir, buildDir); + private void assertEquals(Path testDir, String buildDir, String interpolatedPath) throws Exception { + Path actual = Paths.get(interpolatedPath); + Path expected = testDir.resolve(buildDir); assertTrue(actual.isAbsolute()); ItUtils.assertCanonicalFileEquals(expected, actual); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java index 4723a178eb42..1ff1353c642a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,9 +39,9 @@ public class MavenITmng3827PluginConfigTest extends AbstractMavenIntegrationTest */ @Test public void testitMNG3827() throws Exception { - File testDir = extractResources("/mng-3827"); + Path testDir = extractResources("mng-3827"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -51,7 +50,7 @@ public void testitMNG3827() throws Exception { Properties props = verifier.loadProperties("target/plugin-config.properties"); - ItUtils.assertCanonicalFileEquals(new File(testDir, "pom.xml"), new File(props.getProperty("fileParam"))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("pom.xml"), Path.of(props.getProperty("fileParam"))); assertEquals("true", props.getProperty("booleanParam")); assertEquals("42", props.getProperty("byteParam")); assertEquals("-12345", props.getProperty("shortParam")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java index e8432edb011f..87b7ec687b3a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,10 +40,10 @@ public class MavenITmng3831PomInterpolationTest extends AbstractMavenIntegration */ @Test public void testitMNG3831() throws Exception { - File testDir = extractResources("/mng-3831"); - File child = new File(testDir, "child"); + Path testDir = extractResources("mng-3831"); + Path child = testDir.resolve("child"); - Verifier verifier = newVerifier(child.getAbsolutePath()); + Verifier verifier = newVerifier(child); verifier.addCliArgument("initialize"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -52,7 +51,7 @@ public void testitMNG3831() throws Exception { Properties props = verifier.loadProperties("target/interpolated.properties"); String prefix = "project.properties."; - assertEquals(child.getCanonicalFile(), new File(props.getProperty(prefix + "projectDir")).getCanonicalFile()); + ItUtils.assertCanonicalFileEquals(child, Path.of(props.getProperty(prefix + "projectDir"))); assertEquals("org.apache.maven.its.mng3831.child", props.getProperty(prefix + "projectGroupId")); assertEquals("child", props.getProperty(prefix + "projectArtifactId")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java index dde0e5e8d030..bee6f4b0faec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3833PomInterpolationDataFlowChainTest extends AbstractMav */ @Test public void testitMNG3833() throws Exception { - File testDir = extractResources("/mng-3833"); + Path testDir = extractResources("mng-3833"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java index bc28dfc09109..b5e2761ea2f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3836PluginConfigInheritanceTest extends AbstractMavenInte */ @Test public void testitMNG3836() throws Exception { - File testDir = extractResources("/mng-3836"); + Path testDir = extractResources("mng-3836"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java index 830e67d4c0c7..abe836538968 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng3838EqualPluginDepsTest extends AbstractMavenIntegrationT */ @Test public void testitMNG3838() throws Exception { - File testDir = extractResources("/mng-3838"); + Path testDir = extractResources("mng-3838"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java index 9ae76b1dc27d..a2c2d10f244c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3839PomParsingCoalesceTextTest extends AbstractMavenInteg */ @Test public void testitMNG3839() throws Exception { - File testDir = extractResources("/mng-3839"); + Path testDir = extractResources("mng-3839"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index 3c9a9c1f75cd..07d929d1269b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import java.util.Properties; import java.util.TreeSet; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -48,11 +47,9 @@ class MavenITmng3843PomInheritanceTest extends AbstractMavenIntegrationTestCase @Test @SuppressWarnings("checkstyle:MethodLength") public void testitMNG3843() throws Exception { - File testDir = extractResources("/mng-3843"); - - testDir = testDir.getCanonicalFile(); + Path testDir = extractResources("mng-3843"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("test-1/target"); verifier.deleteDirectory("test-2/target"); @@ -66,9 +63,9 @@ public void testitMNG3843() throws Exception { verifier.verifyErrorFreeLog(); Properties props; - File basedir; + Path basedir; - basedir = new File(verifier.getBasedir(), "test-1"); + basedir = verifier.getBasedir().resolve( "test-1"); props = verifier.loadProperties("test-1/target/pom.properties"); assertEquals("org.apache.maven.its.mng3843", props.getProperty("project.groupId")); assertEquals("test-1", props.getProperty("project.artifactId")); @@ -113,10 +110,10 @@ public void testitMNG3843() throws Exception { assertMissing(props, "project.dependencies."); assertMissing(props, "project.dependencyManagement."); - basedir = new File(verifier.getBasedir(), "test-2"); + basedir = verifier.getBasedir().resolve("test-2"); props = verifier.loadProperties("test-2/target/pom.properties"); - basedir = new File(verifier.getBasedir(), "test-2/child-1"); + basedir = verifier.getBasedir().resolve("test-2/child-1"); props = verifier.loadProperties("test-2/child-1/target/pom.properties"); assertEquals("org.apache.maven.its.mng3843", props.getProperty("project.groupId")); assertEquals("child-1", props.getProperty("project.artifactId")); @@ -171,7 +168,7 @@ public void testitMNG3843() throws Exception { assertEquals("1", props.getProperty("project.dependencyManagement.dependencies")); assertEquals("parent-dep-a", props.getProperty("project.dependencyManagement.dependencies.0.artifactId")); - basedir = new File(verifier.getBasedir(), "test-2/child-2"); + basedir = verifier.getBasedir().resolve("test-2/child-2"); props = verifier.loadProperties("test-2/child-2/target/pom.properties"); assertEquals("org.apache.maven.its.mng3843.child", props.getProperty("project.groupId")); assertEquals("child-2", props.getProperty("project.artifactId")); @@ -243,18 +240,18 @@ public void testitMNG3843() throws Exception { expectedMngtDeps.add("child-dep-a"); assertEquals(expectedMngtDeps, actualMngtDeps); - basedir = new File(verifier.getBasedir(), "test-3/sub-parent/child-a"); + basedir = verifier.getBasedir().resolve("test-3/sub-parent/child-a"); props = verifier.loadProperties("test-3/sub-parent/child-a/target/pom.properties"); assertEquals("..", props.getProperty("project.originalModel.parent.relativePath")); } - private void assertPathEquals(File basedir, String expected, String actual) { + private void assertPathEquals(Path basedir, String expected, String actual) { // NOTE: Basedir alignment is another issue, so don't test this here - File actualFile = new File(actual); + Path actualFile = Path.of(actual); if (actualFile.isAbsolute()) { - assertEquals(new File(basedir, expected), actualFile); + assertEquals(basedir.resolve(expected), actualFile); } else { - assertEquals(new File(expected), actualFile); + assertEquals(Path.of(expected), actualFile); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java index b3dfd6e15a10..4f6c4e9ed1dd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3845LimitedPomInheritanceTest extends AbstractMavenIntegr */ @Test public void testitMNG3845() throws Exception { - File testDir = extractResources("/mng-3845"); + Path testDir = extractResources("mng-3845"); - Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("child")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java index 6249064ac0fb..012ba0b6da09 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,9 +39,9 @@ public class MavenITmng3846PomInheritanceUrlAdjustmentTest extends AbstractMaven */ @Test public void testitOneParent() throws Exception { - File testDir = extractResources("/mng-3846"); + Path testDir = extractResources("mng-3846"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -73,9 +72,9 @@ public void testitOneParent() throws Exception { */ @Test public void testitTwoParents() throws Exception { - File testDir = extractResources("/mng-3846"); + Path testDir = extractResources("mng-3846"); - Verifier verifier = newVerifier(new File(testDir, "another-parent/sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("another-parent/sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java index 4fb2971c770d..7e05db64f4e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3852PluginConfigWithHeterogeneousListTest extends Abstrac */ @Test public void testitMNG3852() throws Exception { - File testDir = extractResources("/mng-3852"); + Path testDir = extractResources("mng-3852"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java index 1e3e9d5849d7..193a7691a16a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ public class MavenITmng3853ProfileInjectedDistReposTest extends AbstractMavenInt */ @Test public void testitMNG3853() throws Exception { - File testDir = extractResources("/mng-3853"); + Path testDir = extractResources("mng-3853"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pcoreit"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java index 3e85cf9a5554..8187b08efdd6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3863AutoPluginGroupIdTest extends AbstractMavenIntegratio */ @Test public void testitMNG3853() throws Exception { - File testDir = extractResources("/mng-3863"); + Path testDir = extractResources("mng-3863"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java index 15788595b4bc..bd38e122ebcc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,9 +39,9 @@ public class MavenITmng3864PerExecPluginConfigTest extends AbstractMavenIntegrat */ @Test public void testitMNG3864() throws Exception { - File testDir = extractResources("/mng-3864"); + Path testDir = extractResources("mng-3864"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -51,7 +50,7 @@ public void testitMNG3864() throws Exception { Properties props = verifier.loadProperties("target/plugin-config.properties"); - ItUtils.assertCanonicalFileEquals(new File(testDir, "pom.xml"), new File(props.getProperty("fileParam"))); + ItUtils.assertCanonicalFileEquals(testDir.resolve("pom.xml"), Path.of(props.getProperty("fileParam"))); assertEquals("true", props.getProperty("booleanParam")); assertEquals("42", props.getProperty("byteParam")); assertEquals("-12345", props.getProperty("shortParam")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java index c0acdcd00d51..467ba20ebede 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3866PluginConfigInheritanceTest extends AbstractMavenInte */ @Test public void testitMNG3866() throws Exception { - File testDir = extractResources("/mng-3866"); + Path testDir = extractResources("mng-3866"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java index e7a81a26edbe..947910482e52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3872ProfileActivationInRelocatedPomTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3872"); + Path testDir = extractResources("mng-3872"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3872"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java index d3c12ee4479c..db86fc25d1be 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -56,9 +56,9 @@ public void testitWithPluginMngt() throws Exception { } private void testitMNG3873(String project) throws Exception { - File testDir = extractResources("/mng-3873"); + Path testDir = extractResources("mng-3873"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java index 13151a5af8ad..3ccf34a4cc68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,9 +40,9 @@ public class MavenITmng3877BasedirAlignedModelTest extends AbstractMavenIntegrat */ @Test public void testitMNG3877() throws Exception { - File testDir = extractResources("/mng-3877"); + Path testDir = extractResources("mng-3877"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -79,9 +78,9 @@ public void testitMNG3877() throws Exception { assertPathEquals(testDir, "target/site", modelProps.getProperty("project.reporting.outputDirectory")); } - private void assertPathEquals(File basedir, String expected, String actual) throws IOException { - File actualFile = new File(actual); + private void assertPathEquals(Path basedir, String expected, String actual) throws IOException { + Path actualFile = Path.of(actual); assertTrue(actualFile.isAbsolute(), "path not absolute: " + actualFile); - ItUtils.assertCanonicalFileEquals(new File(basedir, expected), actualFile); + ItUtils.assertCanonicalFileEquals(basedir.resolve(expected), actualFile); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java index 6f98f0d1de4a..adcf309d0221 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -57,9 +56,9 @@ public void testitWithPluginMngt() throws Exception { } private void testitMNG3886(String project) throws Exception { - File testDir = extractResources("/mng-3886"); + Path testDir = extractResources("mng-3886"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java index 379859b254d9..6ddea4d288de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -57,9 +57,9 @@ public void testitWithPluginMngt() throws Exception { } private void testitMNG3887(String project) throws Exception { - File testDir = extractResources("/mng-3887"); + Path testDir = extractResources("mng-3887"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java index 05426f7a3079..6b5ddc2d81ad 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Disabled; @@ -45,8 +45,8 @@ public class MavenITmng3890TransitiveDependencyScopeUpdateTest extends AbstractM */ @Test public void testitMNG3890() throws Exception { - File testDir = extractResources("/mng-3890"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-3890"); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3890"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java index 922537a92be9..cfc80feb749f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Locale; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,9 +41,9 @@ public class MavenITmng3892ReleaseDeploymentTest extends AbstractMavenIntegratio */ @Test public void testitMNG3892() throws Exception { - File testDir = extractResources("/mng-3892"); + Path testDir = extractResources("mng-3892"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("repo"); verifier.deleteArtifacts("org.apache.maven.its.mng3892"); @@ -75,12 +74,12 @@ public void testitMNG3892() throws Exception { verify(testDir, groupDir + "1.0/test-1.0-it.jar.sha1", "0b0717ff89d3cbadc3564270bf8930163753bf71"); } - private void verify(File testDir, String file, String checksum) throws Exception { - assertEquals(checksum, readChecksum(new File(testDir, file)), file); + private void verify(Path testDir, String file, String checksum) throws Exception { + assertEquals(checksum, readChecksum(testDir.resolve(file)), file); } - private String readChecksum(File checksumFile) throws Exception { - String checksum = Files.readString(checksumFile.toPath()).trim(); + private String readChecksum(Path checksumFile) throws Exception { + String checksum = Files.readString(checksumFile).trim(); if (checksum.indexOf(' ') >= 0) { checksum = checksum.substring(0, checksum.indexOf(' ')); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java index 6ca5d0214953..b89b0c2a0493 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3899ExtensionInheritanceTest extends AbstractMavenIntegra */ @Test public void testitMNG3899() throws Exception { - File testDir = extractResources("/mng-3899"); + Path testDir = extractResources("mng-3899"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3899"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java index 725e56d4480e..2d74d33e15fa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng3900ProfilePropertiesInterpolationTest extends AbstractMa */ @Test public void testitMNG3900() throws Exception { - File testDir = extractResources("/mng-3900"); + Path testDir = extractResources("mng-3900"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pinterpolation-profile"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java index c2b0daf5ab0e..a8c691a45da4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; /** @@ -39,9 +38,9 @@ public class MavenITmng3904NestedBuildDirInterpolationTest extends AbstractMaven */ @Test public void testitMNG3904() throws Exception { - File testDir = extractResources("/mng-3904"); + Path testDir = extractResources("mng-3904"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -50,10 +49,10 @@ public void testitMNG3904() throws Exception { Properties props = verifier.loadProperties("target/pom.properties"); ItUtils.assertCanonicalFileEquals( - new File(testDir, "target/classes/dir0"), new File(props.getProperty("project.properties.dir0"))); + testDir.resolve("target/classes/dir0"), Path.of(props.getProperty("project.properties.dir0"))); ItUtils.assertCanonicalFileEquals( - new File(testDir, "src/test/dir1"), new File(props.getProperty("project.properties.dir1"))); + testDir.resolve("src/test/dir1"), Path.of(props.getProperty("project.properties.dir1"))); ItUtils.assertCanonicalFileEquals( - new File(testDir, "target/site/dir2"), new File(props.getProperty("project.properties.dir2"))); + testDir.resolve("target/site/dir2"), Path.of(props.getProperty("project.properties.dir2"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java index f51d1e0afbbe..79ac0205c3d5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest extends AbstractMav */ @Test public void testitMNG3906() throws Exception { - File testDir = extractResources("/mng-3906"); + Path testDir = extractResources("mng-3906"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng3906"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java index e553fec952bf..43a969384e0f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -43,9 +43,9 @@ public class MavenITmng3916PluginExecutionInheritanceTest extends AbstractMavenI */ @Test public void testitMNG3916() throws Exception { - File testDir = extractResources("/mng-3916"); + Path testDir = extractResources("mng-3916"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java index 80141b17bbf9..0acfaf67daaf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3924XmlMarkupInterpolationTest extends AbstractMavenInteg */ @Test public void testitMNG3924() throws Exception { - File testDir = extractResources("/mng-3924"); + Path testDir = extractResources("mng-3924"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java index fcf66dae88ea..39e3339a63bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -57,9 +56,9 @@ public void testitWithPluginMngt() throws Exception { } private void testitMNG3925(String project) throws Exception { - File testDir = extractResources("/mng-3925"); + Path testDir = extractResources("mng-3925"); - Verifier verifier = newVerifier(new File(new File(testDir, project), "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project).resolve( "sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java index 981816e0faf1..25c6cd684a8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3927PluginDefaultExecutionConfigTest extends AbstractMave */ @Test public void testitMNG3927() throws Exception { - File testDir = extractResources("/mng-3927"); + Path testDir = extractResources("mng-3927"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java index 22922d83bb17..f5884fb5199d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -57,9 +56,9 @@ public void testitWithPluginMngt() throws Exception { } private void testitMNG3937(String project) throws Exception { - File testDir = extractResources("/mng-3937"); + Path testDir = extractResources("mng-3937"); - Verifier verifier = newVerifier(new File(new File(testDir, project), "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project).resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java index 62f0074f1197..6dc2cda31ad5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -59,9 +59,9 @@ public void testitWithPluginMngt() throws Exception { } private void testitMNG3938(String project) throws Exception { - File testDir = extractResources("/mng-3938/" + project); + Path testDir = extractResources("mng-3938/" + project); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java index 800e945e4978..7db0f8c89998 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.codehaus.plexus.util.Os; @@ -42,9 +42,9 @@ public class MavenITmng3940EnvVarInterpolationTest extends AbstractMavenIntegrat */ @Test public void testitMNG3940() throws Exception { - File testDir = extractResources("/mng-3940"); + Path testDir = extractResources("mng-3940"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); /* * NOTE: The POM is using MAVEN_MNG_3940 to reference the var (just as one would refer to PATH). On Windows, * this must resolve case-insensitively so we use different character casing for the variable here. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java index c70fbdf39625..ff30330aa418 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3941"); + Path testDir = extractResources("mng-3941"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java index c1c9babc2954..c9f09fd5dc85 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -43,9 +43,9 @@ public class MavenITmng3943PluginExecutionInheritanceTest extends AbstractMavenI */ @Test public void testitMNG3943() throws Exception { - File testDir = extractResources("/mng-3943"); + Path testDir = extractResources("mng-3943"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java index ce1683894197..7c50ae1d93fa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; /** @@ -38,9 +37,9 @@ public class MavenITmng3944BasedirInterpolationTest extends AbstractMavenIntegra */ @Test public void testitMNG3944() throws Exception { - File testDir = extractResources("/mng-3944"); + Path testDir = extractResources("mng-3944"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-f"); @@ -51,7 +50,7 @@ public void testitMNG3944() throws Exception { verifier.verifyFilePresent("target/basedir.properties"); Properties props = verifier.loadProperties("target/basedir.properties"); - ItUtils.assertCanonicalFileEquals(testDir, new File(props.getProperty("project.properties.prop0"))); - ItUtils.assertCanonicalFileEquals(testDir, new File(props.getProperty("project.properties.prop1"))); + ItUtils.assertCanonicalFileEquals(testDir, Path.of(props.getProperty("project.properties.prop0"))); + ItUtils.assertCanonicalFileEquals(testDir, Path.of(props.getProperty("project.properties.prop1"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java index 736014aa6006..37b8aaf25183 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3947PluginDefaultExecutionConfigTest extends AbstractMave */ @Test public void testitMNG3947() throws Exception { - File testDir = extractResources("/mng-3947"); + Path testDir = extractResources("mng-3947"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.plugins:maven-resources-plugin:resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java index 776f37aa05b8..4e711d255706 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest extends Abstract public void testitFromPom() throws Exception { // requiresMavenVersion("[2.0,3.0-alpha-1),[3.0-beta-1,)"); - File testDir = extractResources("/mng-3948/test-2"); + Path testDir = extractResources("mng-3948/test-2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3948"); verifier.filterFile("pom.xml", "pom.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index 5613162defd0..9e85a7d7a7b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; /** @@ -39,17 +38,17 @@ public class MavenITmng3951AbsolutePathsTest extends AbstractMavenIntegrationTes */ @Test public void testitMNG3951() throws Exception { - File testDir = extractResources("/mng-3951"); + Path testDir = extractResources("mng-3951"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); /* * Cut off anything before the first file separator from the local repo path. This is harmless on a Unix-like * filesystem but will make the path drive-relative on Windows so we can check how Maven handles it. */ - String repoDir = new File(verifier.getLocalRepository()).getAbsolutePath(); - if (getRoot(new File(repoDir)).equals(getRoot(testDir))) { - verifier.addCliArgument("-Dmaven.repo.local=" + repoDir.substring(repoDir.indexOf(File.separator))); + Path repoDir = verifier.getLocalRepository(); + if (getRoot(repoDir).equals(getRoot(testDir))) { + verifier.addCliArgument("-Dmaven.repo.local=" + repoDir.subpath(1, repoDir.getNameCount())); } verifier.setAutoclean(false); @@ -62,15 +61,15 @@ public void testitMNG3951() throws Exception { Properties props = verifier.loadProperties("target/path.properties"); ItUtils.assertCanonicalFileEquals( - new File(testDir, "tmp").getAbsoluteFile(), new File(props.getProperty("fileParams.0"))); + testDir.resolve("tmp"), Path.of(props.getProperty("fileParams.0"))); ItUtils.assertCanonicalFileEquals( - new File(getRoot(testDir), "tmp").getAbsoluteFile(), new File(props.getProperty("fileParams.1"))); - ItUtils.assertCanonicalFileEquals(new File(repoDir), new File(props.getProperty("stringParams.0"))); + getRoot(testDir).resolve("tmp"), Path.of(props.getProperty("fileParams.1"))); + ItUtils.assertCanonicalFileEquals(repoDir, Path.of(props.getProperty("stringParams.0"))); } - private static File getRoot(File path) { - File root = path; - for (File dir = path; dir != null; dir = dir.getParentFile()) { + private static Path getRoot(Path path) { + Path root = path; + for (Path dir = path; dir != null; dir = dir.getParent()) { root = dir; } return root; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java index 3c3e10594184..ac58e3744b13 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; @@ -137,9 +137,9 @@ public void testitSnapshot() throws Exception { } private void testitMNG3953(String project) throws Exception { - File testDir = extractResources("/mng-3953/" + project); + Path testDir = extractResources("mng-3953/" + project); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java index e739d63400f8..479a887ece43 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,10 +40,10 @@ public class MavenITmng3955EffectiveSettingsTest extends AbstractMavenIntegratio */ @Test public void testitMNG3955() throws Exception { - File testDir = extractResources("/mng-3955"); + Path testDir = extractResources("mng-3955"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - String localRepo = verifier.getLocalRepository(); + Verifier verifier = newVerifier(testDir); + Path localRepo = verifier.getLocalRepository(); verifier.setAutoclean(false); verifier.addCliArgument("-Dmaven.repo.local.tail=" + localRepo); verifier.addCliArgument("--settings"); @@ -59,7 +58,7 @@ public void testitMNG3955() throws Exception { assertEquals("true", props.getProperty("settings.offline")); assertEquals("false", props.getProperty("settings.interactiveMode")); assertEquals( - new File(verifier.getLocalRepositoryWithSettings("settings.xml")).getAbsoluteFile(), - new File(props.getProperty("settings.localRepository")).getAbsoluteFile()); + verifier.getLocalRepositoryWithSettings("settings.xml"), + Path.of(props.getProperty("settings.localRepository")).toAbsolutePath()); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java index 82334e3bec60..eef823187a15 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3970DepResolutionFromProfileReposTest extends AbstractMav public void testitFromPom() throws Exception { // requiresMavenVersion("[2.0,3.0-alpha-1),[3.0-beta-1,)"); - File testDir = extractResources("/mng-3970/test-2"); + Path testDir = extractResources("mng-3970/test-2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3970"); verifier.filterFile("pom.xml", "pom.xml"); @@ -59,9 +59,9 @@ public void testitFromPom() throws Exception { */ @Test public void testitFromSettings() throws Exception { - File testDir = extractResources("/mng-3970/test-3"); + Path testDir = extractResources("mng-3970/test-3"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3970"); verifier.filterFile("settings.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java index 6fc1f98e8f79..02417d5cbb0c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng3974MirrorOrderingTest extends AbstractMavenIntegrationTe */ @Test public void testitFirstMatchWins() throws Exception { - File testDir = extractResources("/mng-3974"); + Path testDir = extractResources("mng-3974"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng3974"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java index 6e91409e78a6..fce431ffb99b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,11 +38,11 @@ public class MavenITmng3979ElementJoinTest extends AbstractMavenIntegrationTestC */ @Test public void testitMNG3979() throws Exception { - File testDir = extractResources("/mng-3979"); + Path testDir = extractResources("mng-3979"); - testDir = new File(testDir, "sub"); + testDir = testDir.resolve("sub"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java index 418b17b360a4..c38d9318ed39 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest extends Abstract public void testitFromPom() throws Exception { // requiresMavenVersion("[2.0,3.0-alpha-1),[3.0-alpha-3,)"); - File testDir = extractResources("/mng-3983/test-1"); + Path testDir = extractResources("mng-3983/test-1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // Don't lock up plugin files in class loader within current JVM verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -61,9 +61,9 @@ public void testitFromPom() throws Exception { */ @Test public void testitFromSettings() throws Exception { - File testDir = extractResources("/mng-3983/test-3"); + Path testDir = extractResources("mng-3983/test-3"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // Don't lock up plugin files in class loader within current JVM verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java index 93a3d05c2b36..5bf8f69b469b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ public MavenITmng3991ValidDependencyScopeTest() { */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-3991"); + Path testDir = extractResources("mng-3991"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java index 56c5b5301235..168d165f316c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng3998PluginExecutionConfigTest extends AbstractMavenIntegr */ @Test public void testitMNG3998() throws Exception { - File testDir = extractResources("/mng-3998"); + Path testDir = extractResources("mng-3998"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java index 6c9399c62ec9..4143de0503a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4000MultiPluginExecutionsTest extends AbstractMavenIntegr */ @Test public void testitWithoutPluginMngt() throws Exception { - File testDir = extractResources("/mng-4000/test-1"); + Path testDir = extractResources("mng-4000/test-1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -64,9 +64,9 @@ public void testitWithoutPluginMngt() throws Exception { */ @Test public void testitWithPluginMngt() throws Exception { - File testDir = extractResources("/mng-4000/test-2"); + Path testDir = extractResources("mng-4000/test-2"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java index ab7b2164de1d..22aae1a09bc7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -73,9 +73,9 @@ public void testitProfileManagedDependency() throws Exception { } private void test(String project) throws Exception { - File testDir = extractResources("/mng-4005/" + project); + Path testDir = extractResources("mng-4005/" + project); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java index 7ee75c04e666..765d47c7b42b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4007PlatformFileSeparatorTest extends AbstractMavenIntegr */ @Test public void testitMNG4007() throws Exception { - File testDir = extractResources("/mng-4007"); + Path testDir = extractResources("mng-4007"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -82,6 +82,6 @@ private void assertPath(String actual) { * NOTE: Whether the path is absolute is another issue (MNG-3877), we are only interested in the proper * file separator here. */ - assertEquals(new File(actual).getPath(), actual); + assertEquals(Path.of(actual).toString(), actual); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java index 999026fd9247..db064a445aae 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4008MergedFilterOrderTest extends AbstractMavenIntegratio */ @Test public void testitMNG4008() throws Exception { - File testDir = extractResources("/mng-4008"); + Path testDir = extractResources("mng-4008"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java index 86511e2f1702..0434cd8e2360 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4009InheritProfileEffectsTest extends AbstractMavenIntegr */ @Test public void testitMNG4009() throws Exception { - File testDir = extractResources("/mng-4009"); + Path testDir = extractResources("mng-4009"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pparent-profile"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java index 60815f2501ff..90ecb1f54bc8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4016PrefixedPropertyInterpolationTest extends AbstractMav */ @Test public void testitMNG4016() throws Exception { - File testDir = extractResources("/mng-4016"); + Path testDir = extractResources("mng-4016"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java index b5331eadfce1..8d7855349f0e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4022IdempotentPluginConfigMergingTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4022"); + Path testDir = extractResources("mng-4022"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pmng4022a,mng4022b"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java index 972d97e8e0ee..bbc41feb27bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ public class MavenITmng4023ParentProfileOneTimeInjectionTest extends AbstractMav */ @Test public void testitMNG4023() throws Exception { - File testDir = extractResources("/mng-4023"); + Path testDir = extractResources("mng-4023"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("sub/target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java index 0a04335c1daa..2278f33e283b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -46,9 +46,9 @@ public MavenITmng4026ReactorDependenciesOrderTest() { */ @Test public void testitMNG4026() throws Exception { - File testDir = extractResources("/mng-4026"); + Path testDir = extractResources("mng-4026"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java index 4a8845b58596..5fcf52fd9f80 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -43,9 +43,9 @@ public class MavenITmng4034ManagedProfileDependencyTest extends AbstractMavenInt */ @Test public void testitMNG4034() throws Exception { - File testDir = extractResources("/mng-4034"); + Path testDir = extractResources("mng-4034"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java index f1fc68693d8e..abd608a6d7bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest extends Abstract */ @Test public void testitDefaultLayout() throws Exception { - File testDir = extractResources("/mng-4036/default"); + Path testDir = extractResources("mng-4036/default"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.filterFile("settings.xml", "settings.xml"); verifier.deleteArtifacts("org.apache.maven.its.mng4036"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java index a6da56d802a9..890fd971dbef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4040ProfileInjectedModulesTest extends AbstractMavenInteg */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4040"); + Path testDir = extractResources("mng-4040"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java index 1f5ac779368d..5338abf205cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4048VersionRangeReactorResolutionTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4048"); + Path testDir = extractResources("mng-4048"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("sub-2/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4048"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java index 856a3a1e8f79..21f600f668c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4052ReactorAwareImportScopeTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4052"); + Path testDir = extractResources("mng-4052"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java index 886d54befd66..a212dd86309a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -67,9 +67,9 @@ public void testitWithPluginMngtAndProfile() throws Exception { } private void testit(String test) throws Exception { - File testDir = extractResources("/mng-4053/" + test); + Path testDir = extractResources("mng-4053/" + test); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java index 4e6c5ffd787b..6cc692fece5b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4056"); + Path testDir = extractResources("mng-4056"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4056"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java index f5db53ace8fb..e19939dbaf90 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.HashMap; import java.util.Map; - import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -47,7 +46,7 @@ */ public class MavenITmng4068AuthenticatedMirrorTest extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; private Server server; @@ -55,7 +54,7 @@ public class MavenITmng4068AuthenticatedMirrorTest extends AbstractMavenIntegrat @BeforeEach protected void setUp() throws Exception { - testDir = extractResources("/mng-4068"); + testDir = extractResources("mng-4068"); Constraint constraint = new Constraint(); constraint.setName(Constraint.__BASIC_AUTH); @@ -78,7 +77,7 @@ protected void setUp() throws Exception { securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping}); ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(new File(testDir, "repo").getAbsolutePath()); + repoHandler.setResourceBase(testDir.resolve("repo").toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(securityHandler); @@ -113,7 +112,7 @@ public void testit() throws Exception { Map filterProps = new HashMap<>(); filterProps.put("@mirrorPort@", Integer.toString(port)); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml", filterProps); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4068"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java index 85f0b0715bb9..0e2bed1f110d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collections; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng4070WhitespaceTrimmingTest extends AbstractMavenIntegrati */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4070"); + Path testDir = extractResources("mng-4070"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4070"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java index 71858969bf65..f2927d96526b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4072InactiveProfileReposTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4072"); + Path testDir = extractResources("mng-4072"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4072"); verifier.filterFile("pom-template.xml", "pom.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java index cecefaa1473d..e0d74047d082 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4087PercentEncodedFileUrlTest extends AbstractMavenIntegr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4087"); + Path testDir = extractResources("mng-4087"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4087"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java index 204fb3f99928..745c799a0469 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Properties; @@ -37,10 +37,10 @@ public class MavenITmng4091BadPluginDescriptorTest extends AbstractMavenIntegrat @Test public void testitMNG4091InvalidDescriptor() throws Exception { - File testDir = extractResources("/mng-4091/invalid"); + Path testDir = extractResources("mng-4091/invalid"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-invalid-descriptor").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-invalid-descriptor")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -48,7 +48,7 @@ public void testitMNG4091InvalidDescriptor() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin (should fail) - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); @@ -71,10 +71,10 @@ public void testitMNG4091InvalidDescriptor() throws Exception { @Test public void testitMNG4091PluginDependency() throws Exception { - File testDir = extractResources("/mng-4091/plugin-dependency"); + Path testDir = extractResources("mng-4091/plugin-dependency"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-plugin-dependency").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-plugin-dependency")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -82,7 +82,7 @@ public void testitMNG4091PluginDependency() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java index b9c1a936494b..357d840c9abd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -59,9 +59,9 @@ public void testitActiveProfiles() throws Exception { } private void testit(String project) throws Exception { - File testDir = extractResources("/mng-4102/" + project); + Path testDir = extractResources("mng-4102/" + project); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java index 4ffd633da71e..987e0afcd86c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng4106InterpolationUsesDominantProfileTest extends Abstract */ @Test public void testitMNG4106() throws Exception { - File testDir = extractResources("/mng-4106"); + Path testDir = extractResources("mng-4106"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java index 18645ddc8f1b..d5ce31cbfe95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng4107InterpolationUsesDominantProfileSourceTest extends Ab */ @Test public void testitMNG4107() throws Exception { - File testDir = extractResources("/mng-4107"); + Path testDir = extractResources("mng-4107"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java index 19dff43a1047..7ea81903cc82 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng4112MavenVersionPropertyTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4112"); + Path testDir = extractResources("mng-4112"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java index 2bba185ba7bc..5369d40220b0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4116UndecodedUrlsTest extends AbstractMavenIntegrationTes */ @Test public void testitMNG4116() throws Exception { - File testDir = extractResources("/mng-4116"); + Path testDir = extractResources("mng-4116"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java index 9d43b312190f..2e666cabcae0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4129PluginExecutionInheritanceTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4129"); + Path testDir = extractResources("mng-4129"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("child-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java index 235af7c20231..7fedd1c56670 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collection; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4150VersionRangeTest extends AbstractMavenIntegrationTest */ @Test public void testitMNG4150() throws Exception { - File testDir = extractResources("/mng-4150"); + Path testDir = extractResources("mng-4150"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4150"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java index 2f5a71bdedb3..c3ea0080f197 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Disabled; @@ -43,9 +43,9 @@ public class MavenITmng4162ReportingMigrationTest extends AbstractMavenIntegrati */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4162"); + Path testDir = extractResources("mng-4162"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java index ab9863596a26..6e7386ce4a9f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4166HideCoreCommonsCliTest extends AbstractMavenIntegrati */ @Test public void testitMNG4166() throws Exception { - File testDir = extractResources("/mng-4166"); + Path testDir = extractResources("mng-4166"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("commons-cli", "commons-cli", "0.1.4166", "jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java index 5e945b100702..88827e84f131 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng4172EmptyDependencySetTest extends AbstractMavenIntegrati */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4172"); + Path testDir = extractResources("mng-4172"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java index cfa9ca4e57bb..6acbb37f6768 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4180PerDependencyExclusionsTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4180"); + Path testDir = extractResources("mng-4180"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4180"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java index 59f1977fd2f3..159544b5ced4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -35,14 +35,14 @@ public class MavenITmng4189UniqueVersionSnapshotTest extends AbstractMavenIntegr @Test public void testit() throws Exception { - final File testDir = extractResources("/mng-4189"); + final Path testDir = extractResources("mng-4189"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng4189"); verifier.filterFile("settings-template.xml", "settings.xml"); // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); @@ -56,7 +56,7 @@ public void testit() throws Exception { assertEquals("da2e54f69a9ba120f9211c476029f049967d840c", checksums.getProperty("dep-1.0-SNAPSHOT.jar")); // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-2:jar - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); @@ -72,7 +72,7 @@ public void testit() throws Exception { assertEquals("835979c28041014c5fd55daa15302d92976924a7", checksums.getProperty("dep-1.0-SNAPSHOT.jar")); // revert back to org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java index c5532f76eebe..5bcfc861cc82 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -44,9 +44,9 @@ public class MavenITmng4190MirrorRepoMergingTest extends AbstractMavenIntegratio */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4190"); + Path testDir = extractResources("mng-4190"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4190"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java index 1d0d5c4c9158..afa69167d343 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4193UniqueRepoIdTest extends AbstractMavenIntegrationTest */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4193"); + Path testDir = extractResources("mng-4193"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java index 3b6050b76da6..5fd2de810d5d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng4196ExclusionOnPluginDepTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4196"); + Path testDir = extractResources("mng-4196"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java index e1db70e80e9d..44e72d9a94c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -48,9 +48,9 @@ public class MavenITmng4199CompileMeetsRuntimeScopeTest extends AbstractMavenInt */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4199"); + Path testDir = extractResources("mng-4199"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4199"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java index 7379f72e9b70..6aeda9b5d7a9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -41,9 +41,9 @@ public class MavenITmng4203TransitiveDependencyExclusionTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4203"); + Path testDir = extractResources("mng-4203"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4203"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java index 4705edb9c7e3..570053bc69b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,10 +37,10 @@ public class MavenITmng4207PluginWithLog4JTest extends AbstractMavenIntegrationT */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4207"); + Path testDir = extractResources("mng-4207"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-log4j").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-log4j")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -48,7 +48,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4207"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java index ec58711852e2..4d7e4874d69e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4208InterpolationPrefersCliOverProjectPropsTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4208"); + Path testDir = extractResources("mng-4208"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-DtestProperty=PASSED"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java index 5103ebc9b7c1..820d9c681eb4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4214MirroredParentSearchReposTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4214"); + Path testDir = extractResources("mng-4214"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4214"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java index 3442bb1634db..789e57cf5cf2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; @@ -40,9 +40,9 @@ public class MavenITmng4231SnapshotUpdatePolicyTest extends AbstractMavenIntegra */ @Test public void testitAlways() throws Exception { - File testDir = extractResources("/mng-4231"); + Path testDir = extractResources("mng-4231"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4231"); verifier.addCliArgument("-s"); @@ -78,9 +78,9 @@ public void testitAlways() throws Exception { */ @Test public void testitNever() throws Exception { - File testDir = extractResources("/mng-4231"); + Path testDir = extractResources("mng-4231"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4231"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java index 82160e82b79b..28c1d14cdf47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java @@ -18,13 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * This is a test set for MNG-4233. * @@ -42,9 +39,9 @@ public class MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest exten */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4233"); + Path testDir = extractResources("mng-4233"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.addCliArgument("validate"); @@ -52,9 +49,8 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("consumer/target/artifact.properties"); - assertEquals( - new File(testDir.getCanonicalFile(), "producer/pom.xml"), - new File(props.getProperty("org.apache.maven.its.mng4233:producer:jar:1.0-SNAPSHOT")) - .getCanonicalFile()); + ItUtils.assertCanonicalFileEquals( + testDir.resolve("producer/pom.xml"), + Path.of(props.getProperty("org.apache.maven.its.mng4233:producer:jar:1.0-SNAPSHOT"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java index 618e4f823bb3..0e225c889b5a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java @@ -18,11 +18,11 @@ */ package org.apache.maven.it; +import java.nio.file.Path; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.util.Deque; @@ -60,7 +60,7 @@ * */ public class MavenITmng4235HttpAuthDeploymentChecksumsTest extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; private Server server; @@ -70,9 +70,9 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest extends AbstractMaven @BeforeEach protected void setUp() throws Exception { - testDir = extractResources("/mng-4235"); + testDir = extractResources("mng-4235"); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); Constraint constraint = new Constraint(); constraint.setName(Constraint.__BASIC_AUTH); @@ -129,7 +129,7 @@ public void testit() throws Exception { Map filterProps = new HashMap<>(); filterProps.put("@port@", Integer.toString(port)); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("pom-template.xml", "pom.xml", filterProps); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4235"); @@ -158,7 +158,7 @@ public void testit() throws Exception { } private void assertHash(Verifier verifier, String dataFile, String hashExt, String algo) throws Exception { - String actualHash = ItUtils.calcHash(new File(verifier.getBasedir(), dataFile), algo); + String actualHash = ItUtils.calcHash(verifier.getBasedir().resolve( dataFile), algo); String expectedHash = verifier.loadLines(dataFile + hashExt).get(0).trim(); @@ -177,9 +177,9 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques Resource resource = getResource(request.getPathInfo()); // NOTE: This can get called concurrently but File.mkdirs() isn't thread-safe in all JREs - File dir = resource.getFile().getParentFile(); - for (int i = 0; i < 10 && !dir.exists(); i++) { - dir.mkdirs(); + Path dir = resource.getFile().toPath().getParent(); + for (int i = 0; i < 10 && !Files.exists(dir); i++) { + Files.createDirectories(dir); } Files.copy(request.getInputStream(), resource.getFile().toPath(), REPLACE_EXISTING); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java index 81fff461d9c2..201fea7af183 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -42,9 +42,9 @@ public class MavenITmng4238ArtifactHandlerExtensionUsageTest extends AbstractMav @Test public void testProjectPackagingUsage() throws IOException, VerificationException { - File testDir = extractResources("/mng-4238"); + Path testDir = extractResources("mng-4238"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts(GID); @@ -56,13 +56,13 @@ public void testProjectPackagingUsage() throws IOException, VerificationExceptio // Now, if everything worked, we have a .pom and a .jar in the local repo. // IF IT DIDN'T, we have a .pom and a .coreit in the local repo... - String path = verifier.getArtifactPath(GID, AID, VERSION, TYPE); - assertTrue(new File(path).exists(), path + " should have been installed."); + Path path = verifier.getArtifactPath(GID, AID, VERSION, TYPE); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID, VERSION, "pom"); - assertTrue(new File(path).exists(), path + " should have been installed."); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID, VERSION, BAD_TYPE); - assertFalse(new File(path).exists(), path + " should NOT have been installed."); + assertFalse(Files.exists(path), path + " should NOT have been installed."); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java index 8c57cd432922..ec3b87ad5ebe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ private void clean(Verifier verifier) throws Exception { */ @Test public void testitMakeRoot() throws Exception { - File testDir = extractResources("/mng-4262"); + Path testDir = extractResources("mng-4262"); - Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent")); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -64,9 +64,9 @@ public void testitMakeRoot() throws Exception { */ @Test public void testitMakeModule() throws Exception { - File testDir = extractResources("/mng-4262"); + Path testDir = extractResources("mng-4262"); - Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent")); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java index 8732a44d8e0c..6656a870c525 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ private void clean(Verifier verifier) throws Exception { */ @Test public void testitMakeRoot() throws Exception { - File testDir = extractResources("/mng-4262"); + Path testDir = extractResources("mng-4262"); - Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent")); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -66,9 +66,9 @@ public void testitMakeRoot() throws Exception { */ @Test public void testitMakeModule() throws Exception { - File testDir = extractResources("/mng-4262"); + Path testDir = extractResources("mng-4262"); - Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent")); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java index fdbc5d3bcb11..316a3c8cdfdc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -40,12 +40,12 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4269"); + Path testDir = extractResources("mng-4269"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); // NOTE: It's a crucial prerequisite to create the output directory, i.e. the bad choice - new File(testDir, "target/classes").mkdirs(); + Files.createDirectories(testDir.resolve("target/classes")); verifier.deleteArtifacts("org.apache.maven.its.mng4269"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java index ace0a407eea8..ac67e9b1bbdf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -44,9 +44,9 @@ public class MavenITmng4270ArtifactHandlersFromPluginDepsTest extends AbstractMa @Test public void testProjectPackagingUsage() throws IOException, VerificationException { - File testDir = extractResources("/" + AID); + Path testDir = extractResources("" + AID); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts(GID); @@ -58,13 +58,13 @@ public void testProjectPackagingUsage() throws IOException, VerificationExceptio // Now, if everything worked, we have .pom and a .jar in the local repo. // IF IT DIDN'T, we have a .pom and a .coreit in the local repo... - String path = verifier.getArtifactPath(GID, AID, VERSION, TYPE); - assertTrue(new File(path).exists(), path + " should have been installed."); + Path path = verifier.getArtifactPath(GID, AID, VERSION, TYPE); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID, VERSION, "pom"); - assertTrue(new File(path).exists(), path + " should have been installed."); + assertTrue(Files.exists(path), path + " should have been installed."); path = verifier.getArtifactPath(GID, AID, VERSION, BAD_TYPE); - assertFalse(new File(path).exists(), path + " should NOT have been installed."); + assertFalse(Files.exists(path), path + " should NOT have been installed."); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java index 4cf6563dbe26..7b2f93b0ea80 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng4273RestrictedCoreRealmAccessForPluginTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4273"); + Path testDir = extractResources("mng-4273"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java index 55e51f1507c5..d731cdfb84f8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4274PluginRealmArtifactsTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4274"); + Path testDir = extractResources("mng-4274"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifact("org.apache.maven", "maven-core", "2.0.4274", "jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java index 6138c4b5ac41..c6da0f5ccd95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4275RelocationWarningTest extends AbstractMavenIntegratio */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4275"); + Path testDir = extractResources("mng-4275"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4275"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java index 7c8efcced355..f6f5d1a1f1e9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4276WrongTransitivePlexusUtilsTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4276"); + Path testDir = extractResources("mng-4276"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4276"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java index 8917e0df6da4..95a77fc00c00 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4281PreferLocalSnapshotTest extends AbstractMavenIntegrat public void testit() throws Exception { // NOTE: It's crucial to build the two projects in isolation to disable reactor resolution - File testDir = extractResources("/mng-4281"); + Path testDir = extractResources("mng-4281"); - Verifier verifier = newVerifier(new File(testDir, "dependency").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("dependency")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4281"); verifier.addCliArgument("validate"); @@ -53,7 +53,7 @@ public void testit() throws Exception { verifier.verifyArtifactPresent("org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "jar"); verifier.verifyArtifactPresent("org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "pom"); - verifier = newVerifier(new File(testDir, "project").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("project")); verifier.setAutoclean(false); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java index ef59e6cef0a7..2980adb3ed7b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4283ParentPomPackagingTest extends AbstractMavenIntegrati */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4283"); + Path testDir = extractResources("mng-4283"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java index 2d56901db2dc..b6493c0022ea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,10 +37,10 @@ public class MavenITmng4291MojoRequiresOnlineModeTest extends AbstractMavenInteg */ @Test public void testitDirectInvocation() throws Exception { - File testDir = extractResources("/mng-4291"); + Path testDir = extractResources("mng-4291"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-online").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-online")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -48,7 +48,7 @@ public void testitDirectInvocation() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-direct.txt"); @@ -71,10 +71,10 @@ public void testitDirectInvocation() throws Exception { */ @Test public void testitLifecycleInvocation() throws Exception { - File testDir = extractResources("/mng-4291"); + Path testDir = extractResources("mng-4291"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-online").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-online")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -82,7 +82,7 @@ public void testitLifecycleInvocation() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-lifecycle.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java index 839cd8d868ec..ec178634d552 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4292EnumTypeMojoParametersTest extends AbstractMavenInteg */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4292"); + Path testDir = extractResources("mng-4292"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java index d81a2fc28bdd..1a499622b088 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ public class MavenITmng4293RequiresCompilePlusRuntimeScopeTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4293"); + Path testDir = extractResources("mng-4293"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4293"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java index 28f57b3ec30f..3c1c9c065440 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4304ProjectDependencyArtifactsTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4304"); + Path testDir = extractResources("mng-4304"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index 57f545b0d87e..464d71429225 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,9 +39,9 @@ public class MavenITmng4305LocalRepoBasedirTest extends AbstractMavenIntegration */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4305"); + Path testDir = extractResources("mng-4305"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -53,6 +52,6 @@ public void testit() throws Exception { // NOTE: This deliberately compares the paths on the String level, not via File.equals() assertEquals( - new File(verifier.getLocalRepository()).getAbsolutePath(), props.getProperty("localRepositoryBasedir")); + verifier.getLocalRepository().toString(), props.getProperty("localRepositoryBasedir")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java index dcfcf96816f0..86cfa3cbdbce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java @@ -18,9 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - -import org.codehaus.plexus.util.FileUtils; +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -38,13 +36,13 @@ public class MavenITmng4309StrictChecksumValidationForMetadataTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4309"); + Path testDir = extractResources("mng-4309"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4309"); - FileUtils.copyDirectoryStructure(new File(testDir, "repo"), new File(testDir, "target/repo")); + ItUtils.copyDirectoryStructure(testDir.resolve("repo"), testDir.resolve("target/repo")); verifier.addCliArgument("--strict-checksums"); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java index ec133ad2f63b..cc5a362b046a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest exten */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4312"); + Path testDir = extractResources("mng-4312"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java index ecaae8063630..14b91dab5b17 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4314DirectInvocationOfAggregatorTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4314"); + Path testDir = extractResources("mng-4314"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("consumer/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java index 326119029168..cdf13df27442 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4317PluginVersionResolutionFromMultiReposTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4317"); + Path testDir = extractResources("mng-4317"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4317"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java index 492da83d5d58..8ee50f889d46 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4318ProjectExecutionRootTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4318"); + Path testDir = extractResources("mng-4318"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java index 35ad199d330f..6a37c20ab64a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4319PluginExecutionGoalInterpolationTest extends Abstract */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4319"); + Path testDir = extractResources("mng-4319"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java index 8d4528208574..49ff7ab4eeb8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4320AggregatorAndDependenciesTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4320"); + Path testDir = extractResources("mng-4320"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4320"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java index f0400911d989..0375c23239ed 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4321CliUsesPluginMgmtConfigTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4321"); + Path testDir = extractResources("mng-4321"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java index a40f200871af..a850fff8c56e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; import java.util.Date; @@ -55,10 +55,10 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4326"); + Path testDir = extractResources("mng-4326"); // setup: install a local snapshot - Verifier verifier = newVerifier(new File(testDir, "dependency").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("dependency")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4326"); verifier.deleteDirectory("target"); @@ -131,7 +131,7 @@ public void handle( int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); System.out.println("Bound server socket to the port " + port); // test 1: resolve snapshot, just built local copy should suppress daily remote update check - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.setAutoclean(false); Map filterProps = verifier.newDefaultFilterMap(); filterProps.put("@port@", Integer.toString(port)); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java index f448793589c0..7f07e1a701dc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4327"); + Path testDir = extractResources("mng-4327"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("generate-sources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java index 705d727f8a60..2e0f97140f40 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4328PrimitiveMojoParameterConfigurationTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4328"); + Path testDir = extractResources("mng-4328"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--offline"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java index e00be62ef02e..4838c653de8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -42,10 +42,10 @@ public class MavenITmng4331DependencyCollectionTest extends AbstractMavenIntegra */ @Test public void testitEarlyLifecyclePhase() throws Exception { - File testDir = extractResources("/mng-4331"); + Path testDir = extractResources("mng-4331"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-dependency-collection").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-dependency-collection")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -53,7 +53,7 @@ public void testitEarlyLifecyclePhase() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4331"); verifier.deleteDirectory("sub-2/target"); @@ -75,10 +75,10 @@ public void testitEarlyLifecyclePhase() throws Exception { */ @Test public void testitCliAggregator() throws Exception { - File testDir = extractResources("/mng-4331"); + Path testDir = extractResources("mng-4331"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-dependency-collection").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-dependency-collection")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -86,7 +86,7 @@ public void testitCliAggregator() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4331"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java index afa567f00a4a..430f8f291f8f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4332DefaultPluginExecutionOrderTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4332"); + Path testDir = extractResources("mng-4332"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java index a3a520715ff5..16a4886c20cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4335SettingsOfflineModeTest extends AbstractMavenIntegrat */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4335"); + Path testDir = extractResources("mng-4335"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4335"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java index 3c3ad0f4805c..1e114756549f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -39,10 +39,10 @@ public class MavenITmng4338OptionalMojosTest extends AbstractMavenIntegrationTes */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4338"); + Path testDir = extractResources("mng-4338"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-optional-mojos").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-optional-mojos")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -50,7 +50,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java index ebbfbd7889aa..1adb85e4480a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -41,9 +41,9 @@ public class MavenITmng4341PluginExecutionOrderTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4341"); + Path testDir = extractResources("mng-4341"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java index 0922a0ed93f8..ed5c14bc24b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4342IndependentMojoParameterDefaultValuesTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4342"); + Path testDir = extractResources("mng-4342"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java index 54c36527deaf..69f327b40dde 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; import java.util.Deque; @@ -120,9 +120,9 @@ protected void tearDown() throws Exception { */ @Test public void testitAlways() throws Exception { - File testDir = extractResources("/mng-4343"); + Path testDir = extractResources("mng-4343"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4343"); verifier.addCliArgument("-s"); @@ -171,9 +171,9 @@ public void testitAlways() throws Exception { */ @Test public void testitNever() throws Exception { - File testDir = extractResources("/mng-4343"); + Path testDir = extractResources("mng-4343"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4343"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java index f61de9192d2a..d4293472d88d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4344ManagedPluginExecutionOrderTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4344"); + Path testDir = extractResources("mng-4344"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java index a263510bf1bd..3e8a328f9830 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4345DefaultPluginExecutionOrderTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4345"); + Path testDir = extractResources("mng-4345"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java index 207b0dc958d5..4237a77a23cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4347ImportScopeWithSettingsProfilesTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4347"); + Path testDir = extractResources("mng-4347"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4347"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java index 8638d96f8446..ade852af1f37 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -52,9 +52,9 @@ public class MavenITmng4348NoUnnecessaryRepositoryAccessTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4348"); + Path testDir = extractResources("mng-4348"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); final List requestedUris = Collections.synchronizedList(new ArrayList<>()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java index b38a482b03a9..d258b87aea02 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4349RelocatedArtifactWithInvalidPomTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4349"); + Path testDir = extractResources("mng-4349"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4349"); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java index fd4d65babc6f..df1318d98ec7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -42,9 +42,9 @@ public class MavenITmng4350LifecycleMappingExecutionOrderTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4350"); + Path testDir = extractResources("mng-4350"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java index f5a77dfef04e..c70f4c8d4d39 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,9 +39,9 @@ public class MavenITmng4353PluginDependencyResolutionFromPomRepoTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4353").getCanonicalFile(); + Path testDir = extractResources("mng-4353"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4353"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java index e238ba890625..3c5370c3e41d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4355ExtensionAutomaticVersionResolutionTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4355"); + Path testDir = extractResources("mng-4355"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4355"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java index 884f49bfb980..9fd2c87950b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4357LifecycleMappingDiscoveryInReactorTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4357"); + Path testDir = extractResources("mng-4357"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("mod-a/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java index 4dfb10aa3ab0..1e962253d483 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,10 +40,10 @@ public class MavenITmng4359LocallyReachableParentOutsideOfReactorTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4359"); - testDir = new File(testDir, "reactor-parent"); + Path testDir = extractResources("mng-4359"); + testDir = testDir.resolve("reactor-parent"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("mod-c/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4359"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java index 41ba8973e1f6..3361f8729b2a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.io.PrintWriter; import java.util.List; @@ -67,11 +67,11 @@ public void testitSlideBasedImpl() throws Exception { } private void test(String project) throws Exception { - File testDir = extractResources("/mng-4360"); + Path testDir = extractResources("mng-4360"); - testDir = new File(testDir, project); + testDir = testDir.resolve(project); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Handler repoHandler = new AbstractHandler() { @Override diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java index 18e55e4ae6ef..35b5e707f4b3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; @@ -42,9 +42,9 @@ public class MavenITmng4361ForceDependencySnapshotUpdateTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4361"); + Path testDir = extractResources("mng-4361"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4361"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java index 7e7920d29a0b..184accee7c17 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4363DynamicAdditionOfDependencyArtifactTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4363"); + Path testDir = extractResources("mng-4363"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4363"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java index 52b0870f9157..9e7c1b9cc495 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4365XmlMarkupInAttributeValueTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4365"); + Path testDir = extractResources("mng-4365"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java index 6fd45faabd81..80f3151dff82 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest extends AbstractMavenI */ @Test public void testitNoLayout() throws Exception { - File testDir = extractResources("/mng-4367"); + Path testDir = extractResources("mng-4367"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4367"); @@ -67,9 +67,9 @@ public void testitNoLayout() throws Exception { */ @Test public void testitSpecificLayouts() throws Exception { - File testDir = extractResources("/mng-4367"); + Path testDir = extractResources("mng-4367"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4367"); @@ -96,9 +96,9 @@ public void testitSpecificLayouts() throws Exception { */ @Test public void testitNonMatchingLayout() throws Exception { - File testDir = extractResources("/mng-4367"); + Path testDir = extractResources("mng-4367"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4367"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index 48cee0ebadcd..a86677b3f550 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -45,17 +44,17 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest extends AbstractM */ @Test public void testitPomPackaging() throws Exception { - File testDir = extractResources("/mng-4368/pom"); + Path testDir = extractResources("mng-4368/pom"); - File aDir = new File(testDir, "branch-a"); - File aPom = new File(aDir, "pom.xml"); - File bDir = new File(testDir, "branch-b"); - File bPom = new File(bDir, "pom.xml"); + Path aDir = testDir.resolve("branch-a"); + Path aPom = aDir.resolve("pom.xml"); + Path bDir = testDir.resolve("branch-b"); + Path bPom = bDir.resolve("pom.xml"); - aPom.setLastModified(System.currentTimeMillis()); - bPom.setLastModified(aPom.lastModified() - 1000 * 60); + ItUtils.lastModified(aPom, System.currentTimeMillis()); + ItUtils.lastModified(bPom, ItUtils.lastModified(aPom) - 1000 * 60); - Verifier verifier = newVerifier(aDir.getAbsolutePath()); + Verifier verifier = newVerifier(aDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4368"); @@ -63,25 +62,25 @@ public void testitPomPackaging() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File installedPom = - new File(verifier.getArtifactPath("org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom")); + Path installedPom = + verifier.getArtifactPath("org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom"); - String pom = Files.readString(installedPom.toPath()); + String pom = Files.readString(installedPom); assertTrue(pom.indexOf("Branch-A") > 0); assertFalse(pom.contains("Branch-B")); - assertEquals(aPom.length(), bPom.length()); - assertTrue(aPom.lastModified() > bPom.lastModified()); - assertTrue(installedPom.lastModified() > bPom.lastModified()); + assertEquals(Files.size(aPom), Files.size(bPom)); + assertTrue(ItUtils.lastModified(aPom) > ItUtils.lastModified(bPom)); + assertTrue(ItUtils.lastModified(installedPom) > ItUtils.lastModified(bPom)); - verifier = newVerifier(bDir.getAbsolutePath()); + verifier = newVerifier(bDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); verifier.execute(); verifier.verifyErrorFreeLog(); - pom = Files.readString(installedPom.toPath()); + pom = Files.readString(installedPom); assertFalse(pom.contains("Branch-A")); assertTrue(pom.indexOf("Branch-B") > 0); } @@ -96,19 +95,19 @@ public void testitPomPackaging() throws Exception { public void testitJarPackaging() throws Exception { // requiresMavenVersion("[2.2.2,3.0-alpha-1),[3.0-alpha-6,)"); - File testDir = extractResources("/mng-4368/jar"); + Path testDir = extractResources("mng-4368/jar"); - File aDir = new File(testDir, "branch-a"); - File aArtifact = new File(aDir, "artifact.jar"); - File bDir = new File(testDir, "branch-b"); - File bArtifact = new File(bDir, "artifact.jar"); + Path aDir = testDir.resolve("branch-a"); + Path aArtifact = aDir.resolve("artifact.jar"); + Path bDir = testDir.resolve("branch-b"); + Path bArtifact = bDir.resolve("artifact.jar"); - Files.writeString(aArtifact.toPath(), "from Branch-A"); - aArtifact.setLastModified(System.currentTimeMillis()); - Files.writeString(bArtifact.toPath(), "from Branch-B"); - bArtifact.setLastModified(aArtifact.lastModified() - 1000 * 60); + Files.writeString(aArtifact, "from Branch-A"); + ItUtils.lastModified(aArtifact, System.currentTimeMillis()); + Files.writeString(bArtifact, "from Branch-B"); + ItUtils.lastModified(bArtifact, ItUtils.lastModified(aArtifact) - 1000 * 60); - Verifier verifier = newVerifier(aDir.getAbsolutePath()); + Verifier verifier = newVerifier(aDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4368"); @@ -116,33 +115,33 @@ public void testitJarPackaging() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File installedArtifact = - new File(verifier.getArtifactPath("org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "jar")); + Path installedArtifact = + verifier.getArtifactPath("org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "jar"); - String data = Files.readString(installedArtifact.toPath()); + String data = Files.readString(installedArtifact); assertTrue(data.indexOf("Branch-A") > 0); assertFalse(data.contains("Branch-B")); - assertEquals(aArtifact.length(), bArtifact.length()); - assertTrue(aArtifact.lastModified() > bArtifact.lastModified()); - assertTrue(installedArtifact.lastModified() > bArtifact.lastModified()); + assertEquals(Files.size(aArtifact), Files.size(bArtifact)); + assertTrue(ItUtils.lastModified(aArtifact) > ItUtils.lastModified(bArtifact)); + assertTrue(ItUtils.lastModified(installedArtifact) > ItUtils.lastModified(bArtifact)); - verifier = newVerifier(bDir.getAbsolutePath()); + verifier = newVerifier(bDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("initialize"); verifier.execute(); verifier.verifyErrorFreeLog(); - data = Files.readString(installedArtifact.toPath()); + data = Files.readString(installedArtifact); assertFalse(data.contains("Branch-A")); assertTrue(data.indexOf("Branch-B") > 0); - long lastModified = installedArtifact.lastModified(); - Files.writeString(installedArtifact.toPath(), "from Branch-C"); - installedArtifact.setLastModified(lastModified); + long lastModified = ItUtils.lastModified(installedArtifact); + Files.writeString(installedArtifact, "from Branch-C"); + ItUtils.lastModified(installedArtifact, lastModified); - verifier = newVerifier(bDir.getAbsolutePath()); + verifier = newVerifier(bDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-b.txt"); @@ -150,7 +149,7 @@ public void testitJarPackaging() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - data = Files.readString(installedArtifact.toPath()); + data = Files.readString(installedArtifact); assertFalse(data.contains("Branch-B")); assertTrue(data.indexOf("Branch-C") > 0); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java index ecad0be5fd66..7835cb31efb0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,14 +40,14 @@ public class MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest extend */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4379"); + Path testDir = extractResources("mng-4379"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4379"); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier.setEnvironmentVariable("MNG_4379_HOME", testDir.getAbsolutePath()); + verifier.setEnvironmentVariable("MNG_4379_HOME", testDir.toString()); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.addCliArguments("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java index 2a30db1678d9..79b8a3084bf8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,11 +40,11 @@ public class MavenITmng4381ExtensionSingletonComponentTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4381"); + Path testDir = extractResources("mng-4381"); // First, build the test plugin Verifier verifier = - newVerifier(new File(testDir, "sub-a/maven-it-plugin-extension-consumer").getAbsolutePath()); + newVerifier(testDir.resolve("sub-a/maven-it-plugin-extension-consumer")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -52,7 +52,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("sub-a/target"); verifier.deleteDirectory("sub-b/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java index dc9e3afe4296..62b08d3f89e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4383ValidDependencyVersionTest extends AbstractMavenInteg */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4383"); + Path testDir = extractResources("mng-4383"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java index b1908c99fd93..c0365560c948 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4385LifecycleMappingFromExtensionInReactorTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4385"); + Path testDir = extractResources("mng-4385"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java index 98ad1357bd7a..20b353856585 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4386DebugLoggingTest extends AbstractMavenIntegrationTest */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4386"); + Path testDir = extractResources("mng-4386"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-X"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java index b37200fe4a8e..8a8e92075be0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -41,9 +41,9 @@ public class MavenITmng4387QuietLoggingTest extends AbstractMavenIntegrationTest */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4387"); + Path testDir = extractResources("mng-4387"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-q"); verifier.setLogFileName("log.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java index a975d6863a05..76f5633a1cfb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4393ParseExternalParenPomLenientTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4393"); + Path testDir = extractResources("mng-4393"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4393"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java index 20e6ce49481a..624b727a7d8d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4400RepositoryOrderTest extends AbstractMavenIntegrationT */ @Test public void testitSettingsRepos() throws Exception { - File testDir = extractResources("/mng-4400"); + Path testDir = extractResources("mng-4400"); - Verifier verifier = newVerifier(new File(testDir, "settings").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("settings")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4400"); verifier.filterFile("settings-template.xml", "settings.xml"); @@ -62,9 +62,9 @@ public void testitSettingsRepos() throws Exception { */ @Test public void testitPomRepos() throws Exception { - File testDir = extractResources("/mng-4400"); + Path testDir = extractResources("mng-4400"); - Verifier verifier = newVerifier(new File(testDir, "pom").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("pom")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4400"); verifier.filterFile("pom-template.xml", "pom.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java index 3f0941fbb67e..b930eeb9b73a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4401RepositoryOrderForParentPomTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4401"); + Path testDir = extractResources("mng-4401"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4401"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java index 4cbd92069de0..7f1748b158d8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4402DuplicateChildModuleTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4402"); + Path testDir = extractResources("mng-4402"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-N"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java index 22070d329493..3e6f78a5d557 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -43,9 +43,9 @@ public class MavenITmng4403LenientDependencyPomParsingTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4403"); + Path testDir = extractResources("mng-4403"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4403"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java index f75b90876cd9..44abfd12af37 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4404UniqueProfileIdTest extends AbstractMavenIntegrationT */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4404"); + Path testDir = extractResources("mng-4404"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java index 8a3c86ddf67c..3234be0a3b92 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4405ValidPluginVersionTest extends AbstractMavenIntegrati */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4405"); + Path testDir = extractResources("mng-4405"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java index cf846875276c..8023d19db9b0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -18,8 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; import org.junit.jupiter.api.Test; /** @@ -36,9 +37,9 @@ public class MavenITmng4408NonExistentSettingsFileTest extends AbstractMavenInte */ @Test public void testitUserSettings() throws Exception { - File testDir = extractResources("/mng-4408"); + Path testDir = extractResources("mng-4408"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-user.txt"); verifier.addCliArgument("--settings"); @@ -60,9 +61,9 @@ public void testitUserSettings() throws Exception { */ @Test public void testitGlobalSettings() throws Exception { - File testDir = extractResources("/mng-4408"); + Path testDir = extractResources("mng-4408"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.setAutoclean(false); verifier.setLogFileName("log-global.txt"); verifier.addCliArgument("--global-settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java index fad04682eed0..018600894fb3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4410UsageHelpTest extends AbstractMavenIntegrationTestCas */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4410"); + Path testDir = extractResources("mng-4410"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--help"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java index 65df5c2aa3a2..89a39fae1c35 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4411VersionInfoTest extends AbstractMavenIntegrationTestC */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4411"); + Path testDir = extractResources("mng-4411"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--version"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java index b53f7ba44bf3..87e8f9f28f52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4412OfflineModeInPluginTest extends AbstractMavenIntegrat */ @Test public void testitResolver() throws Exception { - File testDir = extractResources("/mng-4412"); + Path testDir = extractResources("mng-4412"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4412"); @@ -67,9 +67,9 @@ public void testitResolver() throws Exception { */ @Test public void testitCollector() throws Exception { - File testDir = extractResources("/mng-4412"); + Path testDir = extractResources("mng-4412"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4412"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 9b5bab414829..5c57b81181d1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; - import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -51,7 +50,7 @@ public class MavenITmng4413MirroringOfDependencyRepoTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4413"); + Path testDir = extractResources("mng-4413"); Constraint constraint = new Constraint(); constraint.setName(Constraint.__BASIC_AUTH); @@ -74,7 +73,7 @@ public void testit() throws Exception { securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping}); ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(new File(testDir, "repo-a").getAbsolutePath()); + repoHandler.setResourceBase(testDir.resolve("repo-a").toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(securityHandler); @@ -90,7 +89,7 @@ public void testit() throws Exception { } int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); System.out.println("Bound server socket to the port " + port); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4413"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java index 1084dda458ec..b36638b75144 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -45,9 +45,9 @@ public class MavenITmng4415InheritedPluginOrderTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4415"); + Path testDir = extractResources("mng-4415"); - Verifier verifier = newVerifier(new File(testDir, "sub").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("sub")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java index f5b7a435cde3..7ae1f6e9265b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -45,9 +45,9 @@ public class MavenITmng4416PluginOrderAfterProfileInjectionTest extends Abstract */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4416"); + Path testDir = extractResources("mng-4416"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java index 2557d0ccedf3..5d5624227c19 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Properties; @@ -47,9 +47,9 @@ public class MavenITmng4421DeprecatedPomInterpolationExpressionsTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4421"); + Path testDir = extractResources("mng-4421"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java index f527afc8870a..6272d0c118a0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4422PluginExecutionPhaseInterpolationTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4422"); + Path testDir = extractResources("mng-4422"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java index 944908ff6f50..ef2928d07bd7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4423SessionDataFromPluginParameterExpressionTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4423"); + Path testDir = extractResources("mng-4423"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.getSystemProperties().setProperty("mng4423", "PASSED"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index 276e150a3bc6..8bc69e6b9999 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -18,15 +18,13 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Path; import java.util.List; import java.util.Map; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -87,16 +85,16 @@ private void testit(boolean fromHttp, boolean toHttp) throws Exception { } private void testit(boolean fromHttp, boolean toHttp, boolean relativeLocation) throws Exception { - File testDir = extractResources("/mng-4428"); + Path testDir = extractResources("mng-4428"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); // NOTE: trust store cannot be reliably configured for the current JVM verifier.setForkJvm(true); // keytool -genkey -alias localhost -keypass key-passwd -keystore keystore -storepass store-passwd \ // -validity 4096 -dname "cn=localhost, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -keyalg RSA - String storePath = new File(testDir, "keystore").getAbsolutePath(); + String storePath = testDir.resolve("keystore").toString(); String storePwd = "store-passwd"; String keyPwd = "key-passwd"; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java index 568885246434..bdb062d31187 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,10 +39,10 @@ public class MavenITmng4429CompRequirementOnNonDefaultImplTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4429"); + Path testDir = extractResources("mng-4429"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-no-default-comp").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-no-default-comp")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -50,7 +50,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java index bc1f9724d7d9..5ff114dc30e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4430DistributionManagementStatusTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4430"); + Path testDir = extractResources("mng-4430"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java index 03da282525fc..d0c2280c51b3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4433"); + Path testDir = extractResources("mng-4433"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4433"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java index a7b4db0b3bad..fb243912641c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,10 +40,10 @@ public class MavenITmng4436SingletonComponentLookupTest extends AbstractMavenInt */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4436"); + Path testDir = extractResources("mng-4436"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-singleton-component").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-singleton-component")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -51,7 +51,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java index ceb5007ade7b..9e7ce07026b4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4450StubModelForMissingDependencyPomTest extends Abstract */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4450"); + Path testDir = extractResources("mng-4450"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4450"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index bbfb5fc0054e..46da8a54e369 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -42,9 +41,9 @@ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4452"); + Path testDir = extractResources("mng-4452"); - Verifier verifier = newVerifier(new File(testDir, "producer").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("producer")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4452"); @@ -67,7 +66,7 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "consumer").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("consumer")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4452"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java index ae0364927e32..4c1c162d72a2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4453PluginVersionFromLifecycleMappingTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4453"); + Path testDir = extractResources("mng-4453"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("process-resources"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java index a1d3f885a9bb..cb68bd158ce4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -42,13 +41,13 @@ public class MavenITmng4459InMemorySettingsKeptEncryptedTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4459"); + Path testDir = extractResources("mng-4459"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.getSystemProperties() - .setProperty("settings.security", new File(testDir, "settings-security.xml").getAbsolutePath()); + .setProperty("settings.security", testDir.resolve("settings-security.xml").toString()); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java index 8a8141513316..4997d3c010bd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4461ArtifactUploadMonitorTest extends AbstractMavenIntegr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4461"); + Path testDir = extractResources("mng-4461"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.removeCIEnvironmentVariables(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java index 8f6e05ca4e12..e5d168389a5d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; @@ -35,8 +35,8 @@ public class MavenITmng4463DependencyManagementImportVersionRanges extends Abstr @Test public void testInclusiveUpperBoundResolvesToHighestVersion() throws Exception { - final File testDir = extractResources("/mng-4463/inclusive-upper-bound"); - final Verifier verifier = newVerifier(testDir.getAbsolutePath()); + final Path testDir = extractResources("mng-4463/inclusive-upper-bound"); + final Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -49,8 +49,8 @@ public void testInclusiveUpperBoundResolvesToHighestVersion() throws Exception { @Test public void testExclusiveUpperBoundResolvesToHighestVersion() throws Exception { - final File testDir = extractResources("/mng-4463/exclusive-upper-bound"); - final Verifier verifier = newVerifier(testDir.getAbsolutePath()); + final Path testDir = extractResources("mng-4463/exclusive-upper-bound"); + final Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -63,8 +63,8 @@ public void testExclusiveUpperBoundResolvesToHighestVersion() throws Exception { @Test public void testFailureWithoutUpperBound() throws Exception { - final File testDir = extractResources("/mng-4463/no-upper-bound"); - final Verifier verifier = newVerifier(testDir.getAbsolutePath()); + final Path testDir = extractResources("mng-4463/no-upper-bound"); + final Verifier verifier = newVerifier(testDir); try { verifier.setAutoclean(false); @@ -73,7 +73,7 @@ public void testFailureWithoutUpperBound() throws Exception { verifier.execute(); fail("Expected 'VerificationException' not thrown."); } catch (final VerificationException e) { - final List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + final List lines = verifier.loadFile(testDir.resolve("log.txt")); assertTrue( indexOf(lines, ".*dependency version range.*does not specify an upper bound.*") >= 0, "Expected error message not found."); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index b3afe7df3e8a..99ac8ba6ce9b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -19,8 +19,8 @@ package org.apache.maven.it; import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -40,9 +40,9 @@ public class MavenITmng4464PlatformIndependentFileSeparatorTest extends Abstract */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4464"); + Path testDir = extractResources("mng-4464"); - Verifier verifier = newVerifier(new File(testDir, "aggregator").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("aggregator")); verifier.setAutoclean(false); verifier.deleteDirectory("../sub/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4464"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java index a1f7411101c1..38c18e9ed300 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collections; import org.junit.jupiter.api.Test; @@ -38,11 +38,11 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest extends Abst */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4465"); + Path testDir = extractResources("mng-4465"); // phase 1: get the metadata into the local repo - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4465"); @@ -58,7 +58,7 @@ public void testit() throws Exception { // phase 2: re-try with the remote repo being inaccessible (due to bad URL) - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.filterFile( diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java index d5ebce45320c..f39a13354817 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; @@ -123,9 +123,9 @@ protected void tearDown() throws Exception { */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4469"); + Path testDir = extractResources("mng-4469"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java index cc5dad053ff3..6ed8de4c79d3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Collections; @@ -190,9 +190,9 @@ public void testitSnapshot() throws Exception { } private void testit(String project) throws Exception { - File testDir = extractResources("/mng-4470/" + project); + Path testDir = extractResources("mng-4470/" + project); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.filterFile( "settings-template.xml", diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java index 5c786fb0db5d..701a30300b21 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4474PerLookupWagonInstantiationTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4474"); + Path testDir = extractResources("mng-4474"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java index baaab5de15ac..3903a745e814 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; @@ -41,9 +41,9 @@ public class MavenITmng4482ForcePluginSnapshotUpdateTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4482"); + Path testDir = extractResources("mng-4482"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4482"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java index 0cec024928df..66123551a831 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4488ValidateExternalParenPomLenientTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4488"); + Path testDir = extractResources("mng-4488"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4488"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java index 9fd7a1d715f0..240cf4be712d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import org.eclipse.jetty.security.ConstraintMapping; @@ -51,7 +51,7 @@ public class MavenITmng4489MirroringOfExtensionRepoTest extends AbstractMavenInt */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4489"); + Path testDir = extractResources("mng-4489"); Constraint constraint = new Constraint(); constraint.setName(Constraint.__BASIC_AUTH); @@ -74,7 +74,7 @@ public void testit() throws Exception { securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping}); ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(securityHandler); @@ -90,7 +90,7 @@ public void testit() throws Exception { } int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); System.out.println("Bound server socket to the port " + port); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4489"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java index 75b6ca9da6da..27c98e7b5714 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4498IgnoreBrokenMetadataTest extends AbstractMavenIntegra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4498"); + Path testDir = extractResources("mng-4498"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4498"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index 2ce367efc8db..3625f8c0a8de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -54,7 +54,7 @@ public class MavenITmng4500NoUpdateOfTimestampedSnapshotsTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4500"); + Path testDir = extractResources("mng-4500"); String pomUri = "/repo/org/apache/maven/its/mng4500/dep/0.1-SNAPSHOT/dep-0.1-20091219.230823-1.pom"; String jarUri = "/repo/org/apache/maven/its/mng4500/dep/0.1-SNAPSHOT/dep-0.1-20091219.230823-1.jar"; @@ -70,7 +70,7 @@ public void handle( }; ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(logHandler); @@ -80,7 +80,7 @@ public void handle( Server server = new Server(0); server.setHandler(handlerList); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { server.start(); if (server.isFailed()) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java index b51c000bc7c2..3c2894c27a72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4522FailUponMissingDependencyParentPomTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4522"); + Path testDir = extractResources("mng-4522"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4522"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java index 7822dd9d3631..e9d102941fe0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4526MavenProjectArtifactsScopeTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4526"); + Path testDir = extractResources("mng-4526"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4526"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java index 2521ed56554d..e8f154be9069 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Disabled; @@ -45,9 +45,9 @@ public class MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4528"); + Path testDir = extractResources("mng-4528"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java index 7edc05f019d2..ca5b93c53ee1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4536RequiresNoProjectForkingMojoTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4536"); + Path testDir = extractResources("mng-4536"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("mod-a/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java index b8a85af8e4e2..c6fa8bf4b12b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4544ActiveComponentCollectionThreadSafeTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4544"); + Path testDir = extractResources("mng-4544"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java index 719deb4c2f30..dd3eb73928de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4553CoreArtifactFilterConsidersGroupIdTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4553"); + Path testDir = extractResources("mng-4553"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4553"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index 3d8eee3dab06..29b8190798d6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -18,17 +18,15 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; - -import org.codehaus.plexus.util.FileUtils; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -56,7 +54,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest extends AbstractMavenIn */ @Test public void testitCached() throws Exception { - File testDir = extractResources("/mng-4554"); + Path testDir = extractResources("mng-4554"); String metadataUri = "/repo-1/org/apache/maven/its/mng4554/maven-metadata.xml"; @@ -71,7 +69,7 @@ public void handle( }; ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(logHandler); @@ -82,7 +80,7 @@ public void handle( server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); @@ -93,9 +91,8 @@ public void handle( verifier.deleteArtifacts("org.apache.maven.its.mng4554"); } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) - assertFalse(new File(verifier.getArtifactMetadataPath( - "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml")) - .exists()); + assertFalse(Files.exists(verifier.getArtifactMetadataPath( + "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); } Map filterProps = verifier.newDefaultFilterMap(); NetworkConnector connector = (NetworkConnector) server.getConnectors()[0]; @@ -135,7 +132,7 @@ public void handle( */ @Test public void testitForcedUpdate() throws Exception { - File testDir = extractResources("/mng-4554"); + Path testDir = extractResources("mng-4554"); String metadataUri = "/repo-1/org/apache/maven/its/mng4554/maven-metadata.xml"; @@ -150,7 +147,7 @@ public void handle( }; ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(logHandler); @@ -161,7 +158,7 @@ public void handle( server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); @@ -172,9 +169,8 @@ public void handle( verifier.deleteArtifacts("org.apache.maven.its.mng4554"); } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) - assertFalse(new File(verifier.getArtifactMetadataPath( - "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml")) - .exists()); + assertFalse(Files.exists(verifier.getArtifactMetadataPath( + "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); } Map filterProps = verifier.newDefaultFilterMap(); NetworkConnector connector = (NetworkConnector) server.getConnectors()[0]; @@ -217,7 +213,7 @@ public void handle( public void testitRefetched() throws Exception { // requiresMavenVersion("[3.0-alpha-3,)"); - File testDir = extractResources("/mng-4554"); + Path testDir = extractResources("mng-4554"); String metadataUri = "/repo-it/org/apache/maven/its/mng4554/maven-metadata.xml"; @@ -232,7 +228,7 @@ public void handle( }; ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(logHandler); @@ -243,7 +239,7 @@ public void handle( server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); @@ -254,9 +250,8 @@ public void handle( verifier.deleteArtifacts("org.apache.maven.its.mng4554"); } catch (IOException e) { // expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm) - assertFalse(new File(verifier.getArtifactMetadataPath( - "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml")) - .exists()); + assertFalse(Files.exists(verifier.getArtifactMetadataPath( + "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml"))); } Map filterProps = verifier.newDefaultFilterMap(); NetworkConnector connector = (NetworkConnector) server.getConnectors()[0]; @@ -266,7 +261,7 @@ public void handle( verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); - FileUtils.copyDirectoryStructure(new File(testDir, "repo-1"), new File(testDir, "repo-it")); + ItUtils.copyDirectoryStructure(testDir.resolve("repo-1"), testDir.resolve("repo-it")); verifier.setLogFileName("log-refetched-1.txt"); verifier.addCliArgument("a:touch"); @@ -279,7 +274,7 @@ public void handle( requestedUris.clear(); // simulate deployment of new plugin which updates the prefix mapping in the remote repo - FileUtils.copyDirectoryStructure(new File(testDir, "repo-2"), new File(testDir, "repo-it")); + ItUtils.copyDirectoryStructure(testDir.resolve("repo-2"), testDir.resolve("repo-it")); verifier.setLogFileName("log-refetched-2.txt"); verifier.addCliArgument("b:touch"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java index e9173ee3400f..ad5afdadacbb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.Deque; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; @@ -49,7 +49,7 @@ public class MavenITmng4555MetaversionResolutionOfflineTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4555"); + Path testDir = extractResources("mng-4555"); final Deque uris = new ConcurrentLinkedDeque<>(); @@ -72,7 +72,7 @@ public void handle( server.setHandler(repoHandler); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4555"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java index b7aaa8566df1..60e14205803f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -35,18 +34,18 @@ public class MavenITmng4559MultipleJvmArgsTest extends AbstractMavenIntegrationT @Test void testMultipleJvmArgs() throws Exception { - File testDir = extractResources("/mng-4559-multiple-jvm-args"); - File mvnDir = new File(testDir, ".mvn"); - File jvmConfig = new File(mvnDir, "jvm.config"); + Path testDir = extractResources("mng-4559-multiple-jvm-args"); + Path mvnDir = testDir.resolve(".mvn"); + Path jvmConfig = mvnDir.resolve("jvm.config"); - mvnDir.mkdirs(); + Files.createDirectories(mvnDir); Files.writeString( - jvmConfig.toPath(), + jvmConfig, "# This is a comment\n" + "-Xmx2048m -Xms1024m -Dtest.prop1=value1 # end of line comment\n" + "# Another comment\n" + "-Dtest.prop2=\"value 2\""); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java index e7279842264d..ecbc0f444f1e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java @@ -38,9 +38,9 @@ class MavenITmng4559SpacesInJvmOptsTest extends AbstractMavenIntegrationTestCase @Test void testIt() throws Exception { Path basedir = - extractResources("/mng-4559-spaces-jvm-opts").getAbsoluteFile().toPath(); + extractResources("mng-4559-spaces-jvm-opts"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.setEnvironmentVariable("MAVEN_OPTS", "-Dprop.maven-opts=\"foo bar\""); verifier.addCliArguments("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java index 48705fbdb1d9..3ea94f31cac6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import org.eclipse.jetty.security.ConstraintMapping; @@ -51,7 +51,7 @@ public class MavenITmng4561MirroringOfPluginRepoTest extends AbstractMavenIntegr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4561"); + Path testDir = extractResources("mng-4561"); Constraint constraint = new Constraint(); constraint.setName(Constraint.__BASIC_AUTH); @@ -74,7 +74,7 @@ public void testit() throws Exception { securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping}); ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(securityHandler); @@ -84,7 +84,7 @@ public void testit() throws Exception { server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java index 7710eda6dbb6..5ac41b7fd571 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4572ModelVersionSurroundedByWhitespaceTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4572"); + Path testDir = extractResources("mng-4572"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java index a6bf6dcd43df..9f2758411de8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest ext */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4580"); + Path testDir = extractResources("mng-4580"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java index dd0aa2f78f64..6dcc74259a96 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4586"); + Path testDir = extractResources("mng-4586"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4586"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java index c855f4f6f0f8..dfed584206cf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -39,15 +38,15 @@ public class MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4590"); + Path testDir = extractResources("mng-4590"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4590"); verifier.filterFile("settings-template.xml", "settings.xml"); verifier.setEnvironmentVariable("MAVEN_OPTS", "-Dtest.file=pom.xml"); - verifier.addCliArgument("-Dtest.dir=" + testDir.getAbsolutePath()); + verifier.addCliArgument("-Dtest.dir=" + testDir.toString()); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("validate"); @@ -58,7 +57,7 @@ public void testit() throws Exception { assertEquals("1", props.getProperty("project.dependencyManagement.dependencies")); assertEquals("dep-a", props.getProperty("project.dependencyManagement.dependencies.0.artifactId")); assertEquals( - new File(testDir, "pom.xml").getAbsoluteFile(), - new File(props.getProperty("project.dependencyManagement.dependencies.0.systemPath"))); + testDir.resolve("pom.xml"), + Path.of(props.getProperty("project.dependencyManagement.dependencies.0.systemPath"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index 674bf21ccae7..1b7a38ca3e42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Properties; @@ -42,9 +42,9 @@ public class MavenITmng4600DependencyOptionalFlagManagementTest extends Abstract */ @Test public void testitModel() throws Exception { - File testDir = extractResources("/mng-4600/model"); + Path testDir = extractResources("mng-4600/model"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -64,9 +64,9 @@ public void testitModel() throws Exception { */ @Test public void testitResolution() throws Exception { - File testDir = extractResources("/mng-4600/resolution"); + Path testDir = extractResources("mng-4600/resolution"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4600"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java index 227083cbd982..8c648f62814e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest extends AbstractM */ @Test public void testitAllSet() throws Exception { - File testDir = extractResources("/mng-4615/test-0"); + Path testDir = extractResources("mng-4615/test-0"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -62,9 +62,9 @@ public void testitAllSet() throws Exception { */ @Test public void testitExprMissing() throws Exception { - File testDir = extractResources("/mng-4615/test-1"); + Path testDir = extractResources("mng-4615/test-1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-a.txt"); @@ -86,9 +86,9 @@ public void testitExprMissing() throws Exception { */ @Test public void testitExprSet() throws Exception { - File testDir = extractResources("/mng-4615/test-1"); + Path testDir = extractResources("mng-4615/test-1"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dconfig.requiredParam=CLI"); @@ -113,9 +113,9 @@ public void testitPomValMissing() throws Exception { // cf. MNG-4764 // requiresMavenVersion("[3.0-beta-2,)"); - File testDir = extractResources("/mng-4615/test-2a"); + Path testDir = extractResources("mng-4615/test-2a"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { @@ -136,9 +136,9 @@ public void testitPomValMissing() throws Exception { */ @Test public void testitPomValSet() throws Exception { - File testDir = extractResources("/mng-4615/test-2b"); + Path testDir = extractResources("mng-4615/test-2b"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java index b686e1ed013f..f88514f9b9dc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng4618AggregatorBuiltAfterModulesTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4618"); + Path testDir = extractResources("mng-4618"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java index c1771b80b95b..62203e4f7c7d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.codehaus.plexus.util.Os; @@ -41,9 +41,9 @@ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest extends Abs */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4625"); + Path testDir = extractResources("mng-4625"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java index 5c2d94ff4554..cb240597ad81 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4629"); + Path testDir = extractResources("mng-4629"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java index bfc998d1062a..af3b89e4a0a3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -59,9 +59,9 @@ public class MavenITmng4633DualCompilerExecutionsWeaveModeTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4633"); + Path testDir = extractResources("mng-4633"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-T"); verifier.addCliArgument("2W"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java index 4524a1d708e8..e70f2aa5c30f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4644StrictPomParsingRejectsMisplacedTextTest extends Abst */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4644"); + Path testDir = extractResources("mng-4644"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java index 4ce707a39771..fba65c887eb9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4654ArtifactHandlerForMainArtifactTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4654"); + Path testDir = extractResources("mng-4654"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4654"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java index 5be93cf0ec7b..a5765eea90a9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java @@ -18,7 +18,6 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.FileVisitor; @@ -26,7 +25,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.BasicFileAttributes; - import org.junit.jupiter.api.Test; import static java.nio.file.FileVisitResult.CONTINUE; @@ -49,11 +47,11 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra */ @Test public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { - final File testDir = extractResources("/mng-4660-outdated-packaged-artifact"); - Files.createDirectories(testDir.toPath().resolve(".mvn")); + final Path testDir = extractResources("mng-4660-outdated-packaged-artifact"); + Files.createDirectories(testDir.resolve(".mvn")); // 1. Package the whole project - final Verifier verifier1 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier1 = newVerifier(testDir); verifier1.deleteDirectory("target"); verifier1.deleteArtifacts("org.apache.maven.its.mng4660"); @@ -61,7 +59,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { verifier1.execute(); Path module1Jar = - testDir.toPath().resolve("module-a/target/module-a-1.0.jar").toAbsolutePath(); + testDir.resolve("module-a/target/module-a-1.0.jar").toAbsolutePath(); verifier1.verifyErrorFreeLog(); verifier1.verifyFilePresent(module1Jar.toString()); @@ -73,7 +71,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { } // 2. Create a properties file with some content and compile only that module (module A). - final Verifier verifier2 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier2 = newVerifier(testDir); final Path resourcesDirectory = Files.createDirectories(Paths.get(testDir.toString(), "module-a", "src", "main", "resources")); final Path fileToWrite = resourcesDirectory.resolve("example.properties"); @@ -85,7 +83,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { verifier2.addCliArgument("compile"); verifier2.execute(); - Path module1PropertiesFile = testDir.toPath() + Path module1PropertiesFile = testDir .resolve("module-a/target/classes/example.properties") .toAbsolutePath(); @@ -93,7 +91,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { assertTrue( Files.getLastModifiedTime(module1PropertiesFile).compareTo(Files.getLastModifiedTime(module1Jar)) >= 0); - Path module1Class = testDir.toPath() + Path module1Class = testDir .resolve("module-a/target/classes/org/apache/maven/it/Example.class") .toAbsolutePath(); verifier2.verifyErrorFreeLog(); @@ -101,7 +99,7 @@ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception { // 3. Resume project build from module B, that depends on module A we just touched. Its packaged artifact // is no longer in sync with its compiled artifacts. - final Verifier verifier3 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier3 = newVerifier(testDir); verifier3.setAutoclean(false); verifier3.addCliArgument("--resume-from"); verifier3.addCliArgument(":module-b"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java index 22a11e00ed20..2472f61fd2f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -55,9 +55,9 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa @Disabled("This test goes against Maven (see javadoc above)") @Test public void testShouldResolveOutputDirectoryFromEarlierBuild() throws Exception { - final File testDir = extractResources("/mng-4660-resume-from"); + final Path testDir = extractResources("mng-4660-resume-from"); - final Verifier verifier1 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier1 = newVerifier(testDir); verifier1.deleteDirectory("target"); verifier1.deleteArtifacts("org.apache.maven.its.mng4660"); @@ -69,7 +69,7 @@ public void testShouldResolveOutputDirectoryFromEarlierBuild() throws Exception verifier1.verifyTextInLog("Deliberately fail test case"); } - final Verifier verifier2 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier2 = newVerifier(testDir); verifier2.setAutoclean(false); verifier2.addCliArgument("--resume-from"); verifier2.addCliArgument(":module-b"); @@ -88,9 +88,9 @@ public void testShouldResolveOutputDirectoryFromEarlierBuild() throws Exception */ @Test public void testShouldResolvePackagedArtifactFromEarlierBuild() throws Exception { - final File testDir = extractResources("/mng-4660-resume-from"); + final Path testDir = extractResources("mng-4660-resume-from"); - final Verifier verifier1 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier1 = newVerifier(testDir); verifier1.deleteDirectory("target"); verifier1.deleteArtifacts("org.apache.maven.its.mng4660"); @@ -102,7 +102,7 @@ public void testShouldResolvePackagedArtifactFromEarlierBuild() throws Exception verifier1.verifyTextInLog("Deliberately fail test case"); } - final Verifier verifier2 = newVerifier(testDir.getAbsolutePath()); + final Verifier verifier2 = newVerifier(testDir); verifier2.setAutoclean(false); verifier2.addCliArgument("--resume-from"); verifier2.addCliArgument(":module-b"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java index 17a42681e088..edd127b2bedc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -44,9 +44,9 @@ public class MavenITmng4666CoreRealmImportTest extends AbstractMavenIntegrationT */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4666"); + Path testDir = extractResources("mng-4666"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven", "maven-model", "0.1-stub"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java index df1578bfa329..ff68a08b940d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng4677DisabledPluginConfigInheritanceTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4677"); + Path testDir = extractResources("mng-4677"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("child-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index 6c97dc145cbb..8e61fff16953 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,9 +39,9 @@ public class MavenITmng4679SnapshotUpdateInPluginTest extends AbstractMavenInteg */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4679"); + Path testDir = extractResources("mng-4679"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4679"); verifier.addCliArgument("-s"); @@ -74,8 +73,8 @@ public void testit() throws Exception { } private void assertChecksum(Verifier verifier, String ext, String checksum) throws Exception { - String path = verifier.getArtifactPath("org.apache.maven.its.mng4679", "dep", "0.1-SNAPSHOT", ext); - String actual = ItUtils.calcHash(new File(path), "SHA-1"); + Path path = verifier.getArtifactPath("org.apache.maven.its.mng4679", "dep", "0.1-SNAPSHOT", ext); + String actual = ItUtils.calcHash(path, "SHA-1"); assertEquals(checksum, actual); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java index 1f337c369eb6..451dcfe59f29 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4684DistMgmtOverriddenByProfileTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4684"); + Path testDir = extractResources("mng-4684"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pmng4684"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java index 21d7bff42b93..5f858bee9f0e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -71,9 +71,9 @@ public void testitXDA() throws Exception { * levels) when the resolution of one conflict influences another conflict. */ private void testit(String test) throws Exception { - File testDir = extractResources("/mng-4690"); + Path testDir = extractResources("mng-4690"); - Verifier verifier = newVerifier(new File(testDir, test).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(test)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4690"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java index 158efc786965..add68701e0e0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.HashSet; import java.util.Properties; @@ -43,9 +43,9 @@ public class MavenITmng4696MavenProjectDependencyArtifactsTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4696"); + Path testDir = extractResources("mng-4696"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4696"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index faec244677a2..1ebe91934b30 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -44,9 +44,9 @@ public class MavenITmng4720DependencyManagementExclusionMergeTest extends Abstra */ @Test public void testitWithTransitiveDependencyManager() throws Exception { - File testDir = extractResources("/mng-4720"); + Path testDir = extractResources("mng-4720"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4720"); verifier.addCliArgument("-s"); @@ -77,9 +77,9 @@ public void testitWithTransitiveDependencyManager() throws Exception { */ @Test public void testitWithTransitiveDependencyManagerDisabled() throws Exception { - File testDir = extractResources("/mng-4720"); + Path testDir = extractResources("mng-4720"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4720"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java index a08c81d54f1c..46baf1c407d2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4721OptionalPluginDependencyTest extends AbstractMavenInt */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4721"); + Path testDir = extractResources("mng-4721"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4721"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java index aa7df19c648b..beaaa76941f2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; @@ -53,7 +53,7 @@ public class MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4729"); + Path testDir = extractResources("mng-4729"); Constraint constraint = new Constraint(); constraint.setName(Constraint.__BASIC_AUTH); @@ -76,7 +76,7 @@ public void testit() throws Exception { securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping}); ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(securityHandler); @@ -86,7 +86,7 @@ public void testit() throws Exception { server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index a506291fb5af..182164d26f80 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -18,11 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,9 +40,9 @@ public class MavenITmng4745PluginVersionUpdateTest extends AbstractMavenIntegrat */ @Test public void testitRepoPolicyAlways() throws Exception { - File testDir = extractResources("/mng-4745"); + Path testDir = extractResources("mng-4745"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? verifier.deleteArtifacts("org.apache.maven.its.mng4745"); @@ -76,9 +75,9 @@ public void testitRepoPolicyAlways() throws Exception { */ @Test public void testitRepoPolicyNever() throws Exception { - File testDir = extractResources("/mng-4745"); + Path testDir = extractResources("mng-4745"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? verifier.deleteArtifacts("org.apache.maven.its.mng4745"); @@ -111,9 +110,9 @@ public void testitRepoPolicyNever() throws Exception { */ @Test public void testitForceUpdate() throws Exception { - File testDir = extractResources("/mng-4745"); + Path testDir = extractResources("mng-4745"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? verifier.deleteArtifacts("org.apache.maven.its.mng4745"); @@ -140,7 +139,7 @@ public void testitForceUpdate() throws Exception { assertEquals("1.1", props.get("plugin.version")); } - private static void writeMetadata(File testdir, String version, String timestamp) throws Exception { + private static void writeMetadata(Path testDir, String version, String timestamp) throws Exception { StringBuilder content = new StringBuilder(1024); content.append("\n"); content.append("\n"); @@ -156,8 +155,8 @@ private static void writeMetadata(File testdir, String version, String timestamp content.append(" \n"); content.append("\n"); - File metadata = new File(testdir, "repo/org/apache/maven/its/mng4745/maven-it-plugin/maven-metadata.xml"); - metadata.getParentFile().mkdirs(); - Files.writeString(metadata.getAbsoluteFile().toPath(), content.toString()); + Path metadata = testDir.resolve("repo/org/apache/maven/its/mng4745/maven-it-plugin/maven-metadata.xml"); + Files.createDirectories(metadata.getParent()); + Files.writeString(metadata, content.toString()); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java index b3d7ce8fe1b3..05495b4aeddd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4747JavaAgentUsedByPluginTest extends AbstractMavenIntegr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4747"); + Path testDir = extractResources("mng-4747"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setEnvironmentVariable("MAVEN_OPTS", "-javaagent:agent.jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java index 9c283a250cab..a5123db7eebb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java @@ -18,7 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -43,9 +44,9 @@ public class MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4750"); + Path testDir = extractResources("mng-4750"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4750"); verifier.addCliArgument("-s"); @@ -60,7 +61,7 @@ public void testit() throws Exception { String path = props.getProperty("project.dependencyArtifacts.0.file"); assertNotNull(path); - assertTrue(new File(path).isFile(), path); + assertTrue(Files.isRegularFile(Path.of(path)), path); String version = props.getProperty("project.dependencyArtifacts.0.version"); assertEquals("0.1", version); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java index 4d7cf9c05b49..26b74f320c9a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,10 +40,10 @@ public class MavenITmng4755FetchRemoteMetadataForVersionRangeTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4755"); + Path testDir = extractResources("mng-4755"); // setup: install a local version - Verifier verifier = newVerifier(new File(testDir, "dependency").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("dependency")); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4755"); verifier.deleteDirectory("target"); @@ -52,7 +52,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // test: resolve remote version - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java index 2ff162150c09..c19e64f545eb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4765LocalPomProjectBuilderTest extends AbstractMavenInteg */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4765"); + Path testDir = extractResources("mng-4765"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Duser.prop=OK"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java index cf1982bf9ee9..04b3ca53dfa9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -73,9 +73,9 @@ public void testitDBA() throws Exception { * order. */ private void testit(String test) throws Exception { - File testDir = extractResources("/mng-4768"); + Path testDir = extractResources("mng-4768"); - Verifier verifier = newVerifier(new File(testDir, test).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(test)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4768"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java index ab6e29085166..ff28fa5dd4d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.Deque; import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; @@ -51,7 +51,7 @@ public class MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest ext */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4771"); + Path testDir = extractResources("mng-4771"); final Deque requestedUris = new ConcurrentLinkedDeque<>(); @@ -71,7 +71,7 @@ public void handle( server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java index bab82f733723..6a25c16adddf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -52,7 +52,7 @@ public class MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest ex */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4772"); + Path testDir = extractResources("mng-4772"); final List requestedUris = Collections.synchronizedList(new ArrayList<>()); @@ -72,7 +72,7 @@ public void handle( server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java index e17e99607518..15d1d04ff8b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4776ForkedReactorPluginVersionResolutionTest extends Abst */ @Test public void testitLifecycle() throws Exception { - File testDir = extractResources("/mng-4776"); + Path testDir = extractResources("mng-4776"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub/target"); @@ -61,9 +61,9 @@ public void testitLifecycle() throws Exception { */ @Test public void testitCmdLine() throws Exception { - File testDir = extractResources("/mng-4776"); + Path testDir = extractResources("mng-4776"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java index 025f1d9b995e..c7e5396e2544 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4779"); + Path testDir = extractResources("mng-4779"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("test/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4779"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java index 701969760405..8bd6c4e49123 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.Deque; import java.util.concurrent.ConcurrentLinkedDeque; @@ -110,9 +110,9 @@ protected void tearDown() throws Exception { */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4781"); + Path testDir = extractResources("mng-4781"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-DdeploymentPort=" + port); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java index fead0c8a539f..85e8985657c6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4785TransitiveResolutionInForkedThreadTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4785"); + Path testDir = extractResources("mng-4785"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4785"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java index 7879f427f83e..fd390a292b94 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4788InstallationToCustomLocalRepoTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4788"); + Path testDir = extractResources("mng-4788"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java index 4d67642c9fa6..89266de6db81 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4789ScopeInheritanceMeetsConflictTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4789"); + Path testDir = extractResources("mng-4789"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteArtifacts("org.apache.maven.its.mng4789"); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java index 59bf21f7b37e..4de79901db60 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4791"); + Path testDir = extractResources("mng-4791"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4791"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java index 0c0d9afc950e..895c4245be1c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest ex */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4795"); + Path testDir = extractResources("mng-4795"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("sub/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java index c8899d75a4fa..19d98be989f5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -49,9 +49,9 @@ public void testitBA() throws Exception { * its subtree (x) but in the wider scope (compile). */ private void testit(String test) throws Exception { - File testDir = extractResources("/mng-4800"); + Path testDir = extractResources("mng-4800"); - Verifier verifier = newVerifier(new File(testDir, test).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(test)); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4800"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java index fcb864092969..c1a2c3bf338a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4811CustomComponentConfiguratorTest extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4811"); + Path testDir = extractResources("mng-4811"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java index 861c1ea50e12..66f46c33c074 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng4814ReResolutionOfDependenciesDuringReactorTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4814"); + Path testDir = extractResources("mng-4814"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("consumer/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index e1d9a869d638..61de137d3f3d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4829ChecksumFailureWarningTest extends AbstractMavenInteg */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4829"); + Path testDir = extractResources("mng-4829"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4829"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java index 07dbdd2e0e33..6a784c4e1546 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4834ParentProjectResolvedFromRemoteReposTest extends Abst */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4834"); + Path testDir = extractResources("mng-4834"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4834"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java index d6164070237f..108ad5e20069 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4840MavenPrerequisiteTest extends AbstractMavenIntegratio */ @Test public void testitMojoExecution() throws Exception { - File testDir = extractResources("/mng-4840"); + Path testDir = extractResources("mng-4840"); - Verifier verifier = newVerifier(new File(testDir, "test-1").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("test-1")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4840"); @@ -63,9 +63,9 @@ public void testitMojoExecution() throws Exception { */ @Test public void testitPluginVersionResolution() throws Exception { - File testDir = extractResources("/mng-4840"); + Path testDir = extractResources("mng-4840"); - Verifier verifier = newVerifier(new File(testDir, "test-2").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("test-2")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4840"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java index c137ce3fadbc..6ad74f7a0363 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest extends AbstractM */ @Test public void testitCore() throws Exception { - File testDir = extractResources("/mng-4842"); + Path testDir = extractResources("mng-4842"); - Verifier verifier = newVerifier(new File(testDir, "core").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("core")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4842"); @@ -69,9 +69,9 @@ public void testitCore() throws Exception { */ @Test public void testitPlugin() throws Exception { - File testDir = extractResources("/mng-4842"); + Path testDir = extractResources("mng-4842"); - Verifier verifier = newVerifier(new File(testDir, "plugin").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("plugin")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4842"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java index 83905e0efd8d..e3d430297b63 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4872ReactorResolutionAttachedWithExclusionsTest extends A */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4872"); + Path testDir = extractResources("mng-4872"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4872"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index d8018c0fa414..e8a7fcd495a8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -39,9 +38,9 @@ public class MavenITmng4874UpdateLatestPluginVersionTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4874"); + Path testDir = extractResources("mng-4874"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4874"); @@ -49,8 +48,8 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File metadataFile = new File(testDir, "target/repo/org/apache/maven/its/mng4874/test/maven-metadata.xml"); - String xml = Files.readString(metadataFile.toPath()); + Path metadataFile = testDir.resolve("target/repo/org/apache/maven/its/mng4874/test/maven-metadata.xml"); + String xml = Files.readString(metadataFile); assertTrue(xml.matches("(?s).*0\\.1-SNAPSHOT.*"), xml); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java index 0cfe957aa5d6..11b85a50c793 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4877DeployUsingPrivateKeyTest extends AbstractMavenIntegr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4877"); + Path testDir = extractResources("mng-4877"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-s"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java index 57404567d44b..3d51383962e0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng4883FailUponOverconstrainedVersionRangesTest extends Abst */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4883"); + Path testDir = extractResources("mng-4883"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4883"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java index bee8be147bd4..963071771333 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest extends Abstract */ @Test public void testitAM() throws Exception { - File testDir = extractResources("/mng-4890"); + Path testDir = extractResources("mng-4890"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("mod-a/target"); @@ -65,9 +65,9 @@ public void testitAM() throws Exception { */ @Test public void testitAMD() throws Exception { - File testDir = extractResources("/mng-4890"); + Path testDir = extractResources("mng-4890"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("mod-a/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java index 0bb209f64bfc..e9a7eca7a827 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4891RobustSnapshotResolutionTest extends AbstractMavenInt */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4891"); + Path testDir = extractResources("mng-4891"); - Verifier verifier = newVerifier(new File(testDir, "producer").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("producer")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4891"); @@ -50,7 +50,7 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "consumer").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("consumer")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java index 64c0b17c74a6..5cbd9dbd8eec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4895PluginDepWithNonRelocatedMavenApiTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4895"); + Path testDir = extractResources("mng-4895"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4895"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java index cc2c99e54e4f..e20ea782239c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4913UserPropertyVsDependencyPomPropertyTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4913"); + Path testDir = extractResources("mng-4913"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4913"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java index bdbe5fef5f35..fc4b7c668b37 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng4919LifecycleMappingWithSameGoalTwiceTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4919"); + Path testDir = extractResources("mng-4919"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArguments("clean", "validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java index 2d93ae8d338c..a8cc6c09c767 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4925ContainerLookupRealmDuringMojoExecTest extends Abstra */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4925"); + Path testDir = extractResources("mng-4925"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4925"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java index aad8a499729e..96a1ba44f151 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4936EventSpyTest extends AbstractMavenIntegrationTestCase */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4936"); + Path testDir = extractResources("mng-4936"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // maven.ext.class.path is not unloaded verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index 8061b265b46a..af24096b19ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Map; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -40,9 +39,9 @@ public class MavenITmng4952MetadataReleaseInfoUpdateTest extends AbstractMavenIn */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4952"); + Path testDir = extractResources("mng-4952"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4952"); @@ -63,8 +62,8 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - File metadataFile = new File(testDir, "target/repo/org/apache/maven/its/mng4952/test/maven-metadata.xml"); - String xml = Files.readString(metadataFile.toPath()); + Path metadataFile = testDir.resolve("target/repo/org/apache/maven/its/mng4952/test/maven-metadata.xml"); + String xml = Files.readString(metadataFile); assertTrue(xml.matches("(?s).*2\\.0.*"), xml); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java index a93c85e00f7c..4b2b9e47e7ed 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4955LocalVsRemoteSnapshotResolutionTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4955"); + Path testDir = extractResources("mng-4955"); - Verifier verifier = newVerifier(new File(testDir, "dep").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("dep")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4955"); @@ -50,7 +50,7 @@ public void testit() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-s"); @@ -62,7 +62,7 @@ public void testit() throws Exception { List classpath = verifier.loadLines("target/classpath.txt"); - File jarFile = new File(classpath.get(1).toString()); + Path jarFile = Path.of(classpath.get(1)); assertEquals("eeff09b1b80e823eeb2a615b1d4b09e003e86fd3", ItUtils.calcHash(jarFile, "SHA-1")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java index 995bc2778ef4..7bba730d41de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4960MakeLikeReactorResumeTest extends AbstractMavenIntegr */ @Test public void testitFromUpstream() throws Exception { - File testDir = extractResources("/mng-4960"); + Path testDir = extractResources("mng-4960"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("mod-a/target"); @@ -67,9 +67,9 @@ public void testitFromUpstream() throws Exception { */ @Test public void testitFromDownstream() throws Exception { - File testDir = extractResources("/mng-4960"); + Path testDir = extractResources("mng-4960"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("mod-a/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index 77e2699f46f6..1f1abc9b918c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ public class MavenITmng4963ParentResolutionFromMirrorTest extends AbstractMavenI */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4963"); + Path testDir = extractResources("mng-4963"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4963"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java index e540eddbafec..e8f51213f685 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng4966AbnormalUrlPreservationTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4966"); + Path testDir = extractResources("mng-4966"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java index fe8424d5d0ce..02824c77b433 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng4973ExtensionVisibleToPluginInReactorTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4973"); + Path testDir = extractResources("mng-4973"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("sub-b/target"); verifier.deleteArtifacts("org.apache.maven.its.mng4973"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java index 3bda8f3ce026..f018466ea110 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; @@ -40,9 +40,9 @@ public class MavenITmng4975ProfileInjectedPluginExecutionOrderTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4975"); + Path testDir = extractResources("mng-4975"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Pprofile2,profile1"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java index 08e5ae9ee168..76d05869be9d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ public class MavenITmng4987TimestampBasedSnapshotSelectionTest extends AbstractM */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4987"); + Path testDir = extractResources("mng-4987"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng4987"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index 8a7b4c247f4c..7e3184f4d7e0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.net.InetAddress; import java.util.List; import java.util.Map; @@ -47,10 +47,10 @@ public class MavenITmng4991NonProxyHostsTest extends AbstractMavenIntegrationTes */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4991"); + Path testDir = extractResources("mng-4991"); ResourceHandler resourceHandler = new ResourceHandler(); - resourceHandler.setResourceBase(new File(testDir, "repo").getAbsolutePath()); + resourceHandler.setResourceBase(testDir.resolve("repo").toString()); HandlerList handlers = new HandlerList(); handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()}); @@ -65,7 +65,7 @@ public void testit() throws Exception { Server proxy = new Server(0); proxy.setHandler(new DefaultHandler()); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { server.start(); if (server.isFailed()) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java index 295ca6dcb902..325cdd072632 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng4992MapStylePropertiesParamConfigTest extends AbstractMav */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-4992"); + Path testDir = extractResources("mng-4992"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java index e67616e6ca56..2764414fdc44 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng5000ChildPathAwareUrlInheritanceTest extends AbstractMave */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5000"); + Path testDir = extractResources("mng-5000"); - Verifier verifier = newVerifier(new File(testDir, "different-from-artifactId").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("different-from-artifactId")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java index 6e5057763b92..f27fda08c83b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng5006VersionRangeDependencyParentResolutionTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5006"); + Path testDir = extractResources("mng-5006"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng5006"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java index 3263fab1e567..44d7fc85b434 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ public class MavenITmng5009AggregationCycleTest extends AbstractMavenIntegration */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5009"); + Path testDir = extractResources("mng-5009"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java index c43d778a8667..c781a89d11a1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -37,9 +36,9 @@ public class MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest extend */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5011"); + Path testDir = extractResources("mng-5011"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dconfig.stringParams="); @@ -54,12 +53,12 @@ public void testit() throws Exception { assertEquals("0", props.getProperty("stringParams")); assertEquals("2", props.getProperty("fileParams")); + ItUtils.assertCanonicalFileEquals( + testDir.resolve("foo"), + Path.of(props.getProperty("fileParams.0"))); assertEquals( - new File(testDir, "foo").getCanonicalFile(), - new File(props.getProperty("fileParams.0")).getCanonicalFile()); - assertEquals( - new File(testDir, "bar").getCanonicalFile(), - new File(props.getProperty("fileParams.1")).getCanonicalFile()); + testDir.resolve("bar"), + Path.of(props.getProperty("fileParams.1"))); assertEquals("5", props.getProperty("listParam")); assertEquals("", props.getProperty("listParam.0", "")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java index b09f19bb2fcc..70d393afdc8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java @@ -18,13 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Properties; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * This is a test set for MNG-5012. */ @@ -38,9 +36,9 @@ public class MavenITmng5012CollectionVsArrayParamCoercionTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5012"); + Path testDir = extractResources("mng-5012"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); @@ -48,8 +46,8 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/config.properties"); - assertEquals( - new File(testDir, "src/main/java").getCanonicalFile(), - new File(props.getProperty("stringParams.0")).getCanonicalFile()); + ItUtils.assertCanonicalFileEquals( + testDir.resolve("src/main/java"), + Paths.get(props.getProperty("stringParams.0"))); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java index 78694be42389..a6418210b670 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng5013ConfigureParamBeanFromScalarValueTest extends Abstrac */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5013"); + Path testDir = extractResources("mng-5013"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java index 3add7cc33634..f63e8c1a980c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5019"); + Path testDir = extractResources("mng-5019"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng5019"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index 2c73a358bca1..7c57634c5425 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -54,7 +54,7 @@ public class MavenITmng5064SuppressSnapshotUpdatesTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5064"); + Path testDir = extractResources("mng-5064"); String metadataUri = "org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/maven-metadata.xml"; @@ -71,7 +71,7 @@ public void handle( }; ResourceHandler repoHandler = new ResourceHandler(); - repoHandler.setResourceBase(testDir.getAbsolutePath()); + repoHandler.setResourceBase(testDir.toString()); HandlerList handlerList = new HandlerList(); handlerList.addHandler(logHandler); @@ -82,7 +82,7 @@ public void handle( server.setHandler(handlerList); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java index c55b98f86bb7..7fb75b9d0d1a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest extend */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5096"); + Path testDir = extractResources("mng-5096"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng5096"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java index 0200c5d828a0..47d3dd9a6adc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Properties; @@ -42,9 +42,9 @@ public class MavenITmng5102MixinsTest extends AbstractMavenIntegrationTestCase { */ @Test public void testWithPath() throws Exception { - File testDir = extractResources("/mng-5102-mixins/path"); + Path testDir = extractResources("mng-5102-mixins/path"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng5102"); @@ -76,9 +76,9 @@ public void testWithPath() throws Exception { */ @Test public void testWithGav() throws Exception { - File testDir = extractResources("/mng-5102-mixins/gav"); + Path testDir = extractResources("mng-5102-mixins/gav"); - Verifier verifier = newVerifier(new File(testDir, "mixin-2").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mixin-2")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -87,7 +87,7 @@ public void testWithGav() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "project").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("project")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -112,9 +112,9 @@ public void testWithGav() throws Exception { */ @Test public void testWithClassifier() throws Exception { - File testDir = extractResources("/mng-5102-mixins/classifier"); + Path testDir = extractResources("mng-5102-mixins/classifier"); - Verifier verifier = newVerifier(new File(testDir, "mixin-4").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mixin-4")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -123,7 +123,7 @@ public void testWithClassifier() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "project").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("project")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java index 2e548e93fd58..225c5a321882 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng5135AggregatorDepResolutionModuleExtensionTest extends Ab */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5135"); + Path testDir = extractResources("mng-5135"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng5135"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java index e234f0f62e90..d69cdf5d7573 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng5137ReactorResolutionInForkedBuildTest extends AbstractMa */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5137"); + Path testDir = extractResources("mng-5137"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("producer/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java index 56a6418da7bc..4fc3304091ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -97,9 +97,9 @@ protected void tearDown() throws Exception { */ @Test public void testmng5175ReadTimeOutFromSettings() throws Exception { - File testDir = extractResources("/mng-5175"); + Path testDir = extractResources("mng-5175"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Map filterProps = new HashMap<>(); filterProps.put("@port@", Integer.toString(port)); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java index 5711fac504f7..890a89683b87 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -33,13 +33,13 @@ public class MavenITmng5208EventSpyParallelTest extends AbstractMavenIntegration */ @Test public void testCorrectModuleFails() throws Exception { - File testDir = extractResources("/mng-5208"); + Path testDir = extractResources("mng-5208"); - Verifier spy = newVerifier(testDir.getAbsolutePath() + "/spy"); + Verifier spy = newVerifier(testDir.toString() + "/spy"); spy.addCliArgument("install"); spy.execute(); - Verifier verifier = newVerifier(testDir.getAbsolutePath() + "/project"); + Verifier verifier = newVerifier(testDir.toString() + "/project"); verifier.setForkJvm(true); // maven.ext.class.path used verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java index 1ad7247fad5b..9255a3ec734c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ public class MavenITmng5214DontMapWsdlToJar extends AbstractMavenIntegrationTest */ @Test public void testitTestPhase() throws Exception { - File setupDir = extractResources("/mng-5214/dependency"); + Path setupDir = extractResources("mng-5214/dependency"); - Verifier setupVerifier = newVerifier(setupDir.getAbsolutePath()); + Verifier setupVerifier = newVerifier(setupDir); setupVerifier.setAutoclean(false); setupVerifier.addCliArgument("-X"); setupVerifier.deleteDirectory("target"); @@ -48,9 +48,9 @@ public void testitTestPhase() throws Exception { setupVerifier.addCliArgument("generate-resources"); setupVerifier.execute(); - File testDir = extractResources("/mng-5214"); + Path testDir = extractResources("mng-5214"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("consumer/target"); verifier.deleteDirectory("dependency/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java index 2cde44c4fdb4..66812c74a989 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -43,9 +43,9 @@ public class MavenITmng5222MojoDeprecatedTest extends AbstractMavenIntegrationTe */ @Test public void testEmptyConfiguration() throws Exception { - File testDir = extractResources("/mng-5222-mojo-deprecated-params"); + Path testDir = extractResources("mng-5222-mojo-deprecated-params"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-empty-configuration.txt"); @@ -89,9 +89,9 @@ public void testEmptyConfiguration() throws Exception { */ @Test public void testDeprecatedProperty() throws Exception { - File testDir = extractResources("/mng-5222-mojo-deprecated-params"); + Path testDir = extractResources("mng-5222-mojo-deprecated-params"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-Dconfig.deprecatedParam2=deprecatedValueInProps"); verifier.addCliArgument("-Dconfig.deprecatedArray=3,2,4,deprecated"); verifier.addCliArgument("-Dconfig.deprecatedList=4,5,deprecated"); @@ -162,9 +162,9 @@ public void testDeprecatedProperty() throws Exception { */ @Test public void testDeprecatedConfig() throws Exception { - File testDir = extractResources("/mng-5222-mojo-deprecated-params"); + Path testDir = extractResources("mng-5222-mojo-deprecated-params"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-Pconfig-values"); verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index 0402e5ec1950..9c83c023f92a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -18,11 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; -import java.io.FileReader; +import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; - import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; @@ -48,10 +48,10 @@ class MavenITmng5224InjectedSettings extends AbstractMavenIntegrationTestCase { */ @Test public void testmng5224ReadSettings() throws Exception { - File testDir = extractResources("/mng-5224"); + Path testDir = extractResources("mng-5224"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-settings").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-settings")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -59,7 +59,7 @@ public void testmng5224ReadSettings() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("--settings"); verifier.addCliArgument("settings.xml"); @@ -67,9 +67,9 @@ public void testmng5224ReadSettings() throws Exception { verifier.addCliArgument("validate"); verifier.execute(); - File settingsFile = new File(verifier.getBasedir(), "target/settings-dump.xml"); + Path settingsFile = verifier.getBasedir().resolve("target/settings-dump.xml"); - FileReader fr = new FileReader(settingsFile); + Reader fr = Files.newBufferedReader(settingsFile); Xpp3Dom dom = Xpp3DomBuilder.build(fr); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java index b5fd901fad2a..bbb1ac8c6cbf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ private void clean(Verifier verifier) throws Exception { */ @Test public void testitMakeWithExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-X"); verifier.setAutoclean(false); clean(verifier); @@ -70,9 +70,9 @@ public void testitMakeWithExclude() throws Exception { */ @Test public void testitMakeUpstreamExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -97,9 +97,9 @@ public void testitMakeUpstreamExclude() throws Exception { */ @Test public void testitMakeDownstreamExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -124,9 +124,9 @@ public void testitMakeDownstreamExclude() throws Exception { */ @Test public void testitMakeBothExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -152,9 +152,9 @@ public void testitMakeBothExclude() throws Exception { */ @Test public void testitMatchesByBasedirExclamationExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.verifyFileNotPresent("mod-d/pom.xml"); @@ -179,9 +179,9 @@ public void testitMatchesByBasedirExclamationExclude() throws Exception { */ @Test public void testitMatchesByBasedirMinusExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.verifyFileNotPresent("mod-d/pom.xml"); @@ -206,9 +206,9 @@ public void testitMatchesByBasedirMinusExclude() throws Exception { */ @Test public void testitMatchesByIdExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -232,9 +232,9 @@ public void testitMatchesByIdExclude() throws Exception { */ @Test public void testitMatchesByArtifactIdExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-pl"); @@ -258,9 +258,9 @@ public void testitMatchesByArtifactIdExclude() throws Exception { */ @Test public void testitResumeFromExclude() throws Exception { - File testDir = extractResources("/mng-5230-make-reactor-with-excludes"); + Path testDir = extractResources("mng-5230-make-reactor-with-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); clean(verifier); verifier.addCliArgument("-rf"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index 008c387796d9..5acbe5bf79bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -18,17 +18,15 @@ */ package org.apache.maven.it; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Map; - +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -45,13 +43,13 @@ * @author Anders Hammar */ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; private Server server; @BeforeEach protected void setUp() throws Exception { - testDir = extractResources("/mng-5280"); + testDir = extractResources("mng-5280"); server = new Server(0); } @@ -79,7 +77,7 @@ public void testRepositoriesOrder() throws Exception { int httpPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); System.out.println("Bound server socket to the port " + httpPort); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -114,7 +112,7 @@ public void testPluginRepositoriesOrder() throws Exception { int httpPort = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); System.out.println("Bound server socket to the port " + httpPort); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -187,14 +185,14 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques OutputStream outStream = response.getOutputStream(); if (uri.endsWith(".pom")) { - File pluginPom = new File(testDir, "fake-maven-plugin/fake-maven-plugin-1.0.pom"); - InputStream inStream = new FileInputStream(pluginPom); + Path pluginPom = testDir.resolve("fake-maven-plugin/fake-maven-plugin-1.0.pom"); + InputStream inStream = Files.newInputStream(pluginPom); copy(inStream, outStream); response.setStatus(HttpServletResponse.SC_OK); } else if (uri.endsWith(".jar")) { - File pluginJar = new File(testDir, "fake-maven-plugin/fake-maven-plugin-1.0.jar"); - InputStream inStream = new FileInputStream(pluginJar); + Path pluginJar = testDir.resolve("fake-maven-plugin/fake-maven-plugin-1.0.jar"); + InputStream inStream = Files.newInputStream(pluginJar); copy(inStream, outStream); response.setStatus(HttpServletResponse.SC_OK); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java index 758a688903e8..568d004e88c6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,16 +29,16 @@ */ public class MavenITmng5338FileOptionToDirectory extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; @BeforeEach public void setUp() throws Exception { - testDir = extractResources("/mng-5338"); + testDir = extractResources("mng-5338"); } @Test public void testFileOptionToADirectory() throws Exception { - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index 2f79dca26f31..cca490145e88 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,13 +27,13 @@ * * @author Jason van Zyl */ -public class MavenITmng5382Jsr330Plugin extends AbstractMavenIntegrationTestCase { +class MavenITmng5382Jsr330Plugin extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; @BeforeEach public void setUp() throws Exception { - testDir = extractResources("/mng-5382"); + testDir = extractResources("mng-5382"); } @Test @@ -42,7 +41,7 @@ public void testJsr330PluginExecution() throws Exception { // // Build a plugin that uses a JSR330 plugin // - Verifier v0 = newVerifier(testDir.getAbsolutePath()); + Verifier v0 = newVerifier(testDir); v0.setAutoclean(false); v0.deleteDirectory("target"); v0.deleteArtifacts("org.apache.maven.its.mng5382"); @@ -53,7 +52,7 @@ public void testJsr330PluginExecution() throws Exception { // // Execute the JSR330 plugin // - Verifier v1 = newVerifier(testDir.getAbsolutePath()); + Verifier v1 = newVerifier(testDir); v1.setAutoclean(false); v1.addCliArgument("org.apache.maven.its.mng5382:jsr330-maven-plugin:0.0.1-SNAPSHOT:hello"); v1.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java index eda8c59b34ed..87a892577c06 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,16 +27,16 @@ public class MavenITmng5387ArtifactReplacementPlugin extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; @BeforeEach public void setUp() throws Exception { - testDir = extractResources("/mng-5387"); + testDir = extractResources("mng-5387"); } @Test public void testArtifactReplacementExecution() throws Exception { - Verifier v0 = newVerifier(testDir.getAbsolutePath()); + Verifier v0 = newVerifier(testDir); v0.setAutoclean(false); v0.deleteDirectory("target"); v0.deleteArtifacts("org.apache.maven.its.mng5387"); @@ -45,8 +44,8 @@ public void testArtifactReplacementExecution() throws Exception { v0.execute(); v0.verifyErrorFreeLog(); - String path = v0.getArtifactPath("org.apache.maven.its.mng5387", "mng5387-it", "0.0.1-SNAPSHOT", "txt", "c"); - String contents = Files.readString(new File(path).toPath()); + Path path = v0.getArtifactPath("org.apache.maven.its.mng5387", "mng5387-it", "0.0.1-SNAPSHOT", "txt", "c"); + String contents = Files.readString(path); assertTrue(contents.contains("This is the second file")); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java index 57cc0e9c8389..3b7410a9b16a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,20 +26,20 @@ public class MavenITmng5389LifecycleParticipantAfterSessionEnd extends AbstractM @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5389-lifecycleParticipant-afterSession"); - File extensionDir = new File(testDir, "extension"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5389-lifecycleParticipant-afterSession"); + Path extensionDir = testDir.resolve("extension"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test plugin - verifier = newVerifier(extensionDir.getAbsolutePath()); + verifier = newVerifier(extensionDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("package"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java index 5f5fa22394d0..b49dd07568b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,10 +34,10 @@ public class MavenITmng5445LegacyStringSearchModelInterpolatorTest extends Abstr */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5445"); + Path testDir = extractResources("mng-5445"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "maven-it-plugin-model-interpolation").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("maven-it-plugin-model-interpolation")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -45,7 +45,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java index 0871f9b23db4..5d0d671774db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ public class MavenITmng5452MavenBuildTimestampUTCTest extends AbstractMavenInteg @Test public void testMavenBuildTimestampIsUsingUTC() throws Exception { - File testDir = extractResources("/mng-5452-maven-build-timestamp-utc"); + Path testDir = extractResources("mng-5452-maven-build-timestamp-utc"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("process-resources"); verifier.execute(); // diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java index 61996c425e62..9bcd4e0f7d80 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.List; import java.util.regex.Pattern; @@ -55,15 +55,15 @@ public void testPluginSite() throws IOException, VerificationException { }*/ public void check(String dir) throws IOException, VerificationException { - File testDir = extractResources("/mng-5482/" + dir); + Path testDir = extractResources("mng-5482/" + dir); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("validate"); assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution."); - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); int msg = indexOf(lines, "Caused by: java.lang.ClassNotFoundException: org.sonatype.aether.+"); assertTrue(msg >= 0, "ClassNotFoundException message was not found in output."); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index 8ee99fa75db0..8e69b7c99ff8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -29,20 +28,20 @@ class MavenITmng5530MojoExecutionScopeTest extends AbstractMavenIntegrationTestC @Test public void testCopyfiles() throws Exception { - File testDir = extractResources("/mng-5530-mojo-execution-scope"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5530-mojo-execution-scope"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("package"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -54,20 +53,20 @@ public void testCopyfiles() throws Exception { @Test public void testCopyfilesMultithreaded() throws Exception { - File testDir = extractResources("/mng-5530-mojo-execution-scope"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5530-mojo-execution-scope"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("--builder"); verifier.addCliArgument("multithreaded"); verifier.addCliArgument("-T"); @@ -83,28 +82,28 @@ public void testCopyfilesMultithreaded() throws Exception { @Test public void testExtension() throws Exception { - File testDir = extractResources("/mng-5530-mojo-execution-scope"); - File extensionDir = new File(testDir, "extension"); - File pluginDir = new File(testDir, "extension-plugin"); - File projectDir = new File(testDir, "extension-project"); + Path testDir = extractResources("mng-5530-mojo-execution-scope"); + Path extensionDir = testDir.resolve("extension"); + Path pluginDir = testDir.resolve("extension-plugin"); + Path projectDir = testDir.resolve("extension-project"); Verifier verifier; // install the test extension - verifier = newVerifier(extensionDir.getAbsolutePath()); + verifier = newVerifier(extensionDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); - verifier.addCliArgument("-Dmaven.ext.class.path=" + new File(extensionDir, "target/classes").getAbsolutePath()); + verifier = newVerifier(projectDir); + verifier.addCliArgument("-Dmaven.ext.class.path=" + extensionDir.resolve("target/classes")); verifier.setForkJvm(true); // verifier does not support custom realms in embedded mode verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java index a4effa76367b..0d5b3d0db87f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,24 +26,24 @@ public class MavenITmng5561PluginRelocationLosesConfigurationTest extends Abstra @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5561-plugin-relocation-loses-configuration"); - File oldPluginWithRelocationDir = new File(testDir, "old-plugin-with-relocation"); - File newPluginDir = new File(testDir, "new-plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-5561-plugin-relocation-loses-configuration"); + Path oldPluginWithRelocationDir = testDir.resolve("old-plugin-with-relocation"); + Path newPluginDir = testDir.resolve("new-plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(oldPluginWithRelocationDir.getAbsolutePath()); + verifier = newVerifier(oldPluginWithRelocationDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(newPluginDir.getAbsolutePath()); + verifier = newVerifier(newPluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java index 9d70cf8dabe6..ce4289072cae 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,10 +38,10 @@ public class MavenITmng5572ReactorPluginExtensionsTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5572-reactor-plugin-extensions"); + Path testDir = extractResources("mng-5572-reactor-plugin-extensions"); // plugin must be available in local repo, otherwise the project couldn't be built - Verifier setup = newVerifier(testDir.getAbsolutePath()); + Verifier setup = newVerifier(testDir); setup.setAutoclean(true); setup.addCliArgument("-f"); setup.addCliArgument("plugin/pom.xml"); @@ -49,7 +49,7 @@ public void testit() throws Exception { setup.execute(); setup.verifyErrorFreeLog(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log2.txt"); verifier.setAutoclean(false); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java index 28f550c40f7e..3c718c29b992 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.Properties; @@ -42,9 +42,9 @@ public class MavenITmng5576CdFriendlyVersions extends AbstractMavenIntegrationTe */ @Test public void testContinuousDeliveryFriendlyVersionsAreWarningFreeWithoutBuildConsumer() throws Exception { - File testDir = extractResources("/mng-5576-cd-friendly-versions"); + Path testDir = extractResources("mng-5576-cd-friendly-versions"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("-Dchangelist=changelist"); @@ -56,7 +56,7 @@ public void testContinuousDeliveryFriendlyVersionsAreWarningFreeWithoutBuildCons Properties props = verifier.loadProperties("target/pom.properties"); assertEquals("1.0.0.changelist", props.getProperty("project.version")); - List lines = verifier.loadFile(new File(testDir, "log.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log.txt")); boolean seenScanning = false; for (String line : lines) { seenScanning |= line.contains("Scanning for projects"); @@ -74,9 +74,9 @@ public void testContinuousDeliveryFriendlyVersionsAreWarningFreeWithoutBuildCons */ @Test public void testContinuousDeliveryFriendlyVersionsAreWarningFreeWithBuildConsumer() throws Exception { - File testDir = extractResources("/mng-5576-cd-friendly-versions"); + Path testDir = extractResources("mng-5576-cd-friendly-versions"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-bc.txt"); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -89,7 +89,7 @@ public void testContinuousDeliveryFriendlyVersionsAreWarningFreeWithBuildConsume Properties props = verifier.loadProperties("target/pom.properties"); assertEquals("1.0.0.changelist", props.getProperty("project.version")); - List lines = verifier.loadFile(new File(testDir, "log-bc.txt"), false); + List lines = verifier.loadFile(testDir.resolve("log-bc.txt")); boolean seenScanning = false; for (String line : lines) { seenScanning |= line.contains("Scanning for projects"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java index a631104db912..0b562ee463fe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java @@ -18,28 +18,27 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng5578SessionScopeTest extends AbstractMavenIntegrationTestCase { @Test public void testBasic() throws Exception { - File testDir = extractResources("/mng-5578-session-scope"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5578-session-scope"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("-Dit-build-extensions=false"); verifier.addCliArgument("package"); verifier.execute(); @@ -48,20 +47,20 @@ public void testBasic() throws Exception { @Test public void testBasicMultithreaded() throws Exception { - File testDir = extractResources("/mng-5578-session-scope"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5578-session-scope"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("-Dit-build-extensions=false"); verifier.addCliArgument("--builder"); verifier.addCliArgument("multithreaded"); @@ -74,20 +73,20 @@ public void testBasicMultithreaded() throws Exception { @Test public void testBasicBuildExtension() throws Exception { - File testDir = extractResources("/mng-5578-session-scope"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5578-session-scope"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("-Dit-build-extensions=true"); verifier.addCliArgument("package"); verifier.execute(); @@ -96,28 +95,28 @@ public void testBasicBuildExtension() throws Exception { @Test public void testExtension() throws Exception { - File testDir = extractResources("/mng-5578-session-scope"); - File extensionDir = new File(testDir, "extension"); - File pluginDir = new File(testDir, "extension-plugin"); - File projectDir = new File(testDir, "extension-project"); + Path testDir = extractResources("mng-5578-session-scope"); + Path extensionDir = testDir.resolve("extension"); + Path pluginDir = testDir.resolve("extension-plugin"); + Path projectDir = testDir.resolve("extension-project"); Verifier verifier; // install the test extension - verifier = newVerifier(extensionDir.getAbsolutePath()); + verifier = newVerifier(extensionDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); - verifier.addCliArgument("-Dmaven.ext.class.path=" + new File(extensionDir, "target/classes").getAbsolutePath()); + verifier = newVerifier(projectDir); + verifier.addCliArgument("-Dmaven.ext.class.path=" + extensionDir.resolve("target/classes")); verifier.setForkJvm(true); // verifier does not support custom realms in embedded mode verifier.addCliArgument("package"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java index 734fe8e956aa..1fa3c0e86a39 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,27 +34,27 @@ public void testCustomLifecycle() throws Exception { * run "test-only" build phase and that it does not run maven-compiler-plugin. */ - File testDir = extractResources("/mng-5581-lifecycle-mapping-delegate"); - File extensionDir = new File(testDir, "extension"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5581-lifecycle-mapping-delegate"); + Path extensionDir = testDir.resolve("extension"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test extension - verifier = newVerifier(extensionDir.getAbsolutePath()); + verifier = newVerifier(extensionDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // compile the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("compile-log.txt"); verifier.addCliArgument("compile"); verifier.execute(); verifier.verifyErrorFreeLog(); // run custom "test-only" build phase - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.setLogFileName("test-only-log.txt"); verifier.setForkJvm(true); // TODO: why? verifier.addCliArgument("-X"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java index 4809c0b8ffd7..33baa11561e9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng5591WorkspaceReader extends AbstractMavenIntegrationTestCase { @@ -34,22 +33,22 @@ public void testWorkspaceReader() throws Exception { * line argument. The multi-module build fails unless reactor resolution works properly. */ - File testDir = extractResources("/mng-5591-workspace-reader"); - File extensionDir = new File(testDir, "extension"); - File projectDir = new File(testDir, "basic"); + Path testDir = extractResources("mng-5591-workspace-reader"); + Path extensionDir = testDir.resolve("extension"); + Path projectDir = testDir.resolve("basic"); Verifier verifier; // install the test extension - verifier = newVerifier(extensionDir.getAbsolutePath()); + verifier = newVerifier(extensionDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // compile the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("-Dmaven.ext.class.path=" - + new File(extensionDir, "target/mng-5591-workspace-reader-extension-0.1.jar").getCanonicalPath()); + + extensionDir.resolve("target/mng-5591-workspace-reader-extension-0.1.jar")); verifier.addCliArgument("compile"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java index 0880736d789c..8aeadf7a48c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ class MavenITmng5600DependencyManagementImportExclusionsTest extends AbstractMav @Test public void testCanExcludeDependenciesFromImport() throws Exception { - final File testDir = extractResources("/mng-5600/exclusions"); + final Path testDir = extractResources("mng-5600/exclusions"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.filterFile("../settings-template.xml", "settings.xml", verifier.newDefaultFilterMap()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java index cd4ad900d348..8951ed078287 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java @@ -18,10 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ public class MavenITmng5608ProfileActivationWarningTest extends AbstractMavenInt @Test public void testitMNG5608() throws Exception { - File testDir = extractResources("/mng-5608-profile-activation-warning"); + Path testDir = extractResources("mng-5608-profile-activation-warning"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -58,9 +58,9 @@ public void testitMNG5608() throws Exception { assertNotNull(findWarning(logFile, "mng-5608-missing-project.basedir")); } - private void assertFileExists(File dir, String filename) { - File file = new File(dir, filename); - assertTrue(file.exists(), "expected file: " + file); + private void assertFileExists(Path dir, String filename) { + Path file = dir.resolve(filename); + assertTrue(Files.exists(file), "expected file: " + file); } private String findWarning(List logLines, String profileId) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java index 9c6858ab4099..1cfb11f31a03 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -30,9 +30,9 @@ public class MavenITmng5639ImportScopePomResolutionTest extends AbstractMavenInt @Test public void testitMNG5639() throws Exception { - File testDir = extractResources("/mng-5639-import-scope-pom-resolution"); + Path testDir = extractResources("mng-5639-import-scope-pom-resolution"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng5639"); verifier.filterFile("settings-template.xml", "settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java index 9cf69bb0611b..7e31d6ae854c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -40,19 +40,19 @@ class MavenITmng5640LifecycleParticipantAfterSessionEnd extends AbstractMavenInt */ @Test public void testBuildFailureUTFail() throws Exception { - File testDir = extractResources("/mng-5640-lifecycleParticipant-afterSession"); - File extensionDir = new File(testDir, "extension"); - File projectDir = new File(testDir, "buildfailure-utfail"); + Path testDir = extractResources("mng-5640-lifecycleParticipant-afterSession"); + Path extensionDir = testDir.resolve("extension"); + Path projectDir = testDir.resolve("buildfailure-utfail"); Verifier verifier; // install the test plugin - verifier = newVerifier(extensionDir.getAbsolutePath(), "remote"); + verifier = newVerifier(extensionDir.toString(), "remote"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath(), "remote"); + verifier = newVerifier(projectDir.toString(), "remote"); verifier.addCliArgument("package"); assertThrows(VerificationException.class, verifier::execute, "The build should fail"); verifier.verifyTextInLog("testApp(org.apache.maven.its.mng5640.FailingTest)"); @@ -70,19 +70,19 @@ public void testBuildFailureUTFail() throws Exception { */ @Test public void testBuildFailureMissingDependency() throws Exception { - File testDir = extractResources("/mng-5640-lifecycleParticipant-afterSession"); - File extensionDir = new File(testDir, "extension"); - File projectDir = new File(testDir, "buildfailure-depmissing"); + Path testDir = extractResources("mng-5640-lifecycleParticipant-afterSession"); + Path extensionDir = testDir.resolve("extension"); + Path projectDir = testDir.resolve("buildfailure-depmissing"); Verifier verifier; // install the test plugin - verifier = newVerifier(extensionDir.getAbsolutePath(), "remote"); + verifier = newVerifier(extensionDir.toString(), "remote"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath(), "remote"); + verifier = newVerifier(projectDir.toString(), "remote"); verifier.addCliArgument("package"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "The build should fail"); @@ -100,26 +100,26 @@ public void testBuildFailureMissingDependency() throws Exception { */ @Test public void testBuildError() throws Exception { - File testDir = extractResources("/mng-5640-lifecycleParticipant-afterSession"); - File extensionDir = new File(testDir, "extension"); - File pluginDir = new File(testDir, "badplugin"); - File projectDir = new File(testDir, "builderror-mojoex"); + Path testDir = extractResources("mng-5640-lifecycleParticipant-afterSession"); + Path extensionDir = testDir.resolve("extension"); + Path pluginDir = testDir.resolve("badplugin"); + Path projectDir = testDir.resolve("builderror-mojoex"); Verifier verifier; // install the test plugin - verifier = newVerifier(extensionDir.getAbsolutePath(), "remote"); + verifier = newVerifier(extensionDir.toString(), "remote"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // install the bad plugin - verifier = newVerifier(pluginDir.getAbsolutePath(), "remote"); + verifier = newVerifier(pluginDir.toString(), "remote"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath(), "remote"); + verifier = newVerifier(projectDir.toString(), "remote"); verifier.addCliArgument("package"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "The build should fail"); @@ -137,26 +137,26 @@ public void testBuildError() throws Exception { */ @Test public void testBuildErrorRt() throws Exception { - File testDir = extractResources("/mng-5640-lifecycleParticipant-afterSession"); - File extensionDir = new File(testDir, "extension"); - File pluginDir = new File(testDir, "badplugin"); - File projectDir = new File(testDir, "builderror-runtimeex"); + Path testDir = extractResources("mng-5640-lifecycleParticipant-afterSession"); + Path extensionDir = testDir.resolve("extension"); + Path pluginDir = testDir.resolve("badplugin"); + Path projectDir = testDir.resolve("builderror-runtimeex"); Verifier verifier; // install the test plugin - verifier = newVerifier(extensionDir.getAbsolutePath(), "remote"); + verifier = newVerifier(extensionDir.toString(), "remote"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // install the bad plugin - verifier = newVerifier(pluginDir.getAbsolutePath(), "remote"); + verifier = newVerifier(pluginDir.toString(), "remote"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath(), "remote"); + verifier = newVerifier(projectDir.toString(), "remote"); verifier.addCliArgument("package"); VerificationException exception = assertThrows(VerificationException.class, verifier::execute, "The build should fail"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java index 2f4c061f6aa1..d365cd242b95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.Properties; @@ -30,8 +30,8 @@ public class MavenITmng5659ProjectSettingsTest extends AbstractMavenIntegrationT @Test public void testProjectSettings() throws IOException, VerificationException { - File testDir = extractResources("/mng-5659-project-settings"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-5659-project-settings"); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java index 1542bc5d5e95..9ebf89c4894c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng5663NestedImportScopePomResolutionTest extends AbstractMa @Test public void testitMNG5639() throws Exception { - File testDir = extractResources("/mng-5663-nested-import-scope-pom-resolution"); + Path testDir = extractResources("mng-5663-nested-import-scope-pom-resolution"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng5663"); verifier.filterFile("pom-template.xml", "pom.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java index 10ef38018b7e..34c06638a196 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5668AfterPhaseExecutionTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -34,9 +34,9 @@ class MavenITmng5668AfterPhaseExecutionTest extends AbstractMavenIntegrationTest @Test void testAfterPhaseExecutionOnFailure() throws Exception { - File testDir = extractResources("/mng-5668-after-phase-execution"); + Path testDir = extractResources("mng-5668-after-phase-execution"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -56,9 +56,9 @@ void testAfterPhaseExecutionOnFailure() throws Exception { verifier.verifyFilePresent("target/after-verify.txt"); // Verify the execution order through timestamps - long beforeTime = new File(testDir, "target/before-verify.txt").lastModified(); - long failTime = new File(testDir, "target/verify-failed.txt").lastModified(); - long afterTime = new File(testDir, "target/after-verify.txt").lastModified(); + long beforeTime = Files.getLastModifiedTime(testDir.resolve("target/before-verify.txt")).toMillis(); + long failTime = Files.getLastModifiedTime(testDir.resolve("target/verify-failed.txt")).toMillis(); + long afterTime = Files.getLastModifiedTime(testDir.resolve("target/after-verify.txt")).toMillis(); assertTrue(beforeTime <= failTime); assertTrue(failTime <= afterTime); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java index 0844925cc16f..d35a0546e4da 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java @@ -18,14 +18,13 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -42,11 +41,11 @@ public class MavenITmng5669ReadPomsOnce extends AbstractMavenIntegrationTestCase @Test public void testWithoutBuildConsumer() throws Exception { // prepare JavaAgent - File testDir = extractResources("/mng-5669-read-poms-once"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-5669-read-poms-once"); + Verifier verifier = newVerifier(testDir); Map filterProperties = Collections.singletonMap( "${javaAgentJar}", - verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar")); + verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar").toString()); verifier.filterFile(".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties); verifier.setForkJvm(true); // pick up agent @@ -77,11 +76,11 @@ public void testWithoutBuildConsumer() throws Exception { @Test public void testWithBuildConsumer() throws Exception { // prepare JavaAgent - File testDir = extractResources("/mng-5669-read-poms-once"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-5669-read-poms-once"); + Verifier verifier = newVerifier(testDir); Map filterProperties = Collections.singletonMap( "${javaAgentJar}", - verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar")); + verifier.getArtifactPath("org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar").toString()); verifier.filterFile(".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties); verifier.setLogFileName("log-bc.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java index 453e862a21af..ba1a4c196d74 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java @@ -18,10 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Map; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; @@ -39,17 +39,17 @@ public class MavenITmng5716ToolchainsTypeTest extends AbstractMavenIntegrationTe */ @Test public void testitMNG5716() throws Exception { - File testDir = extractResources("/mng-5716-toolchains-type"); + Path testDir = extractResources("mng-5716-toolchains-type"); - File javaHome = new File(testDir, "javaHome"); - javaHome.mkdirs(); - new File(javaHome, "bin").mkdirs(); - new File(javaHome, "bin/javac").createNewFile(); - new File(javaHome, "bin/javac.exe").createNewFile(); + Path javaHome = testDir.resolve("javaHome"); + Path bin = javaHome.resolve("bin"); + Files.createDirectories(bin); + ItUtils.createFile(bin.resolve("javac")); + ItUtils.createFile(bin.resolve("javac.exe")); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Map properties = verifier.newDefaultFilterMap(); - properties.put("@javaHome@", javaHome.getAbsolutePath()); + properties.put("@javaHome@", javaHome.toAbsolutePath().toString()); verifier.filterFile("toolchains.xml", "toolchains.xml", properties); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java index 0de6d8563dff..9df90fb51bdd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,26 +28,26 @@ public class MavenITmng5742BuildExtensionClassloaderTest extends AbstractMavenIn @Test public void testBuildExtensionClassloader() throws Exception { - File testDir = extractResources("/mng-5742-build-extension-classloader"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-5742-build-extension-classloader"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); verifier.verifyFilePresent("target/execution-success.txt"); - String actual = Files.readString(new File(projectDir, "target/execution-success.txt").toPath()); + String actual = Files.readString(projectDir.resolve("target/execution-success.txt")); assertEquals("executed", actual); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java index 2e9a3656988b..1f927fb12879 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.nio.file.Files; import org.junit.jupiter.api.Test; @@ -29,33 +29,33 @@ public class MavenITmng5753CustomMojoExecutionConfiguratorTest extends AbstractM @Test public void testCustomMojoExecutionConfigurator() throws Exception { - File testDir = extractResources("/mng-5753-custom-mojo-execution-configurator"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-5753-custom-mojo-execution-configurator"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - File configurationFile = new File(projectDir, "configuration.txt"); - configurationFile.delete(); + Path configurationFile = projectDir.resolve("configuration.txt"); + Files.deleteIfExists(configurationFile); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyFilePresent(configurationFile.getCanonicalPath()); + verifier.verifyFilePresent(configurationFile); // // The element in the original configuration is "ORIGINAL". We want to assert that our // custom MojoExecutionConfigurator made the transformation of the element from "ORIGINAL" to "TRANSFORMED" // - String actual = Files.readString(configurationFile.toPath()); + String actual = Files.readString(configurationFile); assertEquals("TRANSFORMED", actual); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java index f5adf30f8e26..74e6876b2f83 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -39,17 +38,17 @@ * @since 4.0.0-alpha-1 */ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTestCase { - private final File parentDependentTestDir; - private final File parentIndependentTestDir; - private final File noProjectTestDir; - private final File fourModulesTestDir; + private final Path parentDependentTestDir; + private final Path parentIndependentTestDir; + private final Path noProjectTestDir; + private final Path fourModulesTestDir; public MavenITmng5760ResumeFeatureTest() throws IOException { super(); - this.parentDependentTestDir = extractResources("/mng-5760-resume-feature/parent-dependent"); - this.parentIndependentTestDir = extractResources("/mng-5760-resume-feature/parent-independent"); - this.noProjectTestDir = extractResources("/mng-5760-resume-feature/no-project"); - this.fourModulesTestDir = extractResources("/mng-5760-resume-feature/four-modules"); + this.parentDependentTestDir = extractResources("mng-5760-resume-feature/parent-dependent"); + this.parentIndependentTestDir = extractResources("mng-5760-resume-feature/parent-independent"); + this.noProjectTestDir = extractResources("mng-5760-resume-feature/no-project"); + this.fourModulesTestDir = extractResources("mng-5760-resume-feature/four-modules"); } /** @@ -59,7 +58,7 @@ public MavenITmng5760ResumeFeatureTest() throws IOException { */ @Test public void testShouldSuggestToResumeWithoutArgs() throws Exception { - Verifier verifier = newVerifier(parentDependentTestDir.getAbsolutePath()); + Verifier verifier = newVerifier(parentDependentTestDir); verifier.addCliArgument("-Dmodule-b.fail=true"); try { @@ -72,7 +71,7 @@ public void testShouldSuggestToResumeWithoutArgs() throws Exception { } // New build with -r should resume the build from module-b, skipping module-a since it has succeeded already. - verifier = newVerifier(parentDependentTestDir.getAbsolutePath()); + verifier = newVerifier(parentDependentTestDir); verifier.addCliArgument("-r"); verifier.addCliArgument("test"); verifier.execute(); @@ -83,7 +82,7 @@ public void testShouldSuggestToResumeWithoutArgs() throws Exception { @Test public void testShouldSkipSuccessfulProjects() throws Exception { - Verifier verifier = newVerifier(parentDependentTestDir.getAbsolutePath()); + Verifier verifier = newVerifier(parentDependentTestDir); verifier.addCliArgument("-Dmodule-a.fail=true"); verifier.addCliArgument("--fail-at-end"); @@ -96,7 +95,7 @@ public void testShouldSkipSuccessfulProjects() throws Exception { } // Let module-b and module-c fail, if they would have been built... - verifier = newVerifier(parentDependentTestDir.getAbsolutePath()); + verifier = newVerifier(parentDependentTestDir); verifier.addCliArgument("-Dmodule-b.fail=true"); verifier.addCliArgument("-Dmodule-c.fail=true"); // ... but adding -r should exclude those two from the build because the previous Maven invocation @@ -111,7 +110,7 @@ public void testShouldSkipSuccessfulModulesWhenTheFirstModuleFailed() throws Exc // In this multi-module project, the submodules are not dependent on the parent. // This results in the parent to be built last, and module-a to be built first. // This enables us to let the first module in the reactor (module-a) fail. - Verifier verifier = newVerifier(parentIndependentTestDir.getAbsolutePath()); + Verifier verifier = newVerifier(parentIndependentTestDir); verifier.addCliArgument("-Dmodule-a.fail=true"); verifier.addCliArgument("--fail-at-end"); @@ -123,7 +122,7 @@ public void testShouldSkipSuccessfulModulesWhenTheFirstModuleFailed() throws Exc verifier.verifyTextInLog("mvn [args] -r"); } - verifier = newVerifier(parentIndependentTestDir.getAbsolutePath()); + verifier = newVerifier(parentIndependentTestDir); verifier.addCliArgument("-r"); verifier.addCliArgument("test"); verifier.execute(); @@ -137,7 +136,7 @@ public void testShouldNotCrashWithoutProject() throws Exception { // As reported in JIRA this would previously break with a NullPointerException. // (see // https://issues.apache.org/jira/browse/MNG-5760?focusedCommentId=17143795&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-17143795) - final Verifier verifier = newVerifier(noProjectTestDir.getAbsolutePath()); + final Verifier verifier = newVerifier(noProjectTestDir); try { verifier.addCliArgument("org.apache.maven.plugins:maven-resources-plugin:resources"); verifier.execute(); @@ -158,7 +157,7 @@ public void testFailureWithParallelBuild() throws Exception { // b : success // c : failure // d : skipped - Verifier verifier = newVerifier(fourModulesTestDir.getAbsolutePath()); + Verifier verifier = newVerifier(fourModulesTestDir); verifier.addCliArgument("-T2"); verifier.addCliArgument("-Dmodule-a.delay=1000"); verifier.addCliArgument("-Dmodule-a.fail=true"); @@ -172,7 +171,7 @@ public void testFailureWithParallelBuild() throws Exception { } // Let module-b fail, if it would have been built... - verifier = newVerifier(fourModulesTestDir.getAbsolutePath()); + verifier = newVerifier(fourModulesTestDir); verifier.addCliArgument("-T2"); verifier.addCliArgument("-Dmodule-b.fail=true"); // ... but adding -r should exclude it from the build because the previous Maven invocation @@ -199,7 +198,7 @@ public void testFailureAfterSkipWithParallelBuild() throws Exception { // b : success, slow // c : skipped // d : failure - Verifier verifier = newVerifier(fourModulesTestDir.getAbsolutePath()); + Verifier verifier = newVerifier(fourModulesTestDir); verifier.addCliArgument("-T2"); verifier.addCliArgument("-Dmodule-b.delay=2000"); verifier.addCliArgument("-Dmodule-d.fail=true"); @@ -212,7 +211,7 @@ public void testFailureAfterSkipWithParallelBuild() throws Exception { } // Let module-a and module-b fail, if they would have been built... - verifier = newVerifier(fourModulesTestDir.getAbsolutePath()); + verifier = newVerifier(fourModulesTestDir); verifier.addCliArgument("-T2"); verifier.addCliArgument("-Dmodule-a.fail=true"); verifier.addCliArgument("-Dmodule-b.fail=true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java index 3357a9e550f7..f2972274c28f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -29,9 +29,9 @@ public class MavenITmng5768CliExecutionIdTest extends AbstractMavenIntegrationTe @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5768-cli-execution-id"); + Path testDir = extractResources("mng-5768-cli-execution-id"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-configuration:config@test-execution-id"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index 3d633c5cdf92..d6343ef1c30a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Map; - import org.junit.jupiter.api.Test; /** @@ -30,18 +29,20 @@ */ public class MavenITmng5771CoreExtensionsTest extends AbstractMavenIntegrationTestCase { + private static final String RESOURCE_PATH = "mng-5771-core-extensions"; + @Test public void testCoreExtension() throws Exception { - File testDir = extractResources("/mng-5771-core-extensions"); + Path testDir = extractResources(RESOURCE_PATH); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "client").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("client")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-core-extensions"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -49,16 +50,16 @@ public void testCoreExtension() throws Exception { @Test public void testCoreExtensionNoDescriptor() throws Exception { - File testDir = extractResources("/mng-5771-core-extensions"); + Path testDir = extractResources(RESOURCE_PATH); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "client-no-descriptor").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("client-no-descriptor")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-core-extensions"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -72,28 +73,28 @@ public void testCoreExtensionNoDescriptor() throws Exception { public void testCoreExtensionRetrievedFromAMirrorWithBasicAuthentication() throws Exception { // requiresMavenVersion("[3.3.2,)"); - File testDir = extractResources("/mng-5771-core-extensions"); + Path testDir = extractResources(RESOURCE_PATH); HttpServer server = HttpServer.builder() // .port(0) // .username("maven") // .password("secret") // - .source(new File(testDir, "repo")) // + .source(testDir.resolve("repo").toString()) // .build(); server.start(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); Map properties = verifier.newDefaultFilterMap(); properties.put("@port@", Integer.toString(server.port())); String mirrorOf = "*"; properties.put("@mirrorOf@", mirrorOf); verifier.filterFile("settings-template-mirror-auth.xml", "settings.xml", properties); - verifier = newVerifier(new File(testDir, "client").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("client")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-core-extensions"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -108,16 +109,16 @@ public void testCoreExtensionRetrievedFromAMirrorWithBasicAuthentication() throw public void testCoreExtensionWithProperties() throws Exception { // requiresMavenVersion("[3.8.5,)"); - File testDir = extractResources("/mng-5771-core-extensions"); + Path testDir = extractResources(RESOURCE_PATH); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "client-properties").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("client-properties")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-core-extensions"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("-Dtest-extension-version=0.1"); verifier.addCliArgument("validate"); verifier.execute(); @@ -131,16 +132,16 @@ public void testCoreExtensionWithProperties() throws Exception { public void testCoreExtensionWithConfig() throws Exception { // requiresMavenVersion("[3.8.5,)"); - File testDir = extractResources("/mng-5771-core-extensions"); + Path testDir = extractResources(RESOURCE_PATH); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "client-config").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("client-config")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-core-extensions"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.setForkJvm(true); // force forked JVM since we need the shell script to detect .mvn/ verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java index caae540ce203..f6de3092dd26 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -31,16 +30,16 @@ public class MavenITmng5774ConfigurationProcessorsTest extends AbstractMavenInte @Test public void testBehaviourWhereThereIsOneUserSuppliedConfigurationProcessor() throws Exception { - File testDir = extractResources("/mng-5774-configuration-processors"); + Path testDir = extractResources("mng-5774-configuration-processors"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "build-with-one-processor-valid").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("build-with-one-processor-valid")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-configuration-processors"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("process-resources"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -54,16 +53,16 @@ public void testBehaviourWhereThereIsOneUserSuppliedConfigurationProcessor() thr @Test public void testBehaviourWhereThereAreTwoUserSuppliedConfigurationProcessor() throws Exception { - File testDir = extractResources("/mng-5774-configuration-processors"); + Path testDir = extractResources("mng-5774-configuration-processors"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "build-with-two-processors-invalid").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("build-with-two-processors-invalid")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-configuration-processors"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); try { verifier.addCliArgument("process-resources"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java index f06aaf57cf44..b7097125eee9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -29,13 +29,13 @@ public class MavenITmng5783PluginDependencyFiltering extends AbstractMavenIntegr @Test public void testSLF4j() throws Exception { - File testDir = extractResources("/mng-5783-plugin-dependency-filtering"); - Verifier verifier = newVerifier(new File(testDir, "plugin").getAbsolutePath()); + Path testDir = extractResources("mng-5783-plugin-dependency-filtering"); + Verifier verifier = newVerifier(testDir.resolve("plugin")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "slf4j").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("slf4j")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java index be38507dcd7e..072f76b09d08 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,10 +26,10 @@ public class MavenITmng5805PkgTypeMojoConfiguration2 extends AbstractMavenIntegr @Test public void testPkgTypeMojoConfiguration() throws Exception { - File testDir = extractResources("/mng-5805-pkg-type-mojo-configuration2"); + Path testDir = extractResources("mng-5805-pkg-type-mojo-configuration2"); // First, build the test plugin dependency - Verifier verifier = newVerifier(new File(testDir, "mng5805-plugin-dep").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mng5805-plugin-dep")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -37,7 +37,7 @@ public void testPkgTypeMojoConfiguration() throws Exception { verifier.verifyErrorFreeLog(); // Then, build the test extension2 - verifier = newVerifier(new File(testDir, "mng5805-extension2").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("mng5805-extension2")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -45,7 +45,7 @@ public void testPkgTypeMojoConfiguration() throws Exception { verifier.verifyErrorFreeLog(); // Then, build the test plugin - verifier = newVerifier(new File(testDir, "mng5805-plugin").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("mng5805-plugin")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -53,7 +53,7 @@ public void testPkgTypeMojoConfiguration() throws Exception { verifier.verifyErrorFreeLog(); // Finally, run the test project - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java index 9d1df1791951..af63c4d2afd8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,14 +26,14 @@ public class MavenITmng5840ParentVersionRanges extends AbstractMavenIntegrationT @Test public void testParentRangeRelativePathPointsToWrongVersion() throws Exception { - File testDir = extractResources("/mng-5840-relative-path-range-negative"); + Path testDir = extractResources("mng-5840-relative-path-range-negative"); - Verifier verifier = newVerifier(new File(testDir, "parent-1").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent-1")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("child")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -41,14 +41,14 @@ public void testParentRangeRelativePathPointsToWrongVersion() throws Exception { @Test public void testParentRangeRelativePathPointsToCorrectVersion() throws Exception { - File testDir = extractResources("/mng-5840-relative-path-range-positive"); + Path testDir = extractResources("mng-5840-relative-path-range-positive"); - Verifier verifier = newVerifier(new File(testDir, "parent-1").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent-1")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("child")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java index 1a2892442ed9..90abb73fee74 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -27,14 +27,14 @@ public MavenITmng5840RelativePathReactorMatching() {} @Test public void testRelativePathPointsToWrongVersion() throws Exception { - File testDir = extractResources("/mng-5840-relative-path-reactor-matching"); + Path testDir = extractResources("mng-5840-relative-path-reactor-matching"); - Verifier verifier = newVerifier(new File(testDir, "parent-1").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent-1")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("child")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java index 7eda222ba797..d29e0cf799c8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java @@ -21,7 +21,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; import java.nio.file.Files; import java.nio.file.Path; @@ -44,7 +43,7 @@ */ public class MavenITmng5868NoDuplicateAttachedArtifacts extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; private Server server; @@ -54,7 +53,7 @@ public class MavenITmng5868NoDuplicateAttachedArtifacts extends AbstractMavenInt @BeforeEach protected void setUp() throws Exception { - testDir = extractResources("/mng-5868"); + testDir = extractResources("mng-5868"); Handler repoHandler = new AbstractHandler() { @Override @@ -101,13 +100,13 @@ protected void tearDown() throws Exception { @Test public void testNoDeployNotDuplicate() throws Exception { - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - Path tmp = Files.createTempFile(testDir.toPath(), "FOO", "txt"); + Verifier verifier = newVerifier(testDir); + Path tmp = Files.createTempFile(testDir, "FOO", "txt"); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng5868"); - verifier.addCliArgument("-Dartifact.attachedFile=" + tmp.toFile().getCanonicalPath()); + verifier.addCliArgument("-Dartifact.attachedFile=" + ItUtils.canonicalPath(tmp)); verifier.addCliArgument("-DdeploymentPort=" + port); verifier.addCliArguments("org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:attach", "deploy"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java index cd9e497bdb1c..831936bf6888 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -76,23 +76,23 @@ private void runCoreExtensionWithOption(String option, String subdir) throws Exc } protected void runCoreExtensionWithOption(String option, String subdir, boolean pom) throws Exception { - File testDir = extractResources("/mng-5889-find.mvn"); + Path testDir = extractResources("mng-5889-find.mvn"); - File basedir = - new File(testDir, "../mng-" + (pom ? "5889" : "6223") + "-find.mvn" + option + (pom ? "Pom" : "Dir")); - basedir.mkdir(); + Path basedir = + testDir.resolve("../mng-" + (pom ? "5889" : "6223") + "-find.mvn" + option + (pom ? "Pom" : "Dir")); + Files.createDirectories(basedir); if (subdir != null) { - testDir = new File(testDir, subdir); - basedir = new File(basedir, subdir); - basedir.mkdirs(); + testDir = testDir.resolve(subdir); + basedir = basedir.resolve(subdir); + Files.createDirectories(basedir); } - Verifier verifier = newVerifier(basedir.getAbsolutePath()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument( - "-Dexpression.outputFile=" + new File(basedir, "expression.properties").getAbsolutePath()); + "-Dexpression.outputFile=" + basedir.resolve("expression.properties")); verifier.addCliArgument(option); // -f/--file client/pom.xml - verifier.addCliArgument((pom ? new File(testDir, "pom.xml") : testDir).getAbsolutePath()); + verifier.addCliArgument((pom ? testDir.resolve("pom.xml") : testDir).toString()); verifier.setForkJvm(true); // force forked JVM since we need the shell script to detect .mvn/ location verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java index 33fa49c7b038..52f2d980408d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -48,9 +48,9 @@ public MavenITmng5895CIFriendlyUsageWithPropertyTest() { */ @Test public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exception { - File testDir = extractResources("/mng-5895-ci-friendly-usage-with-property"); + Path testDir = extractResources("mng-5895-ci-friendly-usage-with-property"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); // verifier.setLogFileName( "log-only.txt" ); @@ -65,9 +65,9 @@ public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exce @Test public void testitShouldResolveTheDependenciesWithBuildConsumer() throws Exception { - File testDir = extractResources("/mng-5895-ci-friendly-usage-with-property"); + Path testDir = extractResources("mng-5895-ci-friendly-usage-with-property"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-bc.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java index 044f0ceec1f6..f4be5af1e848 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest extends */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-5898"); + Path testDir = extractResources("mng-5898"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("test"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java index 66e520920f81..e69e34c1bc78 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -33,9 +33,9 @@ public class MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest extend @Test public void testitMNG5935() throws Exception { - File testDir = extractResources("/mng-5935-optional-lost-in-transtive-managed-dependencies"); + Path testDir = extractResources("mng-5935-optional-lost-in-transtive-managed-dependencies"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java index 783aab8ab21c..d6414c940eb6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,10 +26,10 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat extends AbstractMavenInteg @Test public void testGood() throws Exception { - File testDir = extractResources("/mng-5958-lifecycle-phases"); + Path testDir = extractResources("mng-5958-lifecycle-phases"); // First, build the test extension - Verifier verifier = newVerifier(new File(testDir, "mng5958-extension").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mng5958-extension")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -37,7 +37,7 @@ public void testGood() throws Exception { verifier.verifyErrorFreeLog(); // Then, build the test plugin - verifier = newVerifier(new File(testDir, "mng5958-plugin").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("mng5958-plugin")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -45,7 +45,7 @@ public void testGood() throws Exception { verifier.verifyErrorFreeLog(); // Finally, run the good test project - verifier = newVerifier(new File(testDir, "good").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("good")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -54,25 +54,25 @@ public void testGood() throws Exception { @Test public void testBad() throws Exception { - File testDir = extractResources("/mng-5958-lifecycle-phases"); + Path testDir = extractResources("mng-5958-lifecycle-phases"); // Extension and plugin are already built by testGood, but let's ensure they're available // Build the test extension - Verifier verifier = newVerifier(new File(testDir, "mng5958-extension").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mng5958-extension")); verifier.setAutoclean(false); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // Build the test plugin - verifier = newVerifier(new File(testDir, "mng5958-plugin").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("mng5958-plugin")); verifier.setAutoclean(false); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); // Run the bad test project - verifier = newVerifier(new File(testDir, "bad").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("bad")); try { verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java index 769747ff2a86..9fc554a24710 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -35,9 +35,9 @@ public class MavenITmng5965ParallelBuildMultipliesWorkTest extends AbstractMaven @Test public void testItShouldOnlyRunEachTaskOnce() throws Exception { - File testDir = extractResources("/mng-5965-parallel-build-multiplies-work"); + Path testDir = extractResources("mng-5965-parallel-build-multiplies-work"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-only.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java index b100cd02f964..44019dd9c46b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.LinkedList; import java.util.List; @@ -49,9 +49,9 @@ public MavenITmng6057CheckReactorOrderTest() { */ @Test public void testitReactorShouldResultInExpectedOrder() throws Exception { - File testDir = extractResources("/mng-6057-check-reactor-order"); + Path testDir = extractResources("mng-6057-check-reactor-order"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-only.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java index 6d42818592b6..65a53dde3287 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng6065FailOnSeverityTest extends AbstractMavenIntegrationTe @Test public void testItShouldFailOnWarnLogMessages() throws Exception { - File testDir = extractResources("/mng-6065-fail-on-severity"); + Path testDir = extractResources("mng-6065-fail-on-severity"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("warn.log"); verifier.addCliArgument("--fail-on-severity"); verifier.addCliArgument("WARN"); @@ -58,9 +58,9 @@ public void testItShouldFailOnWarnLogMessages() throws Exception { @Test public void testItShouldSucceedOnWarnLogMessagesWhenFailLevelIsError() throws Exception { - File testDir = extractResources("/mng-6065-fail-on-severity"); + Path testDir = extractResources("mng-6065-fail-on-severity"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("error.log"); verifier.addCliArgument("--fail-on-severity"); verifier.addCliArgument("ERROR"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java index 12fbaa302e36..102865fe9934 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng6071GetResourceWithCustomPom extends AbstractMavenIntegra */ @Test public void testRunCustomPomWithDot() throws Exception { - File testDir = extractResources("/mng-6071"); + Path testDir = extractResources("mng-6071"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-f"); verifier.addCliArgument("./pom.xml"); verifier.setForkJvm(true); // TODO: why? diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java index df4aac2d7e07..8f6cf57d3983 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,11 +27,11 @@ */ public class MavenITmng6084Jsr250PluginTest extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; @BeforeEach public void setUp() throws Exception { - testDir = extractResources("/mng-6084-jsr250-support"); + testDir = extractResources("mng-6084-jsr250-support"); } @Test @@ -40,7 +39,7 @@ public void testJsr250PluginExecution() throws Exception { // // Build a plugin that uses JSR 250 annotations // - Verifier v0 = newVerifier(testDir.getAbsolutePath()); + Verifier v0 = newVerifier(testDir); v0.setAutoclean(false); v0.deleteDirectory("target"); v0.deleteArtifacts("org.apache.maven.its.mng6084"); @@ -51,7 +50,7 @@ public void testJsr250PluginExecution() throws Exception { // // Execute the JSR 250 plugin // - Verifier v1 = newVerifier(testDir.getAbsolutePath()); + Verifier v1 = newVerifier(testDir); v1.setAutoclean(false); v1.addCliArgument("org.apache.maven.its.mng6084:jsr250-maven-plugin:0.0.1-SNAPSHOT:hello"); v1.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java index 041aacd00014..d11fdd7aaa42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -48,9 +48,9 @@ public MavenITmng6090CIFriendlyTest() { */ @Test public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exception { - File testDir = extractResources("/mng-6090-ci-friendly"); + Path testDir = extractResources("mng-6090-ci-friendly"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-Drevision=1.2"); @@ -60,7 +60,7 @@ public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exce verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-Drevision=1.2"); @@ -73,9 +73,9 @@ public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exce @Test public void testitShouldResolveTheDependenciesWithBuildConsumer() throws Exception { - File testDir = extractResources("/mng-6090-ci-friendly"); + Path testDir = extractResources("mng-6090-ci-friendly"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? @@ -86,7 +86,7 @@ public void testitShouldResolveTheDependenciesWithBuildConsumer() throws Excepti verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setForkJvm(true); // TODO: why? diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java index 8e0df2fa2028..59edc2fc11ee 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -39,8 +38,8 @@ * @author Martin Kanters */ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationTestCase { - private static final String RESOURCE_PATH = "/mng-6118-submodule-invocation-full-reactor"; - private final File testDir; + private static final String RESOURCE_PATH = "mng-6118-submodule-invocation-full-reactor"; + private final Path testDir; public MavenITmng6118SubmoduleInvocation() throws IOException { super(); @@ -55,12 +54,12 @@ public MavenITmng6118SubmoduleInvocation() throws IOException { @Test public void testInSubModule() throws Exception { // Compile the whole project first. - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(testDir.toString(), false); verifier.addCliArgument("package"); verifier.execute(); - final File submoduleDirectory = new File(testDir, "app"); - verifier = newVerifier(submoduleDirectory.getAbsolutePath(), false); + final Path submoduleDirectory = testDir.resolve("app"); + verifier = newVerifier(submoduleDirectory.toString(), false); verifier.setAutoclean(false); verifier.setLogFileName("log-insubmodule.txt"); verifier.addCliArgument("compile"); @@ -75,11 +74,11 @@ public void testInSubModule() throws Exception { @Test public void testWithFile() throws Exception { // Compile the whole project first. - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(testDir.toString(), false); verifier.addCliArgument("package"); verifier.execute(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("log-withfile.txt"); verifier.addCliArgument("-f"); @@ -95,7 +94,7 @@ public void testWithFile() throws Exception { */ @Test public void testWithFileAndAlsoMake() throws Exception { - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(testDir.toString(), false); verifier.addCliArgument("-am"); verifier.addCliArgument("-f"); verifier.addCliArgument("app/pom.xml"); @@ -112,8 +111,8 @@ public void testWithFileAndAlsoMake() throws Exception { */ @Test public void testInSubModuleWithAlsoMake() throws Exception { - File submoduleDirectory = new File(testDir, "app"); - Verifier verifier = newVerifier(submoduleDirectory.getAbsolutePath(), false); + Path submoduleDirectory = testDir.resolve("app"); + Verifier verifier = newVerifier(submoduleDirectory, false); verifier.addCliArgument("-am"); verifier.setLogFileName("log-insubmodulealsomake.txt"); verifier.addCliArgument("compile"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java index f2229e0c432e..c79e12661f82 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,45 +28,45 @@ public class MavenITmng6127PluginExecutionConfigurationInterferenceTest extends @Test public void testCustomMojoExecutionConfigurator() throws Exception { - File testDir = extractResources("/mng-6127-plugin-execution-configuration-interference"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "project"); - File modAprojectDir = new File(projectDir, "mod-a"); - File modBprojectDir = new File(projectDir, "mod-b"); - File modCprojectDir = new File(projectDir, "mod-c"); + Path testDir = extractResources("mng-6127-plugin-execution-configuration-interference"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("project"); + Path modAprojectDir = projectDir.resolve("mod-a"); + Path modBprojectDir = projectDir.resolve("mod-b"); + Path modCprojectDir = projectDir.resolve("mod-c"); Verifier verifier; // install the test plugin - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - File modAconfigurationFile = new File(modAprojectDir, "configuration.txt"); - File modBconfigurationFile = new File(modBprojectDir, "configuration.txt"); - File modCconfigurationFile = new File(modCprojectDir, "configuration.txt"); - modAconfigurationFile.delete(); - modBconfigurationFile.delete(); - modCconfigurationFile.delete(); + Path modAconfigurationFile = modAprojectDir.resolve("configuration.txt"); + Path modBconfigurationFile = modBprojectDir.resolve("configuration.txt"); + Path modCconfigurationFile = modCprojectDir.resolve("configuration.txt"); + Files.delete(modAconfigurationFile); + Files.delete(modBconfigurationFile); + Files.delete(modCconfigurationFile); // build the test project - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("verify"); verifier.addCliArgument("-X"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier.verifyFilePresent(modAconfigurationFile.getCanonicalPath()); - String modAactual = Files.readString(modAconfigurationFile.toPath()); + verifier.verifyFilePresent(modAconfigurationFile.toString()); + String modAactual = Files.readString(modAconfigurationFile); assertEquals("name=mod-a, secondName=second from components.xml", modAactual); - verifier.verifyFilePresent(modBconfigurationFile.getCanonicalPath()); - String modBactual = Files.readString(modBconfigurationFile.toPath()); + verifier.verifyFilePresent(modBconfigurationFile.toString()); + String modBactual = Files.readString(modBconfigurationFile); assertEquals("name=mod-b, secondName=second from components.xml", modBactual); - verifier.verifyFilePresent(modCconfigurationFile.getCanonicalPath()); - String modCactual = Files.readString(modCconfigurationFile.toPath()); + verifier.verifyFilePresent(modCconfigurationFile.toString()); + String modCactual = Files.readString(modCconfigurationFile); assertEquals("secondName=second from components.xml", modCactual); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java index f53977dd8fb6..3f484d6c9b00 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -43,9 +43,9 @@ public class MavenITmng6173GetAllProjectsInReactorTest extends AbstractMavenInte @Test public void testitShouldReturnAllProjectsInReactor() throws Exception { - File testDir = extractResources("/mng-6173-get-all-projects-in-reactor"); + Path testDir = extractResources("mng-6173-get-all-projects-in-reactor"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("module-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java index 562da5c5f368..02e27b87c931 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class MavenITmng6173GetProjectsAndDependencyGraphTest extends AbstractMav @Test public void testitShouldReturnProjectsAndProjectDependencyGraph() throws Exception { - File testDir = extractResources("/mng-6173-get-projects-and-dependency-graph"); + Path testDir = extractResources("mng-6173-get-projects-and-dependency-graph"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteDirectory("module-1/target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java index ccfc59ca68b0..eb6a421b3887 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ public class MavenITmng6189SiteReportPluginsWarningTest extends AbstractMavenInt @Test public void testit() throws Exception { - File testDir = extractResources("/mng-6189-site-reportPlugins-warning"); + Path testDir = extractResources("mng-6189-site-reportPlugins-warning"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java index 6cffb8c0347c..ab550f587a4d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -32,16 +31,16 @@ public class MavenITmng6210CoreExtensionsCustomScopesTest extends AbstractMavenI @Test public void testCoreExtensionCustomScopes() throws Exception { - File testDir = extractResources("/mng-6210-core-extensions-scopes"); + Path testDir = extractResources("mng-6210-core-extensions-scopes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.filterFile("settings-template.xml", "settings.xml"); - verifier = newVerifier(new File(testDir, "client").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("client")); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.it-core-extensions-custom-scopes"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java index bd2b0b9d4ee4..35a35a2f5d32 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -77,23 +77,23 @@ private void runCoreExtensionWithOptionToDir(String option, String subdir) throw } protected void runCoreExtensionWithOption(String option, String subdir, boolean pom) throws Exception { - File testDir = extractResources("/mng-5889-find.mvn"); + Path testDir = extractResources("mng-5889-find.mvn"); - File basedir = - new File(testDir, "../mng-" + (pom ? "5889" : "6223") + "-find.mvn" + option + (pom ? "Pom" : "Dir")); - basedir.mkdir(); + Path basedir = + testDir.resolve("../mng-" + (pom ? "5889" : "6223") + "-find.mvn" + option + (pom ? "Pom" : "Dir")); + Files.createDirectories(basedir); if (subdir != null) { - testDir = new File(testDir, subdir); - basedir = new File(basedir, subdir); - basedir.mkdirs(); + testDir = testDir.resolve(subdir); + basedir = basedir.resolve(subdir); + Files.createDirectories(basedir); } - Verifier verifier = newVerifier(basedir.getAbsolutePath()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument( - "-Dexpression.outputFile=" + new File(basedir, "expression.properties").getAbsolutePath()); + "-Dexpression.outputFile=" + basedir.resolve("expression.properties")); verifier.addCliArgument(option); // -f/--file client/pom.xml - verifier.addCliArgument((pom ? new File(testDir, "pom.xml") : testDir).getAbsolutePath()); + verifier.addCliArgument((pom ? testDir.resolve("pom.xml") : testDir).toString()); verifier.setForkJvm(true); // force forked JVM since we need the shell script to detect .mvn/ location verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java index 09734e6bdcb6..a51fe2059ad2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -46,17 +46,17 @@ public class MavenITmng6240PluginExtensionAetherProvider extends AbstractMavenIn */ @Test public void testPluginExtensionDependingOnMavenAetherProvider() throws Exception { - File testDir = extractResources("/mng-6240-plugin-extension-aether-provider"); - File pluginDir = new File(testDir, "plugin-extension"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-6240-plugin-extension-aether-provider"); + Path pluginDir = testDir.resolve("plugin-extension"); + Path projectDir = testDir.resolve("project"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Verifier verifier = newVerifier(pluginDir); verifier.removeCIEnvironmentVariables(); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.removeCIEnvironmentVariables(); verifier.addCliArgument("deploy"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java index 687aa9a4dc7f..235a2ff0a408 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -70,15 +69,15 @@ void testJvmConfigFileCRLF() throws Exception { } protected void runWithLineEndings(String lineEndings) throws Exception { - File baseDir = extractResources("/mng-6255"); - File mvnDir = new File(baseDir, ".mvn"); + Path baseDir = extractResources("mng-6255"); + Path mvnDir = baseDir.resolve(".mvn"); - File jvmConfig = new File(mvnDir, "jvm.config"); + Path jvmConfig = mvnDir.resolve("jvm.config"); createJvmConfigFile(jvmConfig, lineEndings, "-Djvm.config=ok", "-Xms256m", "-Xmx512m"); - Verifier verifier = newVerifier(baseDir.getAbsolutePath()); + Verifier verifier = newVerifier(baseDir); verifier.addCliArgument( - "-Dexpression.outputFile=" + new File(baseDir, "expression.properties").getAbsolutePath()); + "-Dexpression.outputFile=" + baseDir.resolve("expression.properties")); verifier.setForkJvm(true); // custom .mvn/jvm.config verifier.addCliArgument("validate"); verifier.execute(); @@ -88,8 +87,8 @@ protected void runWithLineEndings(String lineEndings) throws Exception { assertEquals("ok", props.getProperty("project.properties.jvm-config")); } - protected void createJvmConfigFile(File jvmConfig, String lineEndings, String... lines) throws Exception { + protected void createJvmConfigFile(Path jvmConfig, String lineEndings, String... lines) throws Exception { String content = String.join(lineEndings, lines); - Files.writeString(jvmConfig.toPath(), content); + Files.writeString(jvmConfig, content); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java index 375f1500523c..50d1ae71cd21 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -18,7 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -62,14 +63,14 @@ private void runWithMvnFileShortOption(String subDir) throws Exception { } private void runCoreExtensionWithOption(String option, String subDir) throws Exception { - File resourceDir = extractResources("/mng-6256-special-chars-alternate-pom-location"); + Path resourceDir = extractResources("mng-6256-special-chars-alternate-pom-location"); - File testDir = new File(resourceDir, "../mng-6256-" + subDir); - testDir.mkdir(); + Path testDir = resourceDir.resolve("../mng-6256-" + subDir); + Files.createDirectories(testDir); - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(testDir.toString(), false); verifier.addCliArgument(option); // -f/--file - verifier.addCliArgument("\"" + new File(resourceDir, subDir).getAbsolutePath() + "\""); // "" + verifier.addCliArgument("\"" + resourceDir.resolve(subDir).toAbsolutePath() + "\""); // "" verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java index 5893d22d8433..04fee81ef9dd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -30,9 +30,9 @@ public class MavenITmng6326CoreExtensionsNotFoundTest extends AbstractMavenInteg @Test public void testCoreExtensionsNotFound() throws Exception { - File testDir = extractResources("/mng-6326-core-extensions-not-found"); + Path testDir = extractResources("mng-6326-core-extensions-not-found"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); try { verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java index 6372a53bfe07..0276a7012948 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ public class MavenITmng6330RelativePath extends AbstractMavenIntegrationTestCase @Test public void testRelativePath() throws Exception { - File testDir = extractResources("/mng-6330-relative-path"); + Path testDir = extractResources("mng-6330-relative-path"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // TODO: why? try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java index 2b18fb1d4871..bd6820245f65 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; @@ -34,9 +33,9 @@ public class MavenITmng6386BaseUriPropertyTest extends AbstractMavenIntegrationT @Test public void testitMNG6386() throws Exception { - File testDir = extractResources("/mng-6386").getCanonicalFile(); + Path testDir = extractResources("mng-6386"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-basic.txt"); @@ -47,7 +46,7 @@ public void testitMNG6386() throws Exception { Properties props = verifier.loadProperties("target/profile.properties"); String pomProperty = props.getProperty("project.properties.pomProperty"); // set via project - assertEquals(testDir.toPath().toUri().toASCIIString(), pomProperty); + assertEquals(testDir.toUri().toASCIIString(), pomProperty); // check that baseUri begins with file:/// assertTrue(pomProperty.startsWith("file:///")); } @@ -62,9 +61,9 @@ public void testitMNG6386UnicodeChars() throws Exception { if (Os.isFamily(Os.FAMILY_WINDOWS) || "UTF-8".equalsIgnoreCase(fileEncoding) || "UTF8".equalsIgnoreCase(fileEncoding)) { - File testDir = extractResources("/mng-6386-это по-русский").getCanonicalFile(); + Path testDir = extractResources("mng-6386-это по-русский"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-basic.txt"); @@ -75,7 +74,7 @@ public void testitMNG6386UnicodeChars() throws Exception { Properties props = verifier.loadProperties("target/profile.properties"); String pomProperty = props.getProperty("project.properties.pomProperty"); // set via project - assertEquals(testDir.toPath().toUri().toASCIIString(), pomProperty); + assertEquals(testDir.toUri().toASCIIString(), pomProperty); // check that baseUri begins with file:/// assertTrue(pomProperty.startsWith("file:///")); // check that baseUri ends with "это по-русский/", but properly URI-encoded diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java index 866b901df012..89c39470d1c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.LinkedList; import java.util.List; @@ -48,9 +48,9 @@ public class MavenITmng6391PrintVersionTest extends AbstractMavenIntegrationTest */ @Test public void testitShouldPrintVersionAtTopAndAtBottom() throws Exception { - File testDir = extractResources("/mng-6391-print-version"); + Path testDir = extractResources("mng-6391-print-version"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("version-log.txt"); @@ -89,9 +89,9 @@ public void testitShouldPrintVersionAtTopAndAtBottom() throws Exception { */ @Test public void testitShouldPrintVersionInAllLines() throws Exception { - File testDir = extractResources("/mng-6391-print-version-aggregator"); + Path testDir = extractResources("mng-6391-print-version-aggregator"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("version-log.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6401ProxyPortInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6401ProxyPortInterpolationTest.java index 253f4dfe410d..97b3ee33d701 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6401ProxyPortInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6401ProxyPortInterpolationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.apache.maven.settings.Proxy; @@ -37,9 +37,9 @@ class MavenITmng6401ProxyPortInterpolationTest extends AbstractMavenIntegrationT @Test public void testitEnvVars() throws Exception { - File testDir = extractResources("/mng-6401-proxy-port-interpolation"); + Path testDir = extractResources("mng-6401-proxy-port-interpolation"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("--settings"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java index 78d9b72e1bfb..4ffca29c9de1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,18 +26,18 @@ public class MavenITmng6506PackageAnnotationTest extends AbstractMavenIntegratio @Test public void testGetPackageAnnotation() throws Exception { - File testDir = extractResources("/mng-6506-package-annotation"); - File pluginDir = new File(testDir, "plugin"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-6506-package-annotation"); + Path pluginDir = testDir.resolve("plugin"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(pluginDir.getAbsolutePath()); + verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java index 98fde144c5bc..8b2ea7e9774f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -31,21 +30,20 @@ * @author Martin Kanters */ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenIntegrationTestCase { - private static final String RESOURCE_PATH = "/mng-6511-optional-project-selection"; - private final File testDir; + private final Path testDir; public MavenITmng6511OptionalProjectSelectionTest() throws IOException { super(); - testDir = extractResources(RESOURCE_PATH); + testDir = extractResources("mng-6511-optional-project-selection"); } @Test public void testSelectExistingOptionalProfile() throws VerificationException { - Verifier cleaner = newVerifier(testDir.getAbsolutePath()); + Verifier cleaner = newVerifier(testDir); cleaner.addCliArgument("clean"); cleaner.execute(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-select-existing.txt"); verifier.addCliArgument("-pl"); verifier.addCliArgument("?existing-module"); @@ -57,11 +55,11 @@ public void testSelectExistingOptionalProfile() throws VerificationException { @Test public void testSelectExistingOptionalProfileByArtifactId() throws VerificationException { - Verifier cleaner = newVerifier(testDir.getAbsolutePath()); + Verifier cleaner = newVerifier(testDir); cleaner.addCliArgument("clean"); cleaner.execute(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-select-existing-artifact-id.txt"); verifier.addCliArgument("-pl"); verifier.addCliArgument("?:existing-module"); @@ -73,11 +71,11 @@ public void testSelectExistingOptionalProfileByArtifactId() throws VerificationE @Test public void testSelectNonExistingOptionalProfile() throws VerificationException { - Verifier cleaner = newVerifier(testDir.getAbsolutePath()); + Verifier cleaner = newVerifier(testDir); cleaner.addCliArgument("clean"); cleaner.execute(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-select-non-existing.txt"); verifier.addCliArgument("-pl"); verifier.addCliArgument("?non-existing-module"); @@ -89,11 +87,11 @@ public void testSelectNonExistingOptionalProfile() throws VerificationException @Test public void testDeselectExistingOptionalProfile() throws VerificationException { - Verifier cleaner = newVerifier(testDir.getAbsolutePath()); + Verifier cleaner = newVerifier(testDir); cleaner.addCliArgument("clean"); cleaner.execute(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-deselect-existing.txt"); verifier.addCliArgument("-pl"); verifier.addCliArgument("!?existing-module"); @@ -106,11 +104,11 @@ public void testDeselectExistingOptionalProfile() throws VerificationException { @Test public void testDeselectNonExistingOptionalProfile() throws VerificationException { - Verifier cleaner = newVerifier(testDir.getAbsolutePath()); + Verifier cleaner = newVerifier(testDir); cleaner.addCliArgument("clean"); cleaner.execute(); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-deselect-non-existing.txt"); verifier.addCliArgument("-pl"); verifier.addCliArgument("!?non-existing-module"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java index 7b0c62b2f3e7..fe8e728b222b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ public class MavenITmng6558ToolchainsBuildingEventTest extends AbstractMavenInte */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-6558"); + Path testDir = extractResources("mng-6558"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // maven.ext.class.path used verifier.setAutoclean(false); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java index 673e50a3d737..43b52e9124be 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,10 +26,10 @@ public class MavenITmng6562WarnDefaultBindings extends AbstractMavenIntegrationT @Test public void testItShouldNotWarn() throws Exception { - File testDir = extractResources("/mng-6562-default-bindings"); + Path testDir = extractResources("mng-6562-default-bindings"); String phase = "validate"; - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName(phase + ".txt"); verifier.addCliArgument("-fos"); @@ -42,10 +42,10 @@ public void testItShouldNotWarn() throws Exception { @Test public void testItShouldNotWarn2() throws Exception { - File testDir = extractResources("/mng-6562-default-bindings"); + Path testDir = extractResources("mng-6562-default-bindings"); String phase = "process-resources"; - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName(phase + ".txt"); verifier.addCliArgument("-fos"); @@ -58,10 +58,10 @@ public void testItShouldNotWarn2() throws Exception { @Test public void testItShouldWarnForCompilerPlugin() throws Exception { - File testDir = extractResources("/mng-6562-default-bindings"); + Path testDir = extractResources("mng-6562-default-bindings"); String phase = "compile"; - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName(phase + ".txt"); verifier.addCliArgument(phase); @@ -73,10 +73,10 @@ public void testItShouldWarnForCompilerPlugin() throws Exception { @Test public void testItShouldWarnForCompilerPlugin2() throws Exception { - File testDir = extractResources("/mng-6562-default-bindings"); + Path testDir = extractResources("mng-6562-default-bindings"); String phase = "process-test-resources"; - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName(phase + ".txt"); verifier.addCliArgument(phase); @@ -89,10 +89,10 @@ public void testItShouldWarnForCompilerPlugin2() throws Exception { @Test public void testItShouldWarnForCompilerPlugin3() throws Exception { - File testDir = extractResources("/mng-6562-default-bindings"); + Path testDir = extractResources("mng-6562-default-bindings"); String phase = "test-compile"; - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName(phase + ".txt"); verifier.addCliArgument(phase); @@ -105,10 +105,10 @@ public void testItShouldWarnForCompilerPlugin3() throws Exception { @Test public void testItShouldWarnForCompilerPluginAndSurefirePlugin() throws Exception { - File testDir = extractResources("/mng-6562-default-bindings"); + Path testDir = extractResources("mng-6562-default-bindings"); String phase = "test"; - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName(phase + ".txt"); verifier.addCliArgument(phase); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java index deef8de34687..1bea7f2e2f64 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java @@ -18,26 +18,25 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest extends AbstractMavenIntegrationTestCase { - private static final String RESOURCE_PATH = "/mng-6566-execute-annotation-should-not-re-execute-goals"; + private static final String RESOURCE_PATH = "mng-6566-execute-annotation-should-not-re-execute-goals"; private static final String PLUGIN_KEY = "org.apache.maven.its.mng6566:plugin:1.0-SNAPSHOT"; - private File testDir; + private Path testDir; @BeforeEach public void setUp() throws Exception { testDir = extractResources(RESOURCE_PATH); - File pluginDir = new File(testDir, "plugin"); - Verifier verifier = newVerifier(pluginDir.getAbsolutePath()); + Path pluginDir = testDir.resolve("plugin"); + Verifier verifier = newVerifier(pluginDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -45,9 +44,9 @@ public void setUp() throws Exception { @Test public void testRunsCompileGoalOnceWithDirectPluginInvocation() throws Exception { - File consumerDir = new File(testDir, "consumer"); + Path consumerDir = testDir.resolve("consumer"); - Verifier verifier = newVerifier(consumerDir.getAbsolutePath()); + Verifier verifier = newVerifier(consumerDir); verifier.setLogFileName("log-direct-plugin-invocation.txt"); verifier.addCliArgument(PLUGIN_KEY + ":require-compile-phase"); verifier.execute(); @@ -64,9 +63,9 @@ public void testRunsCompileGoalOnceWithDirectPluginInvocation() throws Exception */ @Test public void testRunsCompileGoalOnceWithPhaseExecution() throws Exception { - File consumerDir = new File(testDir, "consumer"); + Path consumerDir = testDir.resolve("consumer"); - Verifier verifier = newVerifier(consumerDir.getAbsolutePath()); + Verifier verifier = newVerifier(consumerDir); verifier.setLogFileName("log-phase-execution.txt"); verifier.addCliArgument("compile"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java index 418c41e8db0a..65f2a435469f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ class MavenITmng6609ProfileActivationForPackagingTest extends AbstractMavenInteg */ @Test void testitMojoExecution() throws Exception { - File testDir = extractResources("/mng-6609"); + Path testDir = extractResources("mng-6609"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java index d0226022c9ed..14d8267af692 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -58,9 +57,9 @@ public class MavenITmng6656BuildConsumer extends AbstractMavenIntegrationTestCas */ @Test public void testPublishedPoms() throws Exception { - File testDir = extractResources("/mng-6656-buildconsumer"); + Path testDir = extractResources("mng-6656-buildconsumer"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-Dchangelist=MNG6656"); @@ -69,51 +68,51 @@ public void testPublishedPoms() throws Exception { verifier.verifyErrorFreeLog(); assertTextEquals( - new File(testDir, "expected/parent.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom"))); + testDir.resolve("expected/parent.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/parent-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/parent-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/simple-parent.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-parent.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-weather.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-weather.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-weather-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/simple-weather-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/simple-webapp.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-webapp.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-webapp-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/simple-webapp-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", "build")); } - static void assertTextEquals(File file1, File file2) throws IOException { + static void assertTextEquals(Path file1, Path file2) throws IOException { assertEquals( String.join( "\n", - Files.readAllLines(file1.toPath()).stream() + Files.readAllLines(file1).stream() .map(String::trim) .toList()), String.join( "\n", - Files.readAllLines(file2.toPath()).stream() + Files.readAllLines(file2).stream() .map(String::trim) .toList()), "pom files differ " + file1 + " " + file2); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java index 63730b5c002d..e243826965ea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ class MavenITmng6720FailFastTest extends AbstractMavenIntegrationTestCase { @Test void testItShouldWaitForConcurrentModulesToFinish() throws Exception { - File testDir = extractResources("/mng-6720-fail-fast"); + Path testDir = extractResources("mng-6720-fail-fast"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArguments("-T", "2"); verifier.addCliArgument("-Dmaven.test.redirectTestOutputToFile=true"); @@ -53,13 +53,13 @@ void testItShouldWaitForConcurrentModulesToFinish() throws Exception { } List module1Lines = verifier.loadFile( - new File(testDir, "module-1/target/surefire-reports/mng6720.Module1Test-output.txt"), false); + testDir.resolve("module-1/target/surefire-reports/mng6720.Module1Test-output.txt")); assertTrue(module1Lines.contains("Module1"), "module-1 should be executed"); List module2Lines = verifier.loadFile( - new File(testDir, "module-2/target/surefire-reports/mng6720.Module2Test-output.txt"), false); + testDir.resolve("module-2/target/surefire-reports/mng6720.Module2Test-output.txt")); assertTrue(module2Lines.contains("Module2"), "module-2 should be executed"); List module3Lines = verifier.loadFile( - new File(testDir, "module-3/target/surefire-reports/mng6720.Module3Test-output.txt"), false); + testDir.resolve("module-3/target/surefire-reports/mng6720.Module3Test-output.txt")); assertTrue(module3Lines.isEmpty(), "module-3 should be skipped"); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java index 9193ce869279..52cb8aa2c4db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java @@ -18,34 +18,31 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; - import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; public class MavenITmng6754TimestampInMultimoduleProject extends AbstractMavenIntegrationTestCase { - private static final String RESOURCE_PATH = "/mng-6754-version-timestamp-in-multimodule-build"; + private static final String RESOURCE_PATH = "mng-6754-version-timestamp-in-multimodule-build"; private static final String VERSION = "1.0-SNAPSHOT"; @Test @SuppressWarnings("checkstyle:MethodLength") public void testArtifactsHaveSameTimestamp() throws Exception { - final File testDir = extractResources(RESOURCE_PATH); - final Verifier verifier = newVerifier(testDir.getAbsolutePath()); - final Path localRepoDir = Paths.get(verifier.getLocalRepository()); - final Path remoteRepoDir = Paths.get(verifier.getBasedir(), "repo"); + final Path testDir = extractResources(RESOURCE_PATH); + final Verifier verifier = newVerifier(testDir); + final Path localRepoDir = verifier.getLocalRepository(); + final Path remoteRepoDir = verifier.getBasedir().resolve("repo"); verifier.deleteDirectory("repo"); verifier.deleteArtifacts("org.apache.maven.its.mng6754"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java index 8d0e96665f03..8f9bedfcd0d2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; import java.net.URI; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -28,7 +27,7 @@ */ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends AbstractMavenIntegrationTestCase { - private final String projectBaseDir = "/mng-6759-transitive-dependency-repositories"; + private static final String RESOURCE_PATH = "mng-6759-transitive-dependency-repositories"; /** * Verifies that a project with a dependency graph like {@code A -> B -> C}, @@ -39,11 +38,11 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract @Test public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTrailPredecessor() throws Exception { installDependencyCInCustomRepo(); - File testDir = extractResources(projectBaseDir); + Path testDir = extractResources(RESOURCE_PATH); // First, build the test plugin Verifier verifier = - newVerifier(new File(testDir, "mng6759-plugin-resolves-project-dependencies").getAbsolutePath()); + newVerifier(testDir.resolve("mng6759-plugin-resolves-project-dependencies")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -51,7 +50,7 @@ public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTr verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("package"); verifier.execute(); @@ -59,9 +58,9 @@ public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTr } private void installDependencyCInCustomRepo() throws Exception { - File dependencyCProjectDir = extractResources(projectBaseDir + "/dependency-in-custom-repo"); - URI customRepoUri = new File(new File(dependencyCProjectDir, "target"), "repo").toURI(); - Verifier verifier = newVerifier(dependencyCProjectDir.getAbsolutePath()); + Path dependencyCProjectDir = extractResources(RESOURCE_PATH + "/dependency-in-custom-repo"); + URI customRepoUri = dependencyCProjectDir.resolve("target").resolve("repo").toUri(); + Verifier verifier = newVerifier(dependencyCProjectDir); verifier.deleteDirectory("target"); verifier.addCliArgument("-DaltDeploymentRepository=customRepo::" + customRepoUri); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java index 8da340e1ca7a..47a8e6b7ab04 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -39,9 +38,9 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride extends AbstractM // This will test the behavior using ProjectModelResolver @Test public void testitInProject() throws Exception { - final File testDir = extractResources("/mng-6772-override-in-project"); + final Path testDir = extractResources("mng-6772-override-in-project"); - final Verifier verifier = newVerifier(testDir.getAbsolutePath(), null); + final Verifier verifier = newVerifier(testDir.toString(), null); overrideGlobalSettings(testDir, verifier); verifier.deleteArtifacts("org.apache.maven.its.mng6772"); @@ -55,9 +54,9 @@ public void testitInProject() throws Exception { // This will test the behavior using DefaultModelResolver @Test public void testitInDependency() throws Exception { - final File testDir = extractResources("/mng-6772-override-in-dependency"); + final Path testDir = extractResources("mng-6772-override-in-dependency"); - final Verifier verifier = newVerifier(testDir.getAbsolutePath(), null); + final Verifier verifier = newVerifier(testDir.toString(), null); overrideGlobalSettings(testDir, verifier); verifier.deleteArtifacts("org.apache.maven.its.mng6772"); @@ -69,9 +68,9 @@ public void testitInDependency() throws Exception { } // central must not be defined in any settings.xml or super POM will never be in play. - private void overrideGlobalSettings(final File testDir, final Verifier verifier) { - final File settingsFile = new File(testDir, "settings-override.xml"); - final String path = settingsFile.getAbsolutePath(); + private void overrideGlobalSettings(final Path testDir, final Verifier verifier) { + final Path settingsFile = testDir.resolve("settings-override.xml"); + final String path = settingsFile.toString(); verifier.addCliArgument("--global-settings"); if (path.indexOf(' ') < 0) { verifier.addCliArgument(path); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java index d9ce1a175b4e..d3a76ac9b30b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; import java.nio.file.Files; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -58,9 +57,9 @@ public class MavenITmng6957BuildConsumer extends AbstractMavenIntegrationTestCas */ @Test public void testPublishedPoms() throws Exception { - File testDir = extractResources("/mng-6957-buildconsumer"); + Path testDir = extractResources("mng-6957-buildconsumer"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArguments("-Dchangelist=MNG6957", "-Dmaven.consumer.pom.flatten=true"); @@ -69,76 +68,76 @@ public void testPublishedPoms() throws Exception { verifier.verifyErrorFreeLog(); assertTextEquals( - new File(testDir, "expected/parent.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom"))); + testDir.resolve("expected/parent.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/parent-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/parent-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/simple-parent.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-parent.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-parent-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/simple-parent-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/simple-weather.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-weather.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-weather-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/simple-weather-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/simple-webapp.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-webapp.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-webapp-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/simple-webapp-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/simple-testutils.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom"))); + testDir.resolve("expected/simple-testutils.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/simple-testutils-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/simple-testutils-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom", "build")); assertTextEquals( - new File(testDir, "expected/utils-parent.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom"))); + testDir.resolve("expected/utils-parent.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom")); assertTextEquals( - new File(testDir, "expected/utils-parent-build.pom"), - new File(verifier.getArtifactPath( - "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom", "build"))); + testDir.resolve("expected/utils-parent-build.pom"), + verifier.getArtifactPath( + "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom", "build")); } - static void assertTextEquals(File file1, File file2) throws IOException { + static void assertTextEquals(Path file1, Path file2) throws IOException { assertEquals( String.join( "\n", - Files.readAllLines(file1.toPath()).stream() + Files.readAllLines(file1).stream() .map(String::trim) .toList()), String.join( "\n", - Files.readAllLines(file2.toPath()).stream() + Files.readAllLines(file2).stream() .map(String::trim) .toList()), "pom files differ " + file1 + " " + file2); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java index 29beae80e797..a503c4fbe0c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -31,7 +30,7 @@ public class MavenITmng6972AllowAccessToGraphPackageTest extends AbstractMavenIn public void testit() throws Exception { // The testdir is computed from the location of this file. - final File testDir = extractResources("/mng-6972-allow-access-to-graph-package"); + final Path testDir = extractResources("mng-6972-allow-access-to-graph-package"); Verifier verifier; @@ -42,18 +41,18 @@ public void testit() throws Exception { * unstable test results. Fortunately, the verifier * makes it easy to do this. */ - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.deleteArtifact("mng-6972-allow-access-to-graph-package", "build-plugin", "1.0", "jar"); verifier.deleteArtifact("mng-6972-allow-access-to-graph-package", "using-module", "1.0", "jar"); - verifier = newVerifier(new File(testDir.getAbsolutePath(), "build-plugin").getAbsolutePath()); - verifier.getSystemProperties().put("maven.multiModuleProjectDirectory", testDir.getAbsolutePath()); + verifier = newVerifier(testDir.resolve( "build-plugin")); + verifier.getSystemProperties().put("maven.multiModuleProjectDirectory", testDir.toString()); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir.getAbsolutePath(), "using-module").getAbsolutePath()); - verifier.getSystemProperties().put("maven.multiModuleProjectDirectory", testDir.getAbsolutePath()); + verifier = newVerifier(testDir.resolve( "using-module")); + verifier.getSystemProperties().put("maven.multiModuleProjectDirectory", testDir.toString()); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java index 6e6c86d2f06a..ba6864f2e9a8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java @@ -18,18 +18,18 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng6981ProjectListShouldIncludeChildrenTest extends AbstractMavenIntegrationTestCase { - private static final String RESOURCE_PATH = "/mng-6981-pl-should-include-children"; + private static final String PROJECT_PATH = "mng-6981-pl-should-include-children"; @Test public void testProjectListShouldIncludeChildrenByDefault() throws Exception { - final File testDir = extractResources(RESOURCE_PATH); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + final Path testDir = extractResources(PROJECT_PATH); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-pl"); verifier.addCliArgument(":module-a"); @@ -45,8 +45,8 @@ public void testProjectListShouldIncludeChildrenByDefault() throws Exception { */ @Test public void testFileSwitchAllowsExcludeOfChildren() throws Exception { - final File testDir = extractResources(RESOURCE_PATH); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + final Path testDir = extractResources(PROJECT_PATH); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-f"); verifier.addCliArgument("module-a"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java index 3620c6e2c766..5d19eef9a5b7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -33,8 +32,8 @@ public class MavenITmng7038RootdirTest extends AbstractMavenIntegrationTestCase @Test public void testRootdir() throws IOException, VerificationException { - File testDir = extractResources("/mng-7038-rootdir"); - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); + Path testDir = extractResources("mng-7038-rootdir"); + Verifier verifier = newVerifier(testDir.toString(), false); verifier.addCliArgument("validate"); verifier.execute(); @@ -45,12 +44,12 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("target/pom.properties"); props = verifier.loadProperties("target/pom.properties"); assertEquals( - testDir.getAbsolutePath(), + testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.topDirectory"), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.TRUE.toString(), props.getProperty("project.properties.activated"), @@ -59,15 +58,15 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("module-a/target/pom.properties"); props = verifier.loadProperties("module-a/target/pom.properties"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.properties.rootdir"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.properties.rootdir")), "project.properties.rootdir"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.rootDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.rootDirectory")), "project.rootDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.topDirectory"), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.FALSE.toString(), props.getProperty("project.properties.activated"), @@ -76,15 +75,15 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("module-a/module-a-1/target/pom.properties"); props = verifier.loadProperties("module-a/module-a-1/target/pom.properties"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.properties.rootdir"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.properties.rootdir")), "project.properties.rootdir"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.rootDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.rootDirectory")), "project.rootDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.topDirectory"), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.FALSE.toString(), props.getProperty("project.properties.activated"), @@ -93,12 +92,12 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("module-b/target/pom.properties"); props = verifier.loadProperties("module-b/target/pom.properties"); assertEquals( - testDir.getAbsolutePath(), + testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.topDirectory"), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.TRUE.toString(), props.getProperty("project.properties.activated"), @@ -107,12 +106,12 @@ public void testRootdir() throws IOException, VerificationException { verifier.verifyFilePresent("module-b/module-b-1/target/pom.properties"); props = verifier.loadProperties("module-b/module-b-1/target/pom.properties"); assertEquals( - testDir.getAbsolutePath(), + testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.topDirectory"), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.topDirectory"), "session.topDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.TRUE.toString(), props.getProperty("project.properties.activated"), @@ -121,8 +120,8 @@ public void testRootdir() throws IOException, VerificationException { @Test public void testRootdirWithTopdirAndRoot() throws IOException, VerificationException { - File testDir = extractResources("/mng-7038-rootdir"); - Verifier verifier = newVerifier(new File(testDir, "module-a").getAbsolutePath(), false); + Path testDir = extractResources("mng-7038-rootdir"); + Verifier verifier = newVerifier(testDir.resolve("module-a"), false); verifier.addCliArgument("validate"); verifier.execute(); @@ -133,20 +132,20 @@ public void testRootdirWithTopdirAndRoot() throws IOException, VerificationExcep verifier.verifyFilePresent("target/pom.properties"); props = verifier.loadProperties("target/pom.properties"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.properties.rootdir"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.properties.rootdir")), "project.properties.rootdir"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.rootDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.rootDirectory")), "project.rootDirectory"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("session.topDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("session.topDirectory")), "session.topDirectory"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("session.rootDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("session.rootDirectory")), "session.rootDirectory"); assertEquals( Boolean.FALSE.toString(), @@ -156,20 +155,20 @@ public void testRootdirWithTopdirAndRoot() throws IOException, VerificationExcep verifier.verifyFilePresent("module-a-1/target/pom.properties"); props = verifier.loadProperties("module-a-1/target/pom.properties"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.properties.rootdir"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.properties.rootdir")), "project.properties.rootdir"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("project.rootDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("project.rootDirectory")), "project.rootDirectory"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("session.topDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("session.topDirectory")), "session.topDirectory"); assertEquals( - new File(testDir, "module-a").getAbsolutePath(), - props.getProperty("session.rootDirectory"), + testDir.resolve("module-a"), + Path.of(props.getProperty("session.rootDirectory")), "session.rootDirectory"); assertEquals( Boolean.FALSE.toString(), @@ -179,8 +178,8 @@ public void testRootdirWithTopdirAndRoot() throws IOException, VerificationExcep @Test public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationException { - File testDir = extractResources("/mng-7038-rootdir"); - Verifier verifier = newVerifier(new File(testDir, "module-b").getAbsolutePath(), false); + Path testDir = extractResources("mng-7038-rootdir"); + Verifier verifier = newVerifier(testDir.resolve("module-b"), false); verifier.addCliArgument("validate"); verifier.execute(); @@ -191,15 +190,15 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc verifier.verifyFilePresent("target/pom.properties"); props = verifier.loadProperties("target/pom.properties"); assertEquals( - testDir.getAbsolutePath(), + testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals( - new File(testDir, "module-b").getAbsolutePath(), - props.getProperty("session.topDirectory"), + testDir.resolve("module-b"), + Path.of(props.getProperty("session.topDirectory")), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.TRUE.toString(), props.getProperty("project.properties.activated"), @@ -208,15 +207,15 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc verifier.verifyFilePresent("module-b-1/target/pom.properties"); props = verifier.loadProperties("module-b-1/target/pom.properties"); assertEquals( - testDir.getAbsolutePath(), + testDir.toString(), props.getProperty("project.properties.rootdir"), "project.properties.rootdir"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("project.rootDirectory"), "project.rootDirectory"); assertEquals( - new File(testDir, "module-b").getAbsolutePath(), - props.getProperty("session.topDirectory"), + testDir.resolve("module-b"), + Path.of(props.getProperty("session.topDirectory")), "session.topDirectory"); - assertEquals(testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); + assertEquals(testDir.toString(), props.getProperty("session.rootDirectory"), "session.rootDirectory"); assertEquals( Boolean.TRUE.toString(), props.getProperty("project.properties.activated"), diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java index 39283da4c55c..b8b6a800c951 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import org.junit.jupiter.api.Test; @@ -27,8 +27,8 @@ public class MavenITmng7045DropUselessAndOutdatedCdiApiTest extends AbstractMave @Test public void testShouldNotLeakCdiApi() throws IOException, VerificationException { - File testDir = extractResources("/mng-7045"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Path testDir = extractResources("mng-7045"); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("process-classes"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java index c1e6c4c14a68..7928bdae9e5d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java @@ -18,12 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng7051OptionalProfileActivationTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7051-optional-profile-activation"; + private static final String PROJECT_PATH = "mng-7051-optional-profile-activation"; /** * This test verifies that activating a non-existing profile breaks the build. @@ -32,8 +31,8 @@ public class MavenITmng7051OptionalProfileActivationTest extends AbstractMavenIn */ @Test public void testActivatingNonExistingProfileBreaks() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-P"); verifier.addCliArgument("non-existing-profile"); @@ -57,8 +56,8 @@ public void testActivatingNonExistingProfileBreaks() throws Exception { */ @Test public void testActivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-P"); verifier.addCliArgument("?non-existing-profile"); @@ -78,8 +77,8 @@ public void testActivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throw */ @Test public void testActivatingExistingAndNonExistingProfiles() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-P"); verifier.addCliArgument("?non-existing-profile,existing"); @@ -99,8 +98,8 @@ public void testActivatingExistingAndNonExistingProfiles() throws Exception { */ @Test public void testDeactivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-P"); verifier.addCliArgument("!?non-existing-profile"); @@ -120,8 +119,8 @@ public void testDeactivatingNonExistingProfileWithQuestionMarkDoesNotBreak() thr */ @Test public void testDeactivatingExistingAndNonExistingProfiles() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-P"); verifier.addCliArgument("!?non-existing-profile,!existing"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java index 7c1937acd387..f2c490349ee7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java @@ -18,12 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; -import java.io.FileReader; import java.io.IOException; import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -33,30 +32,30 @@ public MavenITmng7110ExtensionClassloader() {} @Test public void testVerifyResourceOfExtensionAndDependency() throws IOException, VerificationException { - final File projectDir = extractResources("/mng-7110-extensionclassloader"); + final Path projectDir = extractResources("mng-7110-extensionclassloader"); - final Verifier extensionVerifier = newVerifier(new File(projectDir, "extension").getAbsolutePath()); + final Verifier extensionVerifier = newVerifier(projectDir.resolve("extension")); extensionVerifier.addCliArgument("install"); extensionVerifier.execute(); extensionVerifier.verifyErrorFreeLog(); - final Verifier libVerifier = newVerifier(new File(projectDir, "lib").getAbsolutePath()); + final Verifier libVerifier = newVerifier(projectDir.resolve("lib")); libVerifier.addCliArgument("install"); libVerifier.execute(); libVerifier.verifyErrorFreeLog(); - final Verifier bomVerifier = newVerifier(new File(projectDir, "bom").getAbsolutePath()); + final Verifier bomVerifier = newVerifier(projectDir.resolve("bom")); bomVerifier.addCliArgument("install"); bomVerifier.execute(); bomVerifier.verifyErrorFreeLog(); - final Verifier projectVerifier = newVerifier(new File(projectDir, "module").getAbsolutePath()); + final Verifier projectVerifier = newVerifier(projectDir.resolve("module")); projectVerifier.addCliArgument("verify"); projectVerifier.execute(); projectVerifier.verifyErrorFreeLog(); Properties properties = new Properties(); - Reader fileReader = new FileReader(new File(projectDir, "module/out.txt")); + Reader fileReader = Files.newBufferedReader(projectDir.resolve("module/out.txt")); properties.load(fileReader); assertEquals("1", properties.getProperty("extension.txt.count", "-1")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java index 0ff421c347e4..aefcc6ee763a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java @@ -18,22 +18,21 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng7112ProjectsWithNonRecursiveTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7112-projects-with-non-recursive"; + private static final String PROJECT_PATH = "mng-7112-projects-with-non-recursive"; @Test public void testAggregatesCanBeBuiltNonRecursively() throws IOException, VerificationException { - final File projectDir = extractResources(PROJECT_PATH); - Verifier cleaner = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + Verifier cleaner = newVerifier(projectDir); cleaner.addCliArgument("clean"); cleaner.execute(); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-pl"); verifier.addCliArgument(":aggregator-a,:aggregator-b"); @@ -51,12 +50,12 @@ public void testAggregatesCanBeBuiltNonRecursively() throws IOException, Verific @Test public void testAggregatesCanBeDeselectedNonRecursively() throws IOException, VerificationException { - final File projectDir = extractResources(PROJECT_PATH); - Verifier cleaner = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + Verifier cleaner = newVerifier(projectDir); cleaner.addCliArgument("clean"); cleaner.execute(); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("-pl"); verifier.addCliArgument("!:aggregator-a,!:aggregator-b"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java index 3b4136ee099b..987a685cd84b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java @@ -18,12 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; -public class MavenITmng7128BlockExternalHttpReactorTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7128-block-external-http-reactor"; +class MavenITmng7128BlockExternalHttpReactorTest extends AbstractMavenIntegrationTestCase { /** * This test verifies that defining a repository in pom.xml that uses HTTP is blocked. @@ -31,9 +29,9 @@ public class MavenITmng7128BlockExternalHttpReactorTest extends AbstractMavenInt * @throws Exception in case of failure */ @Test - public void testBlockedHttpRepositoryInPom() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + void testBlockedHttpRepositoryInPom() throws Exception { + final Path projectDir = extractResources("mng-7128-block-external-http-reactor"); + final Verifier verifier = newVerifier(projectDir); // ITs override global settings that provide blocked mirror: need to define the mirror in dedicated settings verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java index d99afbfcd80f..be065e945dce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java @@ -18,44 +18,43 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng7160ExtensionClassloader extends AbstractMavenIntegrationTestCase { @Test public void testVerify() throws IOException, VerificationException { - final File projectDir = extractResources("/mng-7160-extensionclassloader"); + final Path projectDir = extractResources("mng-7160-extensionclassloader"); - final Verifier extensionVerifier = newVerifier(new File(projectDir, "extension").getAbsolutePath()); + final Verifier extensionVerifier = newVerifier(projectDir.resolve("extension")); extensionVerifier.addCliArgument("install"); extensionVerifier.execute(); extensionVerifier.verifyErrorFreeLog(); - final Verifier verifier1 = newVerifier(new File(projectDir, "project-build").getAbsolutePath()); + final Verifier verifier1 = newVerifier(projectDir.resolve("project-build")); verifier1.addCliArgument("install"); verifier1.execute(); verifier1.verifyErrorFreeLog(); verifier1.verifyTextInLog("xpp3 -> mvn"); verifier1.verifyTextInLog("base64 -> ext"); - final Verifier verifier2 = newVerifier(new File(projectDir, "project-core-parent-first").getAbsolutePath()); + final Verifier verifier2 = newVerifier(projectDir.resolve("project-core-parent-first")); verifier2.addCliArgument("install"); verifier2.execute(); verifier2.verifyErrorFreeLog(); verifier2.verifyTextInLog("xpp3 -> mvn"); verifier2.verifyTextInLog("base64 -> mvn"); - final Verifier verifier3 = newVerifier(new File(projectDir, "project-core-plugin").getAbsolutePath()); + final Verifier verifier3 = newVerifier(projectDir.resolve("project-core-plugin")); verifier3.addCliArgument("verify"); verifier3.execute(); verifier3.verifyErrorFreeLog(); verifier3.verifyTextInLog("xpp3 -> mvn"); verifier3.verifyTextInLog("base64 -> ext"); - final Verifier verifier4 = newVerifier(new File(projectDir, "project-core-self-first").getAbsolutePath()); + final Verifier verifier4 = newVerifier(projectDir.resolve("project-core-self-first")); verifier4.addCliArgument("verify"); verifier4.execute(); verifier4.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java index 033aaf60bef2..31770ffbdcc3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - -import org.apache.commons.io.FileUtils; +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -35,25 +34,20 @@ protected MavenITmng7228LeakyModelTest() { @Test void testLeakyModel() throws Exception { - File testDir = extractResources("/mng-7228-leaky-model"); + Path testDir = extractResources("mng-7228-leaky-model"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setForkJvm(true); // TODO: why? - verifier.addCliArgument("-e"); - verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); - verifier.addCliArgument("-Pmanual-profile"); - - verifier.addCliArgument("install"); + verifier.addCliArguments("-e", "-s", testDir.resolve("settings.xml").toString(), "-Pmanual-profile", "install"); verifier.execute(); verifier.verifyErrorFreeLog(); String classifier = "build"; - String pom = FileUtils.readFileToString(new File( - verifier.getArtifactPath("org.apache.maven.its.mng7228", "test", "1.0.0-SNAPSHOT", "pom", classifier))); + String pom = Files.readString( + verifier.getArtifactPath("org.apache.maven.its.mng7228", "test", "1.0.0-SNAPSHOT", "pom", classifier)); assertTrue(pom.contains("projectProperty")); assertFalse(pom.contains("activeProperty"), "POM should not contain activeProperty but was: " + pom); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java index 1e75be51527a..2a17727900a1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java @@ -18,19 +18,19 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Test; public class MavenITmng7244IgnorePomPrefixInExpressions extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7244-ignore-pom-prefix-in-expressions"; + private static final String PROJECT_PATH = "mng-7244-ignore-pom-prefix-in-expressions"; @Test public void testIgnorePomPrefixInExpressions() throws IOException, VerificationException { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java index 92ff5e7ba123..6b61c74492b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7255InferredGroupIdTest.java @@ -18,18 +18,18 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import org.junit.jupiter.api.Test; public class MavenITmng7255InferredGroupIdTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7255-inferred-groupid"; + private static final String PROJECT_PATH = "mng-7255-inferred-groupid"; @Test public void testInferredGroupId() throws IOException, VerificationException { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java index 5e37e8a7bbd5..198e0f744a88 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; /** * An integration test which proves that the bug of MNG-7310 is fixed. @@ -32,14 +32,14 @@ public class MavenITmng7310LifecycleActivatedInSpecifiedModuleTest extends Abstr public static final String BASE_TEST_DIR = "/mng-7310-lifecycle-activated-in-specified-module"; public void testItShouldNotLoadAnExtensionInASiblingSubmodule() throws Exception { - File extensionTestDir = extractResources(BASE_TEST_DIR + "/extension"); - File projectTestDir = extractResources(BASE_TEST_DIR + "/project"); + Path extensionTestDir = extractResources(BASE_TEST_DIR + "/extension"); + Path projectTestDir = extractResources(BASE_TEST_DIR + "/project"); - Verifier verifier = newVerifier(extensionTestDir.getAbsolutePath()); + Verifier verifier = newVerifier(extensionTestDir); verifier.addCliArgument("install"); verifier.execute(); - Verifier verifier2 = newVerifier(projectTestDir.getAbsolutePath()); + Verifier verifier2 = newVerifier(projectTestDir); verifier2.addCliArgument("compile"); verifier2.execute(); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java index 2c6aa3793c6d..6bad0ac0fa9b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java @@ -18,21 +18,17 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; -public class MavenITmng7335MissingJarInParallelBuild extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7335-missing-jar-in-parallel-build"; +class MavenITmng7335MissingJarInParallelBuild extends AbstractMavenIntegrationTestCase { @Test - public void testMissingJarInParallelBuild() throws IOException, VerificationException { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - verifier.addCliArgument("-T1C"); - verifier.addCliArguments("clean", "package"); - verifier.execute(); + void testMissingJarInParallelBuild() throws IOException, VerificationException { + Path projectDir = extractResources("mng-7335-missing-jar-in-parallel-build"); + Verifier verifier = newVerifier(projectDir); + verifier.execute("-T1C", "clean", "package"); verifier.verifyErrorFreeLog(); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java index d8679fd82287..ed2f770739de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -31,18 +31,18 @@ public class MavenITmng7349RelocationWarningTest extends AbstractMavenIntegratio @Test public void testit() throws Exception { - File testDir = extractResources("/mng-7349-relocation-warning"); - File artifactsDir = new File(testDir, "artifacts"); - File projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-7349-relocation-warning"); + Path artifactsDir = testDir.resolve("artifacts"); + Path projectDir = testDir.resolve("project"); Verifier verifier; - verifier = newVerifier(artifactsDir.getAbsolutePath()); + verifier = newVerifier(artifactsDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java index a9373a653c07..b37994fd1647 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -29,8 +29,8 @@ public class MavenITmng7353CliGoalInvocationTest extends AbstractMavenIntegrationTestCase { private void run(String id, String goal, String expectedInvocation) throws Exception { - File basedir = extractResources("/mng-7353-cli-goal-invocation"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); + Path basedir = extractResources("mng-7353-cli-goal-invocation"); + Verifier verifier = newVerifier(basedir); verifier.setLogFileName(id + ".txt"); verifier.addCliArgument(goal); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java index 34be3e93d5dc..01b59987d211 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,12 +31,12 @@ */ public class MavenITmng7360BuildConsumer extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7360-build-consumer"; + private static final String PROJECT_PATH = "mng-7360-build-consumer"; @Test public void testSelectModuleByCoordinate() throws Exception { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java index e352833ebf03..13ed4239e6c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -33,14 +32,14 @@ */ public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenIntegrationTestCase { - private File moduleADir; + private Path moduleADir; @BeforeEach protected void setUp() throws Exception { - moduleADir = extractResources("/mng-7390-pl-outside-cwd/module-a"); + moduleADir = extractResources("mng-7390-pl-outside-cwd/module-a"); // Clean up target files from earlier runs (verifier.setAutoClean does not work, as we are reducing the reactor) - final Verifier verifier = newVerifier(moduleADir.getAbsolutePath(), false); + final Verifier verifier = newVerifier(moduleADir.toString(), false); verifier.addCliArgument("-f"); verifier.addCliArgument(".."); verifier.addCliArgument("clean"); @@ -49,7 +48,7 @@ protected void setUp() throws Exception { @Test public void testSelectModuleByCoordinate() throws Exception { - final Verifier verifier = newVerifier(moduleADir.getAbsolutePath(), false); + final Verifier verifier = newVerifier(moduleADir.toString(), false); verifier.addCliArgument("-pl"); verifier.addCliArgument(":module-b"); @@ -63,7 +62,7 @@ public void testSelectModuleByCoordinate() throws Exception { @Test public void testSelectMultipleModulesByCoordinate() throws Exception { - final Verifier verifier = newVerifier(moduleADir.getAbsolutePath(), false); + final Verifier verifier = newVerifier(moduleADir.toString(), false); verifier.addCliArgument("-pl"); verifier.addCliArgument(":module-b,:module-a"); @@ -77,7 +76,7 @@ public void testSelectMultipleModulesByCoordinate() throws Exception { @Test public void testSelectModuleByRelativePath() throws Exception { - final Verifier verifier = newVerifier(moduleADir.getAbsolutePath(), false); + final Verifier verifier = newVerifier(moduleADir.toString(), false); verifier.addCliArgument("-pl"); verifier.addCliArgument("../module-b"); @@ -91,7 +90,7 @@ public void testSelectModuleByRelativePath() throws Exception { @Test public void testSelectModulesByRelativePath() throws Exception { - final Verifier verifier = newVerifier(moduleADir.getAbsolutePath(), false); + final Verifier verifier = newVerifier(moduleADir.toString(), false); verifier.addCliArgument("-pl"); verifier.addCliArgument("../module-b,."); @@ -110,8 +109,8 @@ public void testSelectModulesByRelativePath() throws Exception { @Test public void testSelectModulesOutsideCwdDoesNotWorkWhenDotMvnIsNotPresent() throws Exception { final String noDotMvnPath = "/mng-7390-pl-outside-cwd-no-dotmvn/module-a"; - final File noDotMvnDir = extractResources(noDotMvnPath); - final Verifier verifier = newVerifier(noDotMvnDir.getAbsolutePath(), false); + final Path noDotMvnDir = extractResources(noDotMvnPath); + final Verifier verifier = newVerifier(noDotMvnDir.toString(), false); verifier.addCliArgument("-pl"); verifier.addCliArgument("../module-b"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java index c03e9cf8846c..6b72a0416cf4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java @@ -18,19 +18,19 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Test; public class MavenITmng7404IgnorePrefixlessExpressionsTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7404-ignore-prefixless-expressions"; + private static final String PROJECT_PATH = "mng-7404-ignore-prefixless-expressions"; @Test public void testIgnorePrefixlessExpressions() throws IOException, VerificationException { - final File projectDir = extractResources(PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + final Path projectDir = extractResources(PROJECT_PATH); + final Verifier verifier = newVerifier(projectDir); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java index 9e1417b9453f..a3b59b469304 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.List; @@ -30,9 +30,9 @@ public class MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest extends @Test public void testConsistentLoggingOfOptionalProfilesAndProjects() throws IOException, VerificationException { - File testDir = extractResources("/mng-7443-consistency-of-optional-profiles-and-projects"); + Path testDir = extractResources("mng-7443-consistency-of-optional-profiles-and-projects"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-pl"); verifier.addCliArgument("?:does-not-exist"); verifier.addCliArgument("-P"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java index b873daeef103..3ace9ef5ea84 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; @@ -40,9 +40,9 @@ public class MavenITmng7464ReadOnlyMojoParametersWarningTest extends AbstractMav */ @Test public void testEmptyConfiguration() throws Exception { - File testDir = extractResources("/mng-7464-mojo-read-only-params"); + Path testDir = extractResources("mng-7464-mojo-read-only-params"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-empty-configuration.txt"); @@ -62,9 +62,9 @@ public void testEmptyConfiguration() throws Exception { */ @Test public void testReadOnlyProperty() throws Exception { - File testDir = extractResources("/mng-7464-mojo-read-only-params"); + Path testDir = extractResources("mng-7464-mojo-read-only-params"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-Duser.property=value"); verifier.setAutoclean(false); verifier.deleteDirectory("target"); @@ -89,9 +89,9 @@ public void testReadOnlyProperty() throws Exception { */ @Test public void testReadOnlyConfig() throws Exception { - File testDir = extractResources("/mng-7464-mojo-read-only-params"); + Path testDir = extractResources("mng-7464-mojo-read-only-params"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.setLogFileName("log-read-only-configuration.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java index fe5d967888a2..cc264763253f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; @@ -143,9 +143,9 @@ public void testWithForkedGoalExecution() throws Exception { } private List performTest(String project) throws Exception { - File testDir = extractResources("/mng-7468-unsupported-params"); + Path testDir = extractResources("mng-7468-unsupported-params"); - Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve(project)); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index aebdffe5a795..e2452149f402 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -18,10 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.HashMap; import java.util.Map; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -31,7 +30,7 @@ * check that Maven bundled transports work as expected. */ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegrationTestCase { - private File projectDir; + private Path projectDir; private HttpServer server; @@ -39,10 +38,10 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio @BeforeEach protected void setUp() throws Exception { - File testDir = extractResources("/mng-7470-resolver-transport"); - projectDir = new File(testDir, "project"); + Path testDir = extractResources("mng-7470-resolver-transport"); + projectDir = testDir.resolve("project"); - server = HttpServer.builder().port(0).source(new File(testDir, "repo")).build(); + server = HttpServer.builder().port(0).source(testDir.resolve("repo")).build(); server.start(); if (server.isFailed()) { fail("Couldn't bind the server socket to a free port!"); @@ -60,7 +59,7 @@ protected void tearDown() throws Exception { } private void performTest(/* nullable */ final String transport, final String logSnippet) throws Exception { - Verifier verifier = newVerifier(projectDir.getAbsolutePath()); + Verifier verifier = newVerifier(projectDir); Map properties = new HashMap<>(); properties.put("@port@", Integer.toString(port)); @@ -75,7 +74,7 @@ private void performTest(/* nullable */ final String transport, final String log verifier.deleteArtifacts("org.apache.maven.its.resolver-transport"); verifier.addCliArgument("-X"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(projectDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(projectDir.resolve("settings.xml").toString()); verifier.addCliArgument("-Pmaven-core-it-repo"); if (transport != null) { verifier.addCliArgument("-Dmaven.resolver.transport=" + transport); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java index ac3e88c1efe8..4892e2e1613a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -30,14 +30,14 @@ public class MavenITmng7474SessionScopeTest extends AbstractMavenIntegrationTest @Test public void testSessionScope() throws Exception { - File testDir = extractResources("/mng-7474-session-scope"); + Path testDir = extractResources("mng-7474-session-scope"); - Verifier verifier = newVerifier(new File(testDir, "plugin").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("plugin")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "project").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("project")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java index 8462215742e3..24c9e7111795 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java @@ -18,25 +18,24 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; public class MavenITmng7487DeadlockTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7487-deadlock"; + private static final String PROJECT_PATH = "mng-7487-deadlock"; @Test public void testDeadlock() throws IOException, VerificationException { - final File rootDir = extractResources(PROJECT_PATH); + final Path rootDir = extractResources(PROJECT_PATH); - final File pluginDir = new File(rootDir, "plugin"); - final Verifier pluginVerifier = newVerifier(pluginDir.getAbsolutePath()); + final Path pluginDir = rootDir.resolve("plugin"); + final Verifier pluginVerifier = newVerifier(pluginDir); pluginVerifier.addCliArgument("install"); pluginVerifier.execute(); - final File consumerDir = new File(rootDir, "consumer"); - final Verifier consumerVerifier = newVerifier(consumerDir.getAbsolutePath()); + final Path consumerDir = rootDir.resolve("consumer"); + final Verifier consumerVerifier = newVerifier(consumerDir); consumerVerifier.setForkJvm(true); // TODO: why? consumerVerifier.addCliArgument("-T2"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java index de3584de4e97..d24bb84b087b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.io.IOException; import java.util.List; @@ -35,13 +35,13 @@ * @author Slawomir Jaranowski */ public class MavenITmng7504NotWarnUnsupportedReportPluginsTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7504-warn-unsupported-report-plugins"; + private static final String PROJECT_PATH = "mng-7504-warn-unsupported-report-plugins"; @Test public void testWarnNotPresent() throws IOException, VerificationException { - File rootDir = extractResources(PROJECT_PATH); + Path rootDir = extractResources(PROJECT_PATH); - Verifier verifier = newVerifier(rootDir.getAbsolutePath()); + Verifier verifier = newVerifier(rootDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("site"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java index 76cf873a8863..a9f09def0150 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,10 +35,10 @@ public class MavenITmng7529VersionRangeRepositorySelection extends AbstractMaven */ @Test public void testit() throws Exception { - File testDir = extractResources("/mng-7529"); + Path testDir = extractResources("mng-7529"); // First, build the test plugin - Verifier verifier = newVerifier(new File(testDir, "mng7529-plugin").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("mng7529-plugin")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArgument("install"); @@ -46,7 +46,7 @@ public void testit() throws Exception { verifier.verifyErrorFreeLog(); // Then, run the test project that uses the plugin - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng7529"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java index 11f64e5a0ffa..22f2f4c7282a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ class MavenITmng7566JavaPrerequisiteTest extends AbstractMavenIntegrationTestCas */ @Test void testitMojoExecution() throws Exception { - File testDir = extractResources("/mng-7566"); + Path testDir = extractResources("mng-7566"); - Verifier verifier = newVerifier(new File(testDir, "test-1").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("test-1")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng7566"); @@ -65,9 +65,9 @@ void testitMojoExecution() throws Exception { */ @Test void testitPluginVersionResolution() throws Exception { - File testDir = extractResources("/mng-7566"); + Path testDir = extractResources("mng-7566"); - Verifier verifier = newVerifier(new File(testDir, "test-2").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("test-2")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng7566"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java index 20078c8503fd..1fbf63f54a4c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -37,16 +36,16 @@ class MavenITmng7587Jsr330 extends AbstractMavenIntegrationTestCase { */ @Test void test() throws Exception { - File testDir = extractResources("/mng-7587-jsr330").getAbsoluteFile(); + Path testDir = extractResources("mng-7587-jsr330"); - final Verifier pluginVerifier = newVerifier(new File(testDir, "plugin").getPath()); + final Verifier pluginVerifier = newVerifier(testDir.resolve("plugin")); pluginVerifier.addCliArgument("clean"); pluginVerifier.addCliArgument("install"); pluginVerifier.addCliArgument("-V"); pluginVerifier.execute(); pluginVerifier.verifyErrorFreeLog(); - final Verifier consumerVerifier = newVerifier(new File(testDir, "consumer").getPath()); + final Verifier consumerVerifier = newVerifier(testDir.resolve("consumer")); consumerVerifier.addCliArgument("clean"); consumerVerifier.addCliArgument("verify"); consumerVerifier.addCliArgument("-V"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java index d94ebbdf02c1..e5e42ef2ef84 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,9 +38,9 @@ class MavenITmng7606DependencyImportScopeTest extends AbstractMavenIntegrationTe */ @Test void testDependencyResolution() throws Exception { - File testDir = extractResources("/mng-7606"); + Path testDir = extractResources("mng-7606"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(true); verifier.deleteArtifacts("org.apache.maven.its.mng7606"); verifier.addCliArgument("verify"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7629SubtreeBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7629SubtreeBuildTest.java index 3c120bbf1517..6173c38a22a3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7629SubtreeBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7629SubtreeBuildTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -38,15 +38,15 @@ class MavenITmng7629SubtreeBuildTest extends AbstractMavenIntegrationTestCase { */ @Test void testBuildSubtree() throws Exception { - File testDir = extractResources("/mng-7629"); + Path testDir = extractResources("mng-7629"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(true); verifier.addCliArgument("verify"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(true); verifier.addCliArguments("-f", "child-2", "verify"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java index adb38839fd36..914b4b62f8cf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -41,9 +41,9 @@ class MavenITmng7679SingleMojoNoPomTest extends AbstractMavenIntegrationTestCase */ @Test void testSingleMojoNoPom() throws Exception { - File testDir = extractResources("/mng-7679"); + Path testDir = extractResources("mng-7679"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("org.apache.maven.plugins:maven-install-plugin:3.0.1:install-file"); verifier.addCliArgument("-Dfile=mng-7679.txt"); verifier.addCliArgument("-DgroupId=org.apache.maven.it.mng7679"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java index 72b90c0da550..9380ae60138a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ class MavenITmng7697PomWithEmojiTest extends AbstractMavenIntegrationTestCase { */ @Test void testPomRead() throws Exception { - File testDir = extractResources("/mng-7697-emoji"); + Path testDir = extractResources("mng-7697-emoji"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("verify"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java index 77a725107bd3..fb7e9264de46 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -40,9 +40,9 @@ class MavenITmng7716BuildDeadlock extends AbstractMavenIntegrationTestCase { @Test @Timeout(value = 120, unit = TimeUnit.SECONDS) void testNoDeadlockAtVersionUpdate() throws Exception { - File testDir = extractResources("/mng-7716"); + Path testDir = extractResources("mng-7716"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-f"); verifier.addCliArgument("settings"); verifier.addCliArgument("install"); @@ -50,7 +50,7 @@ void testNoDeadlockAtVersionUpdate() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("-T1C"); verifier.addCliArgument("org.codehaus.mojo:versions-maven-plugin:2.15.0:set"); verifier.addCliArgument("-DnewVersion=1.2.3"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java index bd089295ab80..59ededc0074f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ class MavenITmng7737ProfileActivationTest extends AbstractMavenIntegrationTestCa */ @Test void testSingleMojoNoPom() throws Exception { - File testDir = extractResources("/mng-7737-profiles"); + Path testDir = extractResources("mng-7737-profiles"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); verifier.addCliArgument("org.apache.maven.plugins:maven-help-plugin:3.3.0:active-profiles"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java index 5ad264883714..85d775fc3fc6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java @@ -18,13 +18,11 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -36,16 +34,16 @@ class MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest extends AbstractMaven @Test void testConsumerBuildShouldCleanUpOldConsumerFiles() throws Exception { - File testDir = extractResources("/mng-7740-consumer-files"); + Path testDir = extractResources("mng-7740-consumer-files"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); - try (Stream stream = Files.walk(testDir.toPath())) { + try (Stream stream = Files.walk(testDir)) { final List consumerFiles = stream.filter( path -> path.getFileName().toString().contains("consumer") && path.getFileName().toString().contains("pom")) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java index b07051d2d0de..34d0a9868588 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionFoundTest.java @@ -18,11 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; - import org.junit.jupiter.api.Test; import static org.junit.Assert.assertTrue; @@ -31,17 +29,17 @@ public class MavenITmng7772CoreExtensionFoundTest extends AbstractMavenIntegrati @Test public void testWithExtensionsXmlCoreExtensionsFound() throws Exception { - File testDir = extractResources("/mng-7772-core-extensions-found"); + Path testDir = extractResources("mng-7772-core-extensions-found"); - Verifier verifier = newVerifier(new File(testDir, "extension").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("extension")); verifier.setLogFileName("extension-install.txt"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - String installedToLocalRepo = verifier.getLocalRepository(); + Path installedToLocalRepo = verifier.getLocalRepository(); - verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setUserHomeDirectory(Paths.get(testDir.toPath().toString(), "home-extensions-xml")); + verifier = newVerifier(testDir); + verifier.setUserHomeDirectory(testDir.resolve("home-extensions-xml")); verifier.addCliArgument("-Dmaven.repo.local=" + installedToLocalRepo); verifier.addCliArgument("validate"); @@ -52,10 +50,10 @@ public void testWithExtensionsXmlCoreExtensionsFound() throws Exception { @Test public void testWithLibExtCoreExtensionsFound() throws Exception { - File testDir = extractResources("/mng-7772-core-extensions-found"); + Path testDir = extractResources("mng-7772-core-extensions-found"); - Path extensionBasedir = new File(testDir, "extension").getAbsoluteFile().toPath(); - Verifier verifier = newVerifier(extensionBasedir.toString()); + Path extensionBasedir = testDir.resolve("extension"); + Verifier verifier = newVerifier(extensionBasedir); verifier.setLogFileName("extension-package.txt"); verifier.addCliArgument("package"); verifier.execute(); @@ -65,8 +63,8 @@ public void testWithLibExtCoreExtensionsFound() throws Exception { assertTrue("Jar output path was not built", Files.isRegularFile(jarPath)); - verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setUserHomeDirectory(Paths.get(testDir.toPath().toString(), "home-lib-ext")); + verifier = newVerifier(testDir); + verifier.setUserHomeDirectory(Paths.get(testDir.toString(), "home-lib-ext")); verifier.addCliArgument("-Dmaven.ext.class.path=" + jarPath); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java index 34dbfaaa11bd..fbbd09a1eaa3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7772CoreExtensionsNotFoundTest.java @@ -18,9 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; -import java.nio.file.Paths; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -31,10 +29,10 @@ public class MavenITmng7772CoreExtensionsNotFoundTest extends AbstractMavenInteg @Test public void testCoreExtensionsNotFound() throws Exception { - File testDir = extractResources("/mng-7772-core-extensions-not-found"); + Path testDir = extractResources("mng-7772-core-extensions-not-found"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setUserHomeDirectory(Paths.get(testDir.toPath().toString(), "home")); + Verifier verifier = newVerifier(testDir); + verifier.setUserHomeDirectory(testDir.resolve("home")); try { verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java index e1d2311f3969..10188f23e74b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.stream.Collectors; @@ -43,9 +43,9 @@ class MavenITmng7804PluginExecutionOrderTest extends AbstractMavenIntegrationTes */ @Test void testOrder() throws Exception { - File testDir = extractResources("/mng-7804-plugin-execution-order"); + Path testDir = extractResources("mng-7804-plugin-execution-order"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("clean"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java index cacd8e2e4bb9..af32e75fe17c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java @@ -18,11 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.HashMap; import java.util.Map; - -import org.apache.commons.io.FileUtils; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; @@ -45,12 +43,12 @@ protected MavenITmng7819FileLockingWithSnapshotsTest() { @BeforeEach protected void setUp() throws Exception { - File testDir = extractResources("/mng-7819-file-locking-with-snapshots"); + Path testDir = extractResources("mng-7819-file-locking-with-snapshots"); server = new Server(0); ResourceHandler resourceHandler = new ResourceHandler(); resourceHandler.setWelcomeFiles(new String[] {"index.html"}); resourceHandler.setDirectoriesListed(true); - resourceHandler.setResourceBase(new File(testDir, "repo").getAbsolutePath()); + resourceHandler.setResourceBase(testDir.resolve("repo").toString()); HandlerList handlerList = new HandlerList(); handlerList.setHandlers(new Handler[] {resourceHandler}); server.setHandler(handlerList); @@ -72,15 +70,15 @@ protected void tearDown() throws Exception { @Test void testFileLockingAndSnapshots() throws Exception { - File testDir = extractResources("/mng-7819-file-locking-with-snapshots"); + Path testDir = extractResources("mng-7819-file-locking-with-snapshots"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); // produce required precondition state: local repository must not have any of the org.apache.maven.its.mng7819 // artifacts - String path = verifier.getArtifactPath("org.apache.maven.its.mng7819", "dependency", "1.0.0-SNAPSHOT", "pom"); - File groupDirectory = new File(path).getParentFile().getParentFile().getParentFile(); - FileUtils.deleteDirectory(groupDirectory); + Path path = verifier.getArtifactPath("org.apache.maven.its.mng7819", "dependency", "1.0.0-SNAPSHOT", "pom"); + Path groupDirectory = path.getParent().getParent().getParent(); + ItUtils.deleteDirectory(groupDirectory); Map properties = new HashMap<>(); properties.put("@port@", Integer.toString(port)); @@ -88,7 +86,7 @@ void testFileLockingAndSnapshots() throws Exception { verifier.addCliArgument("-e"); verifier.addCliArgument("-s"); - verifier.addCliArgument(new File(testDir, "settings.xml").getAbsolutePath()); + verifier.addCliArgument(testDir.resolve("settings.xml").toString()); verifier.addCliArgument("-Pmaven-core-it-repo"); verifier.addCliArgument("-Daether.syncContext.named.nameMapper=file-gav"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java index 80faacb88504..17998bdbd30e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java @@ -18,13 +18,10 @@ */ package org.apache.maven.it; -import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -38,25 +35,25 @@ protected MavenITmng7836AlternativePomSyntaxTest() { @Test void testAlternativeSyntax() throws Exception { - File testDir = extractResources("/mng-7836-alternative-pom-syntax"); + Path testDir = extractResources("mng-7836-alternative-pom-syntax"); - final Verifier pluginVerifier = newVerifier(new File(testDir, "maven-hocon-extension").getPath()); + final Verifier pluginVerifier = newVerifier(testDir.resolve("maven-hocon-extension")); pluginVerifier.addCliArgument("clean"); pluginVerifier.addCliArgument("install"); pluginVerifier.addCliArgument("-V"); pluginVerifier.execute(); pluginVerifier.verifyErrorFreeLog(); - final Verifier consumerVerifier = newVerifier(new File(testDir, "simple").getPath()); + final Verifier consumerVerifier = newVerifier(testDir.resolve("simple")); consumerVerifier.addCliArgument("clean"); consumerVerifier.addCliArgument("install"); consumerVerifier.addCliArgument("-Drat.skip=true"); consumerVerifier.addCliArgument("-V"); - Path consumerPom = Paths.get(consumerVerifier.getArtifactPath( - "org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT", "pom", "")); - Path buildPom = Paths.get(consumerVerifier.getArtifactPath( - "org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT", "pom", "build")); + Path consumerPom = consumerVerifier.getArtifactPath( + "org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT", "pom", ""); + Path buildPom = consumerVerifier.getArtifactPath( + "org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT", "pom", "build"); consumerVerifier.deleteArtifacts("org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT"); consumerVerifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7837ProjectElementInPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7837ProjectElementInPomTest.java index c7c9c7d81372..d486d8b08cbe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7837ProjectElementInPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7837ProjectElementInPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -31,9 +31,9 @@ protected MavenITmng7837ProjectElementInPomTest() { @Test void testProjectElementInPom() throws Exception { - File testDir = extractResources("/mng-7837-project-element-in-pom"); + Path testDir = extractResources("mng-7837-project-element-in-pom"); - final Verifier pluginVerifier = newVerifier(testDir.getPath()); + final Verifier pluginVerifier = newVerifier(testDir); pluginVerifier.addCliArgument("validate"); pluginVerifier.addCliArgument("-V"); pluginVerifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7891ConfigurationForExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7891ConfigurationForExtensionsTest.java index a5d13d351e4c..75d87eeb6f70 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7891ConfigurationForExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7891ConfigurationForExtensionsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -33,14 +33,14 @@ class MavenITmng7891ConfigurationForExtensionsTest extends AbstractMavenIntegrat @Test void testConfigurationForCoreExtension() throws Exception { - File testDir = extractResources("/mng-7891-extension-configuration"); + Path testDir = extractResources("mng-7891-extension-configuration"); - Verifier verifier = newVerifier(new File(testDir, "extension").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("extension")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "core-extension").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("core-extension")); verifier.addCliArgument("install"); verifier.addCliArgument("-DuserValue=the-value"); verifier.execute(); @@ -57,14 +57,14 @@ void testConfigurationForCoreExtension() throws Exception { @Test void testConfigurationForBuildExtension() throws Exception { - File testDir = extractResources("/mng-7891-extension-configuration"); + Path testDir = extractResources("mng-7891-extension-configuration"); - Verifier verifier = newVerifier(new File(testDir, "extension").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("extension")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "build-extension").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("build-extension")); verifier.addCliArgument("install"); verifier.addCliArgument("-DuserValue=the-value"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java index 4613bacb7ab2..97d9ba623e91 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -37,9 +37,9 @@ class MavenITmng7939PluginsValidationExcludesTest extends AbstractMavenIntegrati @Test void warningForPluginValidationIsPresentInProject() throws Exception { - File testDir = extractResources("/mng-7939-plugins-validation-excludes"); + Path testDir = extractResources("mng-7939-plugins-validation-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("with-warning-log.txt"); verifier.deleteDirectory("target"); @@ -63,9 +63,9 @@ void warningForPluginValidationIsPresentInProject() throws Exception { @Test void excludePluginFromValidation() throws Exception { - File testDir = extractResources("/mng-7939-plugins-validation-excludes"); + Path testDir = extractResources("mng-7939-plugins-validation-excludes"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.setLogFileName("without-warning-log.txt"); verifier.deleteDirectory("target"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7965PomDuplicateTagsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7965PomDuplicateTagsTest.java index 2c5e87a4b8a3..abfc064366ec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7965PomDuplicateTagsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7965PomDuplicateTagsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import java.util.regex.Pattern; @@ -35,9 +35,9 @@ class MavenITmng7965PomDuplicateTagsTest extends AbstractMavenIntegrationTestCas @Test void javadocIsExecutedAndFailed() throws Exception { - File testDir = extractResources("/mng-7965-pom-duplicate-tags"); + Path testDir = extractResources("mng-7965-pom-duplicate-tags"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7967ArtifactHandlerLanguageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7967ArtifactHandlerLanguageTest.java index 26dceeae8244..367843935faa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7967ArtifactHandlerLanguageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7967ArtifactHandlerLanguageTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ class MavenITmng7967ArtifactHandlerLanguageTest extends AbstractMavenIntegration @Test void javadocIsExecutedAndFailed() throws Exception { - File testDir = extractResources("/mng-7967-artifact-handler-language"); + Path testDir = extractResources("mng-7967-artifact-handler-language"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteDirectory("target"); verifier.addCliArgument("org.apache.maven.plugins:maven-javadoc-plugin:3.6.3:jar"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7982DependencyManagementTransitivityTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7982DependencyManagementTransitivityTest.java index b55c9a364ead..82cab6691e13 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7982DependencyManagementTransitivityTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7982DependencyManagementTransitivityTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.List; import org.junit.jupiter.api.Test; @@ -42,9 +42,9 @@ public class MavenITmng7982DependencyManagementTransitivityTest extends Abstract */ @Test public void testitWithTransitiveDependencyManager() throws Exception { - File testDir = extractResources("/mng-7982-transitive-dependency-management"); + Path testDir = extractResources("mng-7982-transitive-dependency-management"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng7982"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); @@ -85,9 +85,9 @@ public void testitWithTransitiveDependencyManager() throws Exception { */ @Test public void testitWithTransitiveDependencyManagerDisabled() throws Exception { - File testDir = extractResources("/mng-7982-transitive-dependency-management"); + Path testDir = extractResources("mng-7982-transitive-dependency-management"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.deleteArtifacts("org.apache.maven.its.mng7982"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8005IdeWorkspaceReaderUsedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8005IdeWorkspaceReaderUsedTest.java index 1461fb2ee007..05c7b0d1f46d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8005IdeWorkspaceReaderUsedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8005IdeWorkspaceReaderUsedTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,14 +26,14 @@ public class MavenITmng8005IdeWorkspaceReaderUsedTest extends AbstractMavenInteg @Test public void testWithIdeWorkspaceReaderUsed() throws Exception { - File testDir = extractResources("/mng-8005"); + Path testDir = extractResources("mng-8005"); - Verifier verifier = newVerifier(new File(testDir, "extension").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("extension")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.addCliArgument("process-resources"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java index 9933ea616ba6..f9b56e7bccea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java @@ -20,7 +20,7 @@ import java.io.File; import java.io.FileReader; - +import java.nio.file.Path; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; @@ -35,11 +35,11 @@ public MavenITmng8106OverlappingDirectoryRolesTest() { @Test public void testDirectoryOverlap() throws Exception { - File testDir = extractResources("/mng-8106"); - String repo = new File(testDir, "repo").getAbsolutePath(); + Path testDir = extractResources("mng-8106"); + String repo = testDir.resolve("repo").toString(); String tailRepo = System.getProperty("user.home") + File.separator + ".m2" + File.separator + "repository"; - Verifier verifier = newVerifier(new File(testDir, "plugin").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("plugin")); verifier.addCliArgument("-X"); verifier.addCliArgument("-Dmaven.repo.local=" + repo); verifier.addCliArgument("-Dmaven.repo.local.tail=" + tailRepo); @@ -47,7 +47,7 @@ public void testDirectoryOverlap() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "jar").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("jar")); verifier.addCliArgument("-X"); verifier.addCliArgument("-Dmaven.repo.local=" + repo); verifier.addCliArgument("-Dmaven.repo.local.tail=" + tailRepo); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8123BuildCacheTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8123BuildCacheTest.java index 55dd5bf995a0..c64684e5c05e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8123BuildCacheTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8123BuildCacheTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,9 +26,9 @@ public class MavenITmng8123BuildCacheTest extends AbstractMavenIntegrationTestCa @Test public void testBuildCacheExtension() throws Exception { - File testDir = extractResources("/mng-8123-build-cache"); + Path testDir = extractResources("mng-8123-build-cache"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8133RootDirectoryInParentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8133RootDirectoryInParentTest.java index 9c6417792188..c3ddefd4b182 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8133RootDirectoryInParentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8133RootDirectoryInParentTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,14 +26,14 @@ public class MavenITmng8133RootDirectoryInParentTest extends AbstractMavenIntegr @Test public void testRootDirectoryInParent() throws Exception { - File testDir = extractResources("/mng-8133-root-directory-in-parent"); + Path testDir = extractResources("mng-8133-root-directory-in-parent"); - Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("parent")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "child").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("child")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java index 3812dd22054f..37cef6177473 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8181CentralRepoTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -36,13 +35,13 @@ public class MavenITmng8181CentralRepoTest extends AbstractMavenIntegrationTestC */ @Test public void testitModel() throws Exception { - File testDir = extractResources("/mng-8181-central-repo"); + Path testDir = extractResources("mng-8181-central-repo"); - Verifier verifier = newVerifier(testDir.getAbsolutePath(), null); + Verifier verifier = newVerifier(testDir.toString(), null); verifier.setAutoclean(false); verifier.addCliArgument("--install-settings=install-settings.xml"); verifier.addCliArgument("--settings=settings.xml"); - verifier.addCliArgument("-Dmaven.repo.local=" + testDir.toPath().resolve("target/local-repo")); + verifier.addCliArgument("-Dmaven.repo.local=" + testDir.resolve("target/local-repo")); verifier.addCliArgument("-Dmaven.repo.local.tail=target/null"); // note: intentionally bad URL, we just want tu ensure that this bad URL is used verifier.addCliArgument("-Dmaven.repo.central=https://repo1.maven.org"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java index dfc17a1fac58..fb2495bae233 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8220ExtensionWithDITest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,14 +34,14 @@ public class MavenITmng8220ExtensionWithDITest extends AbstractMavenIntegrationT */ @Test public void testitModel() throws Exception { - File testDir = extractResources("/mng-8220-extension-with-di"); + Path testDir = extractResources("mng-8220-extension-with-di"); - Verifier verifier = newVerifier(new File(testDir, "extensions").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("extensions")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java index 03a86262112a..f9e1f67ad173 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8230CIFriendlyTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,18 +41,18 @@ class MavenITmng8230CIFriendlyTest extends AbstractMavenIntegrationTestCase { */ @Test void testitCiFriendlyWithProjectProperties() throws Exception { - File testDir = extractResources("/mng-8230-ci-friendly-and-gav"); + Path testDir = extractResources("mng-8230-ci-friendly-and-gav"); - File basedir = new File(testDir, "cif-with-project-props"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); - verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath()); + Path basedir = testDir.resolve("cif-with-project-props"); + Verifier verifier = newVerifier(basedir); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve(PROPERTIES)); verifier.addCliArgument("-Dexpression.expressions=project/version"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval"); verifier.execute(); verifier.verifyErrorFreeLog(); verifier.verifyFilePresent(PROPERTIES); Properties props = verifier.loadProperties(PROPERTIES); - assertEquals(props.getProperty("project.version"), "1.0-SNAPSHOT"); + assertEquals("1.0-SNAPSHOT", props.getProperty("project.version")); } /** @@ -63,11 +62,11 @@ void testitCiFriendlyWithProjectProperties() throws Exception { */ @Test void testitCiFriendlyWithProjectPropertiesOverride() throws Exception { - File testDir = extractResources("/mng-8230-ci-friendly-and-gav"); + Path testDir = extractResources("mng-8230-ci-friendly-and-gav"); - File basedir = new File(testDir, "cif-with-project-props"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); - verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath()); + Path basedir = testDir.resolve("cif-with-project-props"); + Verifier verifier = newVerifier(basedir); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve(PROPERTIES)); verifier.addCliArgument("-Dexpression.expressions=project/version"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval"); verifier.addCliArgument("-Dci-version=1.1-SNAPSHOT"); @@ -75,7 +74,7 @@ void testitCiFriendlyWithProjectPropertiesOverride() throws Exception { verifier.verifyErrorFreeLog(); verifier.verifyFilePresent(PROPERTIES); Properties props = verifier.loadProperties(PROPERTIES); - assertEquals(props.getProperty("project.version"), "1.1-SNAPSHOT"); + assertEquals("1.1-SNAPSHOT", props.getProperty("project.version")); } /** @@ -85,12 +84,12 @@ void testitCiFriendlyWithProjectPropertiesOverride() throws Exception { */ @Test void testitCiFriendlyWithUserProperties() throws Exception { - File testDir = extractResources("/mng-8230-ci-friendly-and-gav"); + Path testDir = extractResources("mng-8230-ci-friendly-and-gav"); - File basedir = new File(testDir, "cif-with-user-props"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); + Path basedir = testDir.resolve("cif-with-user-props"); + Verifier verifier = newVerifier(basedir); - verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath()); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve(PROPERTIES)); verifier.addCliArgument("-Dexpression.expressions=project/version"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval"); verifier.addCliArgument("-Dci-version=1.1-SNAPSHOT"); @@ -98,7 +97,7 @@ void testitCiFriendlyWithUserProperties() throws Exception { verifier.verifyErrorFreeLog(); verifier.verifyFilePresent(PROPERTIES); Properties props = verifier.loadProperties(PROPERTIES); - assertEquals(props.getProperty("project.version"), "1.1-SNAPSHOT"); + assertEquals("1.1-SNAPSHOT", props.getProperty("project.version")); } /** @@ -108,11 +107,11 @@ void testitCiFriendlyWithUserProperties() throws Exception { */ @Test void testitCiFriendlyWithUserPropertiesNotGiven() throws Exception { - File testDir = extractResources("/mng-8230-ci-friendly-and-gav"); + Path testDir = extractResources("mng-8230-ci-friendly-and-gav"); - File basedir = new File(testDir, "cif-with-user-props"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); - verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath()); + Path basedir = testDir.resolve("cif-with-user-props"); + Verifier verifier = newVerifier(basedir); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve(PROPERTIES)); verifier.addCliArgument("-Dexpression.expressions=project/version"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval"); try { @@ -129,11 +128,11 @@ void testitCiFriendlyWithUserPropertiesNotGiven() throws Exception { @Test void testitExpressionInGroupId() throws Exception { - File testDir = extractResources("/mng-8230-ci-friendly-and-gav"); + Path testDir = extractResources("mng-8230-ci-friendly-and-gav"); - File basedir = new File(testDir, "exp-in-groupid"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); - verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath()); + Path basedir = testDir.resolve("exp-in-groupid"); + Verifier verifier = newVerifier(basedir); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve(PROPERTIES)); verifier.addCliArgument("-Dexpression.expressions=project/version"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval"); try { @@ -150,11 +149,11 @@ void testitExpressionInGroupId() throws Exception { @Test void testitExpressionInArtifactId() throws Exception { - File testDir = extractResources("/mng-8230-ci-friendly-and-gav"); + Path testDir = extractResources("mng-8230-ci-friendly-and-gav"); - File basedir = new File(testDir, "exp-in-artifactid"); - Verifier verifier = newVerifier(basedir.getAbsolutePath()); - verifier.addCliArgument("-Dexpression.outputFile=" + new File(basedir, PROPERTIES).getPath()); + Path basedir = testDir.resolve("exp-in-artifactid"); + Verifier verifier = newVerifier(basedir); + verifier.addCliArgument("-Dexpression.outputFile=" + basedir.resolve(PROPERTIES)); verifier.addCliArgument("-Dexpression.expressions=project/version"); verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval"); try { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8244PhaseAllTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8244PhaseAllTest.java index db23e533db71..e315de1133fa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8244PhaseAllTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8244PhaseAllTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITmng8244PhaseAllTest extends AbstractMavenIntegrationTestCase { */ @Test void testPhaseAllWihConcurrentBuilder() throws Exception { - File testDir = extractResources("/mng-8244-phase-all"); + Path testDir = extractResources("mng-8244-phase-all"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("build-concurrent.txt"); verifier.addCliArguments("-b", "concurrent", "build"); verifier.execute(); @@ -50,9 +50,9 @@ void testPhaseAllWihConcurrentBuilder() throws Exception { */ @Test void testPhaseAllWithLegacyBuilder() throws Exception { - File testDir = extractResources("/mng-8244-phase-all"); + Path testDir = extractResources("mng-8244-phase-all"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("build-legacy.txt"); verifier.addCliArguments("build"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8245BeforePhaseCliTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8245BeforePhaseCliTest.java index d308eec0fc53..54973192fc51 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8245BeforePhaseCliTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8245BeforePhaseCliTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ class MavenITmng8245BeforePhaseCliTest extends AbstractMavenIntegrationTestCase */ @Test void testPhaseBeforeCleanAllWihConcurrentBuilder() throws Exception { - File testDir = extractResources("/mng-8245-before-after-phase-all"); + Path testDir = extractResources("mng-8245-before-after-phase-all"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("before-clean-concurrent.txt"); verifier.addCliArguments("-b", "concurrent", "before:clean"); verifier.execute(); @@ -52,9 +52,9 @@ void testPhaseBeforeCleanAllWihConcurrentBuilder() throws Exception { */ @Test void testPhaseBeforeCleanAllWithLegacyBuilder() throws Exception { - File testDir = extractResources("/mng-8245-before-after-phase-all"); + Path testDir = extractResources("mng-8245-before-after-phase-all"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("before-clean-legacy.txt"); verifier.addCliArguments("before:clean"); verifier.execute(); @@ -69,9 +69,9 @@ void testPhaseBeforeCleanAllWithLegacyBuilder() throws Exception { */ @Test void testPhaseAfterCleanAllWihConcurrentBuilder() throws Exception { - File testDir = extractResources("/mng-8245-before-after-phase-all"); + Path testDir = extractResources("mng-8245-before-after-phase-all"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("after-clean-concurrent.txt"); verifier.addCliArguments("-b", "concurrent", "after:clean"); verifier.execute(); @@ -86,9 +86,9 @@ void testPhaseAfterCleanAllWihConcurrentBuilder() throws Exception { */ @Test void testPhaseAfterCleanAllWithLegacyBuilder() throws Exception { - File testDir = extractResources("/mng-8245-before-after-phase-all"); + Path testDir = extractResources("mng-8245-before-after-phase-all"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("after-clean-legacy.txt"); verifier.addCliArguments("after:clean"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8288NoRootPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8288NoRootPomTest.java index cc3cfdc567c8..b584006054b7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8288NoRootPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8288NoRootPomTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITmng8288NoRootPomTest extends AbstractMavenIntegrationTestCase { */ @Test void testitNoRootPomCanBeLoaded() throws Exception { - File testDir = extractResources("/mng-8288-no-root-pom"); + Path testDir = extractResources("mng-8288-no-root-pom"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-f"); verifier.addCliArgument("project"); verifier.addCliArgument("validate"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8293BomImportFromReactor.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8293BomImportFromReactor.java index e0045105799b..90d788012e57 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8293BomImportFromReactor.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8293BomImportFromReactor.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITmng8293BomImportFromReactor extends AbstractMavenIntegrationTestCas */ @Test void testitNoRootPomCanBeLoaded() throws Exception { - File testDir = extractResources("/mng-8293-bom-import-from-reactor"); + Path testDir = extractResources("mng-8293-bom-import-from-reactor"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java index eb808a020e9b..0887a8ce09c9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -36,9 +36,9 @@ class MavenITmng8294ParentChecksTest extends AbstractMavenIntegrationTestCase { */ @Test void testitbadMismatch() throws Exception { - File testDir = extractResources("/mng-8294-parent-checks"); + Path testDir = extractResources("mng-8294-parent-checks"); - Verifier verifier = newVerifier(new File(testDir, "bad-mismatch").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("bad-mismatch")); verifier.addCliArgument("validate"); assertThrows(VerificationException.class, verifier::execute); verifier.verifyTextInLog( @@ -50,9 +50,9 @@ void testitbadMismatch() throws Exception { */ @Test void testitbadNonResolvable() throws Exception { - File testDir = extractResources("/mng-8294-parent-checks"); + Path testDir = extractResources("mng-8294-parent-checks"); - Verifier verifier = newVerifier(new File(testDir, "bad-non-resolvable").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("bad-non-resolvable")); verifier.addCliArgument("validate"); assertThrows(VerificationException.class, verifier::execute); verifier.verifyTextInLog( @@ -64,9 +64,9 @@ void testitbadNonResolvable() throws Exception { */ @Test void testitbadWrongPath() throws Exception { - File testDir = extractResources("/mng-8294-parent-checks"); + Path testDir = extractResources("mng-8294-parent-checks"); - Verifier verifier = newVerifier(new File(testDir, "bad-wrong-path").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("bad-wrong-path")); verifier.addCliArgument("validate"); assertThrows(VerificationException.class, verifier::execute); verifier.verifyTextInLog("points at '../foo' but no POM could be found"); @@ -77,9 +77,9 @@ void testitbadWrongPath() throws Exception { */ @Test void testitokUsingEmpty() throws Exception { - File testDir = extractResources("/mng-8294-parent-checks"); + Path testDir = extractResources("mng-8294-parent-checks"); - Verifier verifier = newVerifier(new File(testDir, "ok-using-empty").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("ok-using-empty")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -89,9 +89,9 @@ void testitokUsingEmpty() throws Exception { */ @Test void testitokUsingGav() throws Exception { - File testDir = extractResources("/mng-8294-parent-checks"); + Path testDir = extractResources("mng-8294-parent-checks"); - Verifier verifier = newVerifier(new File(testDir, "ok-using-gav").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("ok-using-gav")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); @@ -101,9 +101,9 @@ void testitokUsingGav() throws Exception { */ @Test void testitokUsingPath() throws Exception { - File testDir = extractResources("/mng-8294-parent-checks"); + Path testDir = extractResources("mng-8294-parent-checks"); - Verifier verifier = newVerifier(new File(testDir, "ok-using-path").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("ok-using-path")); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8299CustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8299CustomLifecycleTest.java index bfff6a2ce9f3..30e17c62233e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8299CustomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8299CustomLifecycleTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,14 +32,14 @@ class MavenITmng8299CustomLifecycleTest extends AbstractMavenIntegrationTestCase */ @Test void testPhaseOrdering() throws Exception { - File testDir = extractResources("/mng-8299-custom-lifecycle"); + Path testDir = extractResources("mng-8299-custom-lifecycle"); - Verifier verifier = newVerifier(new File(testDir, "CustomLifecyclePlugin").getAbsolutePath()); + Verifier verifier = newVerifier(testDir.resolve("CustomLifecyclePlugin")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "CustomLifecycleProject").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("CustomLifecycleProject")); verifier.addCliArgument("phase3"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java index 5d8516f0f509..a52d9b57cc95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8331VersionedAndUnversionedDependenciesTest.java @@ -18,8 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; import org.junit.jupiter.api.Test; /** @@ -43,9 +44,9 @@ class MavenITmng8331VersionedAndUnversionedDependenciesTest extends AbstractMave */ @Test void allDependenciesArePresentInTheProject() throws Exception { - File testDir = extractResources("/mng-8331-versioned-and-unversioned-deps"); + Path testDir = extractResources("mng-8331-versioned-and-unversioned-deps"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.setLogFileName("allDependenciesArePresentInTheProject.txt"); verifier.addCliArgument("test-compile"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8336UnknownPackagingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8336UnknownPackagingTest.java index 85e5f5629413..55f57218e3fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8336UnknownPackagingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8336UnknownPackagingTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITmng8336UnknownPackagingTest extends AbstractMavenIntegrationTestCas */ @Test void testUnknownPackaging() throws Exception { - File testDir = extractResources("/mng-8336-unknown-packaging"); + Path testDir = extractResources("mng-8336-unknown-packaging"); - Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote"); + Verifier verifier = newVerifier(testDir.toString(), "remote"); verifier.addCliArgument("clean"); verifier.addCliArgument("org.codehaus.mojo:license-maven-plugin:2.4.0:add-third-party"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8340GeneratedPomInTargetTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8340GeneratedPomInTargetTest.java index 357dc63df8c7..87fcc881a039 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8340GeneratedPomInTargetTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8340GeneratedPomInTargetTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,9 +32,9 @@ class MavenITmng8340GeneratedPomInTargetTest extends AbstractMavenIntegrationTes */ @Test void testProjectWithShadePluginAndGeneratedPomUnderTarget() throws Exception { - File testDir = extractResources("/mng-8340"); + Path testDir = extractResources("mng-8340"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java index 38b0d17b2837..0d6d90dc7ce4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -36,9 +36,9 @@ class MavenITmng8341DeadlockTest extends AbstractMavenIntegrationTestCase { @Timeout(value = 60) @Test void testDeadlock() throws Exception { - File testDir = extractResources("/mng-8341-deadlock"); + Path testDir = extractResources("mng-8341-deadlock"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java index d07b1a59d501..845933cb5e59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8347TransitiveDependencyManagerTest.java @@ -18,7 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; import org.junit.jupiter.api.Test; @@ -43,9 +44,9 @@ class MavenITmng8347TransitiveDependencyManagerTest extends AbstractMavenIntegra */ @Test void transitiveDependencyManager() throws Exception { - File testDir = extractResources("/mng-8347-transitive-dependency-manager"); + Path testDir = extractResources("mng-8347-transitive-dependency-manager"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.addCliArgument("-V"); verifier.addCliArgument("dependency:3.8.0:tree"); verifier.addCliArgument("-Dmaven.repo.local.tail=" + testDir + "/local-repo"); @@ -69,9 +70,9 @@ void transitiveDependencyManager() throws Exception { */ @Test void useCaseBndPlugin() throws Exception { - File testDir = extractResources("/mng-8347-bnd-plugin"); + Path testDir = extractResources("mng-8347-bnd-plugin"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.addCliArgument("-V"); verifier.addCliArgument("dependency:3.8.0:tree"); verifier.addCliArgument("-Dmaven.repo.local.tail=" + testDir + "/local-repo"); @@ -89,9 +90,9 @@ void useCaseBndPlugin() throws Exception { */ @Test void useCaseQuarkusTlsRegistry() throws Exception { - File testDir = extractResources("/mng-8347-quarkus-tls-registry"); + Path testDir = extractResources("mng-8347-quarkus-tls-registry"); - Verifier verifier = new Verifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir, null); verifier.addCliArgument("-V"); verifier.addCliArgument("dependency:3.8.0:tree"); verifier.addCliArgument("-Dmaven.repo.local.tail=" + testDir + "/local-repo"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8360SubprojectProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8360SubprojectProfileActivationTest.java index ce6fe44bfaa6..0fd8544f8b62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8360SubprojectProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8360SubprojectProfileActivationTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITmng8360SubprojectProfileActivationTest extends AbstractMavenIntegra */ @Test void testDeadlock() throws Exception { - File testDir = extractResources("/mng-8360"); + Path testDir = extractResources("mng-8360"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArguments("-s", "settings.xml"); verifier.addCliArguments("-f", "module1"); verifier.addCliArgument("org.apache.maven.plugins:maven-help-plugin:3.3.0:active-profiles"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java index c32cf1f7f90a..978fb8e37a79 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8379SettingsDecryptTest.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -34,11 +33,11 @@ class MavenITmng8379SettingsDecryptTest extends AbstractMavenIntegrationTestCase */ @Test void testLegacy() throws Exception { - File testDir = extractResources("/mng-8379-decrypt-settings"); + Path testDir = extractResources("mng-8379-decrypt-settings"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-legacy.txt"); - verifier.setUserHomeDirectory(new File(testDir, "legacyhome").toPath()); + verifier.setUserHomeDirectory(testDir.resolve("legacyhome")); verifier.addCliArgument("org.apache.maven.plugins:maven-help-plugin:3.3.0:effective-settings"); verifier.addCliArgument("-DshowPasswords"); verifier.execute(); @@ -55,12 +54,12 @@ void testLegacy() throws Exception { */ @Test void testModern() throws Exception { - File testDir = extractResources("/mng-8379-decrypt-settings"); + Path testDir = extractResources("mng-8379-decrypt-settings"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setLogFileName("log-modern.txt"); verifier.setEnvironmentVariable("MAVEN_MASTER_PASSWORD", "master"); - verifier.setUserHomeDirectory(new File(testDir, "home").toPath()); + verifier.setUserHomeDirectory(testDir.resolve("home")); verifier.addCliArgument("org.apache.maven.plugins:maven-help-plugin:3.3.0:effective-settings"); verifier.addCliArgument("-DshowPasswords"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8383UnknownTypeDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8383UnknownTypeDependenciesTest.java index 4fd0f5fddb71..e6d5aa7f94e3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8383UnknownTypeDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8383UnknownTypeDependenciesTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,9 +34,9 @@ class MavenITmng8383UnknownTypeDependenciesTest extends AbstractMavenIntegration */ @Test void testUnknownTypeDependencies() throws Exception { - File testDir = extractResources("/mng-8383-unknown-type-dependencies"); + Path testDir = extractResources("mng-8383-unknown-type-dependencies"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("generate-resources"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8385PropertyContributoSPITest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8385PropertyContributoSPITest.java index ef1b4abc8933..f8b7d85ba178 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8385PropertyContributoSPITest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8385PropertyContributoSPITest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -34,15 +34,15 @@ class MavenITmng8385PropertyContributoSPITest extends AbstractMavenIntegrationTe */ @Test void testIt() throws Exception { - File testDir = extractResources("/mng-8385"); + Path testDir = extractResources("mng-8385"); Verifier verifier; - verifier = newVerifier(new File(testDir, "spi-extension").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("spi-extension")); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "spi-consumer").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("spi-consumer")); verifier.addCliArgument("validate"); verifier.addCliArgument("-X"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java index 5dbeccab2abd..046086ac9e36 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8400CanonicalMavenHomeTest.java @@ -41,7 +41,7 @@ class MavenITmng8400CanonicalMavenHomeTest extends AbstractMavenIntegrationTestC */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8400").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8400"); Path tempDir = basedir.resolve("tmp"); Files.createDirectories(tempDir); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java index f73352368928..e864962b5503 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8414ConsumerPomWithNewFeaturesTest.java @@ -43,7 +43,7 @@ class MavenITmng8414ConsumerPomWithNewFeaturesTest extends AbstractMavenIntegrat @Test void testNotPreserving() throws Exception { Path basedir = - extractResources("/mng-8414-consumer-pom-with-new-features").toPath(); + extractResources("mng-8414-consumer-pom-with-new-features"); Verifier verifier = newVerifier(basedir.toString(), null); verifier.addCliArguments("package", "-Dmaven.consumer.pom.flatten=true"); @@ -74,7 +74,7 @@ void testNotPreserving() throws Exception { @Test void testPreserving() throws Exception { Path basedir = - extractResources("/mng-8414-consumer-pom-with-new-features").toPath(); + extractResources("mng-8414-consumer-pom-with-new-features"); Verifier verifier = newVerifier(basedir.toString(), null); verifier.setLogFileName("log-preserving.txt"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8421MavenEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8421MavenEncryptionTest.java index 382a80f27ec7..3b20fe7b1a8c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8421MavenEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8421MavenEncryptionTest.java @@ -34,11 +34,11 @@ class MavenITmng8421MavenEncryptionTest extends AbstractMavenIntegrationTestCase */ @Test void testEmptyHome() throws Exception { - Path basedir = extractResources("/mng-8421").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8421"); Path home = basedir.resolve("home1"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.setLogFileName("home1.txt"); verifier.setUserHomeDirectory(home); verifier.setExecutable("mvnenc"); @@ -54,11 +54,11 @@ void testEmptyHome() throws Exception { */ @Test void testSetupHome() throws Exception { - Path basedir = extractResources("/mng-8421").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8421"); Path home = basedir.resolve("home2"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.setLogFileName("home2.txt"); verifier.setUserHomeDirectory(home); verifier.setExecutable("mvnenc"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8461SpySettingsEventTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8461SpySettingsEventTest.java index 427904ae9604..7d1a80c8d92e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8461SpySettingsEventTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8461SpySettingsEventTest.java @@ -34,18 +34,18 @@ class MavenITmng8461SpySettingsEventTest extends AbstractMavenIntegrationTestCas */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8461").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8461"); Verifier verifier; Path extension = basedir.resolve("extension"); - verifier = newVerifier(extension.toString()); + verifier = newVerifier(extension); verifier.setAutoclean(false); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); Path project = basedir.resolve("project"); - verifier = newVerifier(project.toString()); + verifier = newVerifier(project); verifier.setAutoclean(false); verifier.setForkJvm(true); verifier.addCliArgument("-X"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8465RepositoryWithProjectDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8465RepositoryWithProjectDirTest.java index 652c549a386a..c700a2feba29 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8465RepositoryWithProjectDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8465RepositoryWithProjectDirTest.java @@ -37,9 +37,9 @@ class MavenITmng8465RepositoryWithProjectDirTest extends AbstractMavenIntegratio */ @Test void testProjectDir() throws Exception { - Path basedir = extractResources("/mng-8465").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8465"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("help:effective-pom"); verifier.execute(); List urls = verifier.loadLogLines().stream() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8469InterpolationPrecendenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8469InterpolationPrecendenceTest.java index 0e31d525d26f..93bf8276d6e3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8469InterpolationPrecendenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8469InterpolationPrecendenceTest.java @@ -34,9 +34,9 @@ class MavenITmng8469InterpolationPrecendenceTest extends AbstractMavenIntegratio */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8469").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8469"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("help:effective-pom"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8477MultithreadedFileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8477MultithreadedFileActivationTest.java index 96d7e5344a53..1fcc7ae8fa1b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8477MultithreadedFileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8477MultithreadedFileActivationTest.java @@ -34,9 +34,9 @@ class MavenITmng8477MultithreadedFileActivationTest extends AbstractMavenIntegra */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8477").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8477"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArguments("help:active-profiles", "-Dmaven.modelBuilder.parallelism=1"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java index 664cc03130ae..4dcf2055dcf5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8523ModelPropertiesTest.java @@ -20,10 +20,8 @@ import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; import java.util.stream.Stream; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,15 +39,15 @@ class MavenITmng8523ModelPropertiesTest extends AbstractMavenIntegrationTestCase @Test void testIt() throws Exception { Path basedir = - extractResources("/mng-8523-model-properties").getAbsoluteFile().toPath(); + extractResources("mng-8523-model-properties"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArguments("install", "-DmavenVersion=4.0.0-rc-2", "-Dmaven.consumer.pom.flatten=true"); verifier.execute(); verifier.verifyErrorFreeLog(); Path consumerPomPath = - Paths.get(verifier.getArtifactPath("org.apache.maven.its.mng-8523", "jar", "1.0.0-SNAPSHOT", "pom")); + verifier.getArtifactPath("org.apache.maven.its.mng-8523", "jar", "1.0.0-SNAPSHOT", "pom"); assertTrue(Files.exists(consumerPomPath), "consumer pom not found at " + consumerPomPath); List consumerPomLines; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java index a080d4e73919..8bba770bd9a5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8525MavenDIPlugin.java @@ -18,8 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,11 +28,11 @@ */ public class MavenITmng8525MavenDIPlugin extends AbstractMavenIntegrationTestCase { - private File testDir; + private Path testDir; @BeforeEach public void setUp() throws Exception { - testDir = extractResources("/mng-8525-maven-di-plugin"); + testDir = extractResources("mng-8525-maven-di-plugin"); } @Test @@ -41,7 +40,7 @@ public void testMavenDIPlugin() throws Exception { // // Build a plugin that uses a Maven DI plugin // - Verifier v0 = newVerifier(testDir.getAbsolutePath()); + Verifier v0 = newVerifier(testDir); v0.setAutoclean(false); v0.deleteDirectory("target"); v0.deleteArtifacts("org.apache.maven.its.mng8525"); @@ -52,7 +51,7 @@ public void testMavenDIPlugin() throws Exception { // // Execute the Maven DI plugin // - Verifier v1 = newVerifier(testDir.getAbsolutePath()); + Verifier v1 = newVerifier(testDir); v1.setAutoclean(false); v1.addCliArgument("org.apache.maven.its.mng8525:mavendi-maven-plugin:0.0.1-SNAPSHOT:hello"); v1.addCliArgument("-Dname=World"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java index ccda36a6a3ec..daba239c79bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8527ConsumerPomTest.java @@ -20,10 +20,8 @@ import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; import java.util.stream.Stream; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,17 +40,17 @@ class MavenITmng8527ConsumerPomTest extends AbstractMavenIntegrationTestCase { @Test void testIt() throws Exception { Path basedir = - extractResources("/mng-8527-consumer-pom").getAbsoluteFile().toPath(); + extractResources("mng-8527-consumer-pom"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArguments("install", "-Dmaven.consumer.pom.flatten=true"); verifier.execute(); verifier.verifyErrorFreeLog(); Path consumerPomPath = - Paths.get(verifier.getArtifactPath("org.apache.maven.its.mng-8527", "child", "1.0.0-SNAPSHOT", "pom")); - Path buildPomPath = Paths.get( - verifier.getArtifactPath("org.apache.maven.its.mng-8527", "child", "1.0.0-SNAPSHOT", "pom", "build")); + verifier.getArtifactPath("org.apache.maven.its.mng-8527", "child", "1.0.0-SNAPSHOT", "pom"); + Path buildPomPath = + verifier.getArtifactPath("org.apache.maven.its.mng-8527", "child", "1.0.0-SNAPSHOT", "pom", "build"); assertTrue(Files.exists(consumerPomPath), "consumer pom not found at " + consumerPomPath); assertTrue(Files.exists(buildPomPath), "consumer pom not found at " + consumerPomPath); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8561SourceRootTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8561SourceRootTest.java index a85e423aacf1..1fd61a1cfddc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8561SourceRootTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8561SourceRootTest.java @@ -34,9 +34,9 @@ class MavenITmng8561SourceRootTest extends AbstractMavenIntegrationTestCase { */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8561").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8561"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8572DITypeHandlerTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8572DITypeHandlerTest.java index 32b057d323f2..35d30b759164 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8572DITypeHandlerTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8572DITypeHandlerTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -32,8 +32,8 @@ public class MavenITmng8572DITypeHandlerTest extends AbstractMavenIntegrationTes @Test public void testCustomTypeHandler() throws Exception { // Build the extension first - File testDir = extractResources("/mng-8572-di-type-handler"); - Verifier verifier = newVerifier(new File(testDir, "extension").getAbsolutePath()); + Path testDir = extractResources("mng-8572-di-type-handler"); + Verifier verifier = newVerifier(testDir.resolve("extension")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.deleteArtifacts("org.apache.maven.its.mng8572"); @@ -42,7 +42,7 @@ public void testCustomTypeHandler() throws Exception { verifier.verifyErrorFreeLog(); // Now use the extension in a test project - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.setAutoclean(false); verifier.deleteDirectory("target"); verifier.addCliArguments( @@ -54,7 +54,7 @@ public void testCustomTypeHandler() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(new File(testDir, "test").getAbsolutePath()); + verifier = newVerifier(testDir.resolve("test")); verifier.setAutoclean(false); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8594AtFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8594AtFileTest.java index a95c495318cf..bd1a6a21dd68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8594AtFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8594AtFileTest.java @@ -37,9 +37,9 @@ class MavenITmng8594AtFileTest extends AbstractMavenIntegrationTestCase { */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8594").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8594"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("-af"); verifier.addCliArgument("cmd.txt"); verifier.addCliArgument("-Dcolor1=green"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java index cd210922df3f..d7df607dba89 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8598JvmConfigSubstitutionTest.java @@ -18,9 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import java.util.Properties; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,18 +33,18 @@ public class MavenITmng8598JvmConfigSubstitutionTest extends AbstractMavenIntegr @Test public void testProjectBasedirSubstitution() throws Exception { - File testDir = extractResources("/mng-8598"); + Path testDir = extractResources("mng-8598"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument( - "-Dexpression.outputFile=" + new File(testDir, "target/pom.properties").getAbsolutePath()); + "-Dexpression.outputFile=" + testDir.resolve("target/pom.properties")); verifier.setForkJvm(true); // custom .mvn/jvm.config verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/pom.properties"); - String expectedPath = testDir.getAbsolutePath().replace('\\', '/'); + String expectedPath = testDir.toString().replace('\\', '/'); assertEquals( expectedPath + "/curated", props.getProperty("project.properties.curatedPathProp").replace('\\', '/')); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java index 548e8b918a31..43a115967081 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java @@ -43,11 +43,9 @@ class MavenITmng8645ConsumerPomDependencyManagementTest extends AbstractMavenInt */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8645-consumer-pom-dep-mgmt") - .getAbsoluteFile() - .toPath(); + Path basedir = extractResources("mng-8645-consumer-pom-dep-mgmt"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8648ProjectEventsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8648ProjectEventsTest.java index 0460389bd5f2..765e06ff17f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8648ProjectEventsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8648ProjectEventsTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -26,16 +26,16 @@ public class MavenITmng8648ProjectEventsTest extends AbstractMavenIntegrationTes @Test public void test() throws Exception { - File extensionDir = extractResources("/mng-8648/extension"); + Path extensionDir = extractResources("mng-8648/extension"); - Verifier verifier = newVerifier(extensionDir.getAbsolutePath()); + Verifier verifier = newVerifier(extensionDir); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); - File projectDir = extractResources("/mng-8648/project"); + Path projectDir = extractResources("mng-8648/project"); - verifier = newVerifier(projectDir.getAbsolutePath()); + verifier = newVerifier(projectDir); verifier.addCliArguments("compile", "-b", "concurrent", "-T5"); try { verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8653AfterAndEachPhasesWithConcurrentBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8653AfterAndEachPhasesWithConcurrentBuilderTest.java index 753a1720a9f3..f3721f437651 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8653AfterAndEachPhasesWithConcurrentBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8653AfterAndEachPhasesWithConcurrentBuilderTest.java @@ -37,9 +37,9 @@ class MavenITmng8653AfterAndEachPhasesWithConcurrentBuilderTest extends Abstract */ @Test void testIt() throws Exception { - Path basedir = extractResources("/mng-8653").getAbsoluteFile().toPath(); + Path basedir = extractResources("mng-8653"); - Verifier verifier = newVerifier(basedir.toString()); + Verifier verifier = newVerifier(basedir); verifier.addCliArguments("compile", "-b", "concurrent", "-T8"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java index 34e4959dbca6..1ea61f448a32 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8736ConcurrentFileActivationTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.it; -import java.io.File; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.Test; /** @@ -43,9 +43,9 @@ class MavenITmng8736ConcurrentFileActivationTest extends AbstractMavenIntegratio */ @Test void testConcurrentFileActivation() throws Exception { - File testDir = extractResources("/mng-8736"); + Path testDir = extractResources("mng-8736"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.addCliArgument("-T"); verifier.addCliArgument("4"); verifier.addCliArgument("-Dmaven.modelBuilder.parallelism=4"); // Use 4 threads for concurrent execution @@ -148,14 +148,14 @@ private void analyzeProfileActivationResults(Verifier verifier) throws Exception System.out.println("\n=== PROFILE ACTIVATION ANALYSIS ==="); // Check file existence for all modules - File testDir = new File(verifier.getBasedir()); + Path testDir = verifier.getBasedir(); System.out.println("\nFile existence verification:"); for (int i = 1; i <= 32; i++) { String module = "child" + i; - File activationFile = new File(testDir, module + "/activate.marker"); + Path activationFile = testDir.resolve(module + "/activate.marker"); boolean shouldExist = (i % 2 == 1); // Odd-numbered modules should have activation files - boolean exists = activationFile.exists(); + boolean exists = Files.exists(activationFile); if (shouldExist) { System.out.println(" " + module + "/activate.marker: " + (exists ? "EXISTS" : "MISSING")); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8744CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8744CIFriendlyTest.java index 2c623f8ceb6a..4aa62654580c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8744CIFriendlyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8744CIFriendlyTest.java @@ -18,7 +18,7 @@ */ package org.apache.maven.it; -import java.io.File; +import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -43,9 +43,9 @@ public class MavenITmng8744CIFriendlyTest extends AbstractMavenIntegrationTestCa */ @Test public void testitShouldResolveTheInstalledDependencies() throws Exception { - File testDir = extractResources("/mng-8744-ci-friendly"); + Path testDir = extractResources("mng-8744-ci-friendly"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); + Verifier verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-Drevision=1.2"); @@ -55,13 +55,13 @@ public void testitShouldResolveTheInstalledDependencies() throws Exception { verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("clean"); verifier.execute(); verifier.verifyErrorFreeLog(); - verifier = newVerifier(testDir.getAbsolutePath()); + verifier = newVerifier(testDir); verifier.setAutoclean(false); verifier.addCliArgument("-Drevision=1.2"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java index 6b18e15ecfeb..f851c62012dd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8750NewScopesTest.java @@ -18,9 +18,9 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.IOException; - +import java.nio.file.Files; +import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,10 +45,10 @@ public class MavenITmng8750NewScopesTest extends AbstractMavenIntegrationTestCas @BeforeEach void installDependencies() throws VerificationException, IOException { - File testDir = extractResources("/mng-8750-new-scopes"); + Path testDir = extractResources("mng-8750-new-scopes"); - File depsDir = new File(testDir, "deps"); - Verifier deps = newVerifier(depsDir.getAbsolutePath(), false); + Path depsDir = testDir.resolve("deps"); + Verifier deps = newVerifier(depsDir, false); deps.addCliArgument("install"); deps.addCliArgument("-Dmaven.consumer.pom.flatten=true"); deps.execute(); @@ -66,10 +66,10 @@ void installDependencies() throws VerificationException, IOException { */ @Test public void testCompileOnlyScope() throws Exception { - File testDir = extractResources("/mng-8750-new-scopes"); - File projectDir = new File(testDir, "compile-only-test"); + Path testDir = extractResources("mng-8750-new-scopes"); + Path projectDir = testDir.resolve("compile-only-test"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(projectDir.toString(), false); verifier.addCliArgument("clean"); verifier.addCliArgument("test"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); @@ -80,11 +80,11 @@ public void testCompileOnlyScope() throws Exception { verifier.verifyErrorFreeLog(); // Verify classpath files were generated - File compileClasspath = new File(projectDir, "target/compile-classpath.txt"); - File runtimeClasspath = new File(projectDir, "target/runtime-classpath.txt"); + Path compileClasspath = projectDir.resolve("target/compile-classpath.txt"); + Path runtimeClasspath = projectDir.resolve("target/runtime-classpath.txt"); - assertTrue(compileClasspath.exists(), "Compile classpath file should exist"); - assertTrue(runtimeClasspath.exists(), "Runtime classpath file should exist"); + assertTrue(Files.exists(compileClasspath), "Compile classpath file should exist"); + assertTrue(Files.exists(runtimeClasspath), "Runtime classpath file should exist"); } /** @@ -98,10 +98,10 @@ public void testCompileOnlyScope() throws Exception { */ @Test public void testTestOnlyScope() throws Exception { - File testDir = extractResources("/mng-8750-new-scopes"); - File projectDir = new File(testDir, "test-only-test"); + Path testDir = extractResources("mng-8750-new-scopes"); + Path projectDir = testDir.resolve("test-only-test"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(projectDir.toString(), false); verifier.addCliArgument("clean"); verifier.addCliArgument("test"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); @@ -112,11 +112,11 @@ public void testTestOnlyScope() throws Exception { verifier.verifyErrorFreeLog(); // Verify classpath files were generated - File testCompileClasspath = new File(projectDir, "target/test-compile-classpath.txt"); - File testRuntimeClasspath = new File(projectDir, "target/test-runtime-classpath.txt"); + Path testCompileClasspath = projectDir.resolve("target/test-compile-classpath.txt"); + Path testRuntimeClasspath = projectDir.resolve("target/test-runtime-classpath.txt"); - assertTrue(testCompileClasspath.exists(), "Test compile classpath file should exist"); - assertTrue(testRuntimeClasspath.exists(), "Test runtime classpath file should exist"); + assertTrue(Files.exists(testCompileClasspath), "Test compile classpath file should exist"); + assertTrue(Files.exists(testRuntimeClasspath), "Test runtime classpath file should exist"); } /** @@ -130,10 +130,10 @@ public void testTestOnlyScope() throws Exception { */ @Test public void testTestRuntimeScope() throws Exception { - File testDir = extractResources("/mng-8750-new-scopes"); - File projectDir = new File(testDir, "test-runtime-test"); + Path testDir = extractResources("mng-8750-new-scopes"); + Path projectDir = testDir.resolve("test-runtime-test"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(projectDir.toString(), false); verifier.addCliArgument("clean"); verifier.addCliArgument("test"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); @@ -144,11 +144,11 @@ public void testTestRuntimeScope() throws Exception { verifier.verifyErrorFreeLog(); // Verify classpath files were generated - File testCompileClasspath = new File(projectDir, "target/test-compile-classpath.txt"); - File testRuntimeClasspath = new File(projectDir, "target/test-runtime-classpath.txt"); + Path testCompileClasspath = projectDir.resolve("target/test-compile-classpath.txt"); + Path testRuntimeClasspath = projectDir.resolve("target/test-runtime-classpath.txt"); - assertTrue(testCompileClasspath.exists(), "Test compile classpath file should exist"); - assertTrue(testRuntimeClasspath.exists(), "Test runtime classpath file should exist"); + assertTrue(Files.exists(testCompileClasspath), "Test compile classpath file should exist"); + assertTrue(Files.exists(testRuntimeClasspath), "Test runtime classpath file should exist"); } /** @@ -159,10 +159,10 @@ public void testTestRuntimeScope() throws Exception { */ @Test public void testAllNewScopesTogether() throws Exception { - File testDir = extractResources("/mng-8750-new-scopes"); - File projectDir = new File(testDir, "comprehensive-test"); + Path testDir = extractResources("mng-8750-new-scopes"); + Path projectDir = testDir.resolve("comprehensive-test"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(projectDir.toString(), false); verifier.addCliArgument("clean"); verifier.addCliArgument("test"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); @@ -173,15 +173,15 @@ public void testAllNewScopesTogether() throws Exception { verifier.verifyErrorFreeLog(); // Verify all classpath files were generated - File compileClasspath = new File(projectDir, "target/compile-classpath.txt"); - File runtimeClasspath = new File(projectDir, "target/runtime-classpath.txt"); - File testCompileClasspath = new File(projectDir, "target/test-compile-classpath.txt"); - File testRuntimeClasspath = new File(projectDir, "target/test-runtime-classpath.txt"); - - assertTrue(compileClasspath.exists(), "Compile classpath file should exist"); - assertTrue(runtimeClasspath.exists(), "Runtime classpath file should exist"); - assertTrue(testCompileClasspath.exists(), "Test compile classpath file should exist"); - assertTrue(testRuntimeClasspath.exists(), "Test runtime classpath file should exist"); + Path compileClasspath = projectDir.resolve("target/compile-classpath.txt"); + Path runtimeClasspath = projectDir.resolve("target/runtime-classpath.txt"); + Path testCompileClasspath = projectDir.resolve("target/test-compile-classpath.txt"); + Path testRuntimeClasspath = projectDir.resolve("target/test-runtime-classpath.txt"); + + assertTrue(Files.exists(compileClasspath), "Compile classpath file should exist"); + assertTrue(Files.exists(runtimeClasspath), "Runtime classpath file should exist"); + assertTrue(Files.exists(testCompileClasspath), "Test compile classpath file should exist"); + assertTrue(Files.exists(testRuntimeClasspath), "Test runtime classpath file should exist"); } /** @@ -192,10 +192,10 @@ public void testAllNewScopesTogether() throws Exception { */ @Test public void testValidationFailureWithModelVersion40() throws Exception { - File testDir = extractResources("/mng-8750-new-scopes"); - File projectDir = new File(testDir, "validation-failure-test"); + Path testDir = extractResources("mng-8750-new-scopes"); + Path projectDir = testDir.resolve("validation-failure-test"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(projectDir.toString(), false); verifier.addCliArgument("clean"); verifier.addCliArgument("validate"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); @@ -218,10 +218,10 @@ public void testValidationFailureWithModelVersion40() throws Exception { */ @Test public void testValidationSuccessWithModelVersion41() throws Exception { - File testDir = extractResources("/mng-8750-new-scopes"); - File projectDir = new File(testDir, "validation-success-test"); + Path testDir = extractResources("mng-8750-new-scopes"); + Path projectDir = testDir.resolve("validation-success-test"); - Verifier verifier = newVerifier(projectDir.getAbsolutePath(), false); + Verifier verifier = newVerifier(projectDir.toString(), false); verifier.addCliArgument("clean"); verifier.addCliArgument("validate"); verifier.addCliArgument("-Dmaven.consumer.pom.flatten=true"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 224b1e001f5e..bb83ea0a5fcb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -60,7 +60,7 @@ private static void infoProperty(PrintStream info, String property) { System.clearProperty("maven.conf"); System.clearProperty("classworlds.conf"); - Verifier verifier = new Verifier("", false); + Verifier verifier = new Verifier(Paths.get(""), null, false); String mavenVersion = verifier.getMavenVersion(); String executable = verifier.getExecutable(); ExecutorHelper.Mode defaultMode = verifier.getDefaultMode(); diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java index 9cd88c789ee9..8cba7d041d5c 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java @@ -18,11 +18,12 @@ */ package org.apache.maven.it; -import java.io.File; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Arrays; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -71,27 +72,54 @@ public void close() throws IOException {} - protected File extractResources(String resourcePath) throws IOException { - return new File( - new File(System.getProperty("maven.test.tmpdir", System.getProperty("java.io.tmpdir"))), - resourcePath) - .getAbsoluteFile(); + /** + * Extracts test resources to a temporary directory. + * + * @param resourcePath The path to the resource directory, must not be null. + * @return The path to the extracted resources, never null. + * @throws IOException If the resources could not be extracted. + * @since 4.0.0 + */ + protected Path extractResources(String resourcePath) throws IOException { + return Paths.get(System.getProperty("maven.test.tmpdir", System.getProperty("java.io.tmpdir"))) + .resolve(resourcePath) + .toAbsolutePath(); } + @Deprecated protected Verifier newVerifier(String basedir) throws VerificationException { return newVerifier(basedir, true); } + protected Verifier newVerifier(Path basedir) throws VerificationException { + return newVerifier(basedir, true); + } + + @Deprecated protected Verifier newVerifier(String basedir, String settings) throws VerificationException { return newVerifier(basedir, settings, true); } + protected Verifier newVerifier(Path basedir, String settings) throws VerificationException { + return newVerifier(basedir, settings, true); + } + + @Deprecated protected Verifier newVerifier(String basedir, boolean createDotMvn) throws VerificationException { return newVerifier(basedir, "remote", createDotMvn); } + protected Verifier newVerifier(Path basedir, boolean createDotMvn) throws VerificationException { + return newVerifier(basedir, "remote", createDotMvn); + } + + @Deprecated protected Verifier newVerifier(String basedir, String settings, boolean createDotMvn) throws VerificationException { - Verifier verifier = new Verifier(basedir, createDotMvn); + return newVerifier(Paths.get(basedir), settings, createDotMvn); + } + + protected Verifier newVerifier(Path basedir, String settings, boolean createDotMvn) throws VerificationException { + Verifier verifier = new Verifier(basedir, null, createDotMvn); // try to get jacoco arg from command line if any then use it to start IT to populate jacoco data // we use a different file than the main one @@ -107,27 +135,27 @@ protected Verifier newVerifier(String basedir, String settings, boolean createDo verifier.setAutoclean(false); if (settings != null) { - File settingsFile; + Path settingsPath; if (!settings.isEmpty()) { - settingsFile = new File("settings-" + settings + ".xml"); + settingsPath = Paths.get("settings-" + settings + ".xml"); } else { - settingsFile = new File("settings.xml"); + settingsPath = Paths.get("settings.xml"); } - if (!settingsFile.isAbsolute()) { + if (!settingsPath.isAbsolute()) { String settingsDir = System.getProperty("maven.it.global-settings.dir", ""); if (!settingsDir.isEmpty()) { - settingsFile = new File(settingsDir, settingsFile.getPath()); + settingsPath = Paths.get(settingsDir).resolve(settingsPath); } else { // // Make is easier to run ITs from m2e in Maven IT mode without having to set any additional // properties. // - settingsFile = new File("target/test-classes", settingsFile.getPath()); + settingsPath = Paths.get("target/test-classes").resolve(settingsPath); } } - String path = settingsFile.getAbsolutePath(); + String path = settingsPath.toAbsolutePath().toString(); verifier.addCliArgument("--install-settings"); if (path.indexOf(' ') < 0) { verifier.addCliArgument(path); diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java index e33cb61cb98f..9e975fe355d3 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -20,22 +20,20 @@ import java.io.BufferedReader; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -53,7 +51,6 @@ import org.apache.maven.cling.executor.forked.ForkedMavenExecutor; import org.apache.maven.cling.executor.internal.HelperImpl; import org.apache.maven.cling.executor.internal.ToolboxTool; -import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; import static java.util.Objects.requireNonNull; @@ -131,18 +128,14 @@ public class Verifier { private ByteArrayOutputStream stderr; - public Verifier(String basedir) throws VerificationException { - this(basedir, null); + public Verifier(Path basedir) throws VerificationException { + this(basedir, null, true); } - public Verifier(String basedir, List defaultCliArguments) throws VerificationException { + public Verifier(Path basedir, List defaultCliArguments) throws VerificationException { this(basedir, defaultCliArguments, true); } - public Verifier(String basedir, boolean createDotMvn) throws VerificationException { - this(basedir, null, createDotMvn); - } - /** * Creates verifier instance using passed in basedir as "cwd" and passed in default CLI arguments (if not null). * The discovery of user home and Maven installation directory is performed as well. @@ -153,10 +146,10 @@ public Verifier(String basedir, boolean createDotMvn) throws VerificationExcepti * * @see #DEFAULT_CLI_ARGUMENTS */ - public Verifier(String basedir, List defaultCliArguments, boolean createDotMvn) throws VerificationException { + public Verifier(Path basedir, List defaultCliArguments, boolean createDotMvn) throws VerificationException { requireNonNull(basedir); try { - this.basedir = Paths.get(basedir).toAbsolutePath(); + this.basedir = basedir.toAbsolutePath(); if (createDotMvn) { Files.createDirectories(this.basedir.resolve(".mvn")); } @@ -199,10 +192,15 @@ public ExecutorHelper.Mode getDefaultMode() { return executorHelper.getDefaultMode(); } + public void execute(String... args) throws VerificationException { + addCliArguments(args); + execute(); + } + public void execute() throws VerificationException { List args = new ArrayList<>(defaultCliArguments); for (String cliArgument : cliArguments) { - args.add(cliArgument.replace("${basedir}", getBasedir())); + args.add(cliArgument.replace("${basedir}", getBasedir().toString())); } if (handleLocalRepoTail) { @@ -351,8 +349,8 @@ public void setEnvironmentVariable(String key, String value) { } } - public String getBasedir() { - return basedir.toString(); + public Path getBasedir() { + return basedir; } public void setLogFileName(String logFileName) { @@ -379,11 +377,15 @@ public void setHandleLocalRepoTail(boolean handleLocalRepoTail) { this.handleLocalRepoTail = handleLocalRepoTail; } - public String getLocalRepository() { + public Path getLocalRepository() { return getLocalRepositoryWithSettings(null); } - public String getLocalRepositoryWithSettings(String settingsXml) { + public Path getLocalRepositoryWithSettings(String settingsXml) { + return Path.of(doGetLocalRepositoryWithSettings(settingsXml)).toAbsolutePath(); + } + + private String doGetLocalRepositoryWithSettings(String settingsXml) { if (settingsXml != null) { // when invoked with settings.xml, the file must be resolved from basedir (as Maven does) // but we should not use basedir, as it may contain extensions.xml or a project, that Maven will eagerly @@ -427,7 +429,7 @@ public Path getLogFile() { } public void verifyErrorFreeLog() throws VerificationException { - List lines = loadFile(logFile.toFile(), false); + List lines = loadFile(logFile); for (String line : lines) { // A hack to keep stupid velocity resource loader errors from triggering failure @@ -485,7 +487,7 @@ private static boolean isVelocityError(String line) { * @throws VerificationException if text is not found in log */ public void verifyTextInLog(String text) throws VerificationException { - List lines = loadFile(logFile.toFile(), false); + List lines = loadFile(logFile); boolean result = false; for (String line : lines) { @@ -512,11 +514,22 @@ public static String stripAnsi(String msg) { } public Properties loadProperties(String filename) throws VerificationException { + return loadProperties(basedir.resolve(filename)); + } + + /** + * Loads properties from the specified file. + * + * @param propertiesPath The path to the properties file, must not be null. + * @return The loaded properties, never null. + * @throws VerificationException If the properties could not be loaded. + * @since 4.0.0 + */ + public Properties loadProperties(Path propertiesPath) throws VerificationException { Properties properties = new Properties(); - File propertiesFile = new File(getBasedir(), filename); - try (FileInputStream fis = new FileInputStream(propertiesFile)) { - properties.load(fis); + try (InputStream is = Files.newInputStream(propertiesPath)) { + properties.load(is); } catch (IOException e) { throw new VerificationException("Error reading properties file", e); } @@ -548,33 +561,38 @@ public List loadLines(String filename, String encoding) throws IOExcepti } private BufferedReader getReader(String filename, String encoding) throws IOException { - File file = new File(getBasedir(), filename); + return getReader(basedir.resolve(filename), encoding); + } + + private BufferedReader getReader(Path filePath, String encoding) throws IOException { if (encoding != null && !encoding.isEmpty()) { - return Files.newBufferedReader(file.toPath(), Charset.forName(encoding)); + return Files.newBufferedReader(filePath, Charset.forName(encoding)); } else { - return Files.newBufferedReader(file.toPath()); + return Files.newBufferedReader(filePath); } } - public List loadFile(String basedir, String filename, boolean hasCommand) throws VerificationException { - return loadFile(new File(basedir, filename), hasCommand); + public List loadFile(String basedir, String filename) throws VerificationException { + return loadFile(Paths.get(basedir).resolve(filename)); } - public List loadFile(File file, boolean hasCommand) throws VerificationException { + /** + * Loads the lines of the specified file. + * + * @param filePath The path to the file to load, must not be null. + * @return The list of lines from the file, can be empty but never null. + * @throws VerificationException If the file could not be loaded. + * @since 4.0.0 + */ + public List loadFile(Path filePath) throws VerificationException { List lines = new ArrayList<>(); - if (file.exists()) { - try (BufferedReader reader = new BufferedReader(new FileReader(file))) { - String line = reader.readLine(); - - while (line != null) { - line = line.trim(); - - if (!line.startsWith("#") && !line.isEmpty()) { - lines.addAll(replaceArtifacts(line, hasCommand)); - } - line = reader.readLine(); - } + if (Files.exists(filePath)) { + try (Stream stream = Files.lines(filePath)) { + return stream + .map(String::trim) + .filter(line -> !line.startsWith("#") && !line.isEmpty()) + .toList(); } catch (IOException e) { throw new VerificationException("Verifier loadFile failure", e); } @@ -595,68 +613,22 @@ public List loadLines(String filename) throws IOException { return loadLines(filename, null); } - private static final String MARKER = "${artifact:"; - - private List replaceArtifacts(String line, boolean hasCommand) { - int index = line.indexOf(MARKER); - if (index >= 0) { - String newLine = line.substring(0, index); - index = line.indexOf("}", index); - if (index < 0) { - throw new IllegalArgumentException("line does not contain ending artifact marker: '" + line + "'"); - } - String artifact = line.substring(newLine.length() + MARKER.length(), index); - - newLine += getArtifactPath(artifact); - newLine += line.substring(index + 1); - - List l = new ArrayList<>(); - l.add(newLine); - - int endIndex = newLine.lastIndexOf('/'); - - String command = null; - String filespec; - if (hasCommand) { - int startIndex = newLine.indexOf(' '); - - command = newLine.substring(0, startIndex); - - filespec = newLine.substring(startIndex + 1, endIndex); - } else { - filespec = newLine; - } - - File dir = new File(filespec); - addMetadataToList(dir, hasCommand, l, command); - addMetadataToList(dir.getParentFile(), hasCommand, l, command); - - return l; - } else { - return Collections.singletonList(line); - } - } - - private static void addMetadataToList(File dir, boolean hasCommand, List l, String command) { - if (dir.exists() && dir.isDirectory()) { - String[] files = dir.list(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.startsWith("maven-metadata") && name.endsWith(".xml"); - } - }); - - for (String file : files) { - if (hasCommand) { - l.add(command + " " + new File(dir, file).getPath()); - } else { - l.add(new File(dir, file).getPath()); + private static void addMetadataToList(Path dir, List l) { + if (Files.exists(dir) && Files.isDirectory(dir)) { + try (DirectoryStream stream = Files.newDirectoryStream(dir, "maven-metadata*.xml")) { + for (Path file : stream) { + String fileName = file.getFileName().toString(); + if (fileName.startsWith("maven-metadata") && fileName.endsWith(".xml")) { + l.add(file); + } } + } catch (IOException e) { + // Ignore directory access errors } } } - private String getArtifactPath(String artifact) { + private Path getArtifactPath(String artifact) { StringTokenizer tok = new StringTokenizer(artifact, ":"); if (tok.countTokens() != 4) { throw new IllegalArgumentException("Artifact must have 4 tokens: '" + artifact + "'"); @@ -674,7 +646,7 @@ private String getArtifactPath(String artifact) { return getArtifactPath(groupId, artifactId, version, ext); } - public String getArtifactPath(String groupId, String artifactId, String version, String ext) { + public Path getArtifactPath(String groupId, String artifactId, String version, String ext) { return getArtifactPath(groupId, artifactId, version, ext, null); } @@ -689,7 +661,7 @@ public String getArtifactPath(String groupId, String artifactId, String version, * @return the absolute path to the artifact denoted by groupId, artifactId, version, extension and classifier, * never null. */ - public String getArtifactPath(String gid, String aid, String version, String ext, String classifier) { + public Path getArtifactPath(String gid, String aid, String version, String ext, String classifier) { if (classifier != null && classifier.isEmpty()) { classifier = null; } @@ -709,12 +681,10 @@ public String getArtifactPath(String gid, String aid, String version, String ext } else { gav = gid + ":" + aid + ":" + ext + ":" + version; } - return getLocalRepository() - + File.separator - + executorTool.artifactPath(executorHelper.executorRequest(), gav, null); + return getLocalRepository().resolve(executorTool.artifactPath(executorHelper.executorRequest(), gav, null)); } - private String getSupportArtifactPath(String artifact) { + private Path getSupportArtifactPath(String artifact) { StringTokenizer tok = new StringTokenizer(artifact, ":"); if (tok.countTokens() != 4) { throw new IllegalArgumentException("Artifact must have 4 tokens: '" + artifact + "'"); @@ -732,7 +702,7 @@ private String getSupportArtifactPath(String artifact) { return getSupportArtifactPath(groupId, artifactId, version, ext); } - public String getSupportArtifactPath(String groupId, String artifactId, String version, String ext) { + public Path getSupportArtifactPath(String groupId, String artifactId, String version, String ext) { return getSupportArtifactPath(groupId, artifactId, version, ext, null); } @@ -747,7 +717,7 @@ public String getSupportArtifactPath(String groupId, String artifactId, String v * @return the absolute path to the artifact denoted by groupId, artifactId, version, extension and classifier, * never null. */ - public String getSupportArtifactPath(String gid, String aid, String version, String ext, String classifier) { + public Path getSupportArtifactPath(String gid, String aid, String version, String ext, String classifier) { if (classifier != null && classifier.isEmpty()) { classifier = null; } @@ -771,17 +741,18 @@ public String getSupportArtifactPath(String gid, String aid, String version, Str .resolve(executorTool.artifactPath( executorHelper.executorRequest().argument("-Dmaven.repo.local=" + outerLocalRepository), gav, - null)) - .toString(); + null)); } - public List getArtifactFileNameList(String org, String name, String version, String ext) { - List files = new ArrayList<>(); - String artifactPath = getArtifactPath(org, name, version, ext); - File dir = new File(artifactPath); + public List getArtifactFileNameList(String org, String name, String version, String ext) { + List files = new ArrayList<>(); + Path artifactPath = getArtifactPath(org, name, version, ext); files.add(artifactPath); - addMetadataToList(dir, false, files, null); - addMetadataToList(dir.getParentFile(), false, files, null); + addMetadataToList(artifactPath, files); + Path parent = artifactPath.getParent(); + if (parent != null) { + addMetadataToList(parent, files); + } return files; } @@ -794,7 +765,7 @@ public List getArtifactFileNameList(String org, String name, String vers * @param version The artifact version, may be null. * @return The (absolute) path to the local artifact metadata, never null. */ - public String getArtifactMetadataPath(String gid, String aid, String version) { + public Path getArtifactMetadataPath(String gid, String aid, String version) { return getArtifactMetadataPath(gid, aid, version, "maven-metadata.xml"); } @@ -808,7 +779,7 @@ public String getArtifactMetadataPath(String gid, String aid, String version) { * @param filename The filename to use, must not be null. * @return The (absolute) path to the local artifact metadata, never null. */ - public String getArtifactMetadataPath(String gid, String aid, String version, String filename) { + public Path getArtifactMetadataPath(String gid, String aid, String version, String filename) { return getArtifactMetadataPath(gid, aid, version, filename, null); } @@ -823,7 +794,7 @@ public String getArtifactMetadataPath(String gid, String aid, String version, St * @param repoId The remote repository ID from where metadata originate, may be null. * @return The (absolute) path to the local artifact metadata, never null. */ - public String getArtifactMetadataPath(String gid, String aid, String version, String filename, String repoId) { + public Path getArtifactMetadataPath(String gid, String aid, String version, String filename, String repoId) { String gav; if (gid != null) { gav = gid + ":"; @@ -841,9 +812,7 @@ public String getArtifactMetadataPath(String gid, String aid, String version, St gav += ":"; } gav += filename; - return getLocalRepository() - + File.separator - + executorTool.metadataPath(executorHelper.executorRequest(), gav, repoId); + return getLocalRepository().resolve(executorTool.metadataPath(executorHelper.executorRequest(), gav, repoId)); } /** @@ -854,14 +823,14 @@ public String getArtifactMetadataPath(String gid, String aid, String version, St * @param aid The artifact id, must not be null. * @return The (absolute) path to the local artifact metadata, never null. */ - public String getArtifactMetadataPath(String gid, String aid) { + public Path getArtifactMetadataPath(String gid, String aid) { return getArtifactMetadataPath(gid, aid, null); } public void deleteArtifact(String org, String name, String version, String ext) throws IOException { - List files = getArtifactFileNameList(org, name, version, ext); - for (String fileName : files) { - FileUtils.forceDelete(new File(fileName)); + List files = getArtifactFileNameList(org, name, version, ext); + for (Path fileName : files) { + Files.deleteIfExists(fileName); } } @@ -874,8 +843,8 @@ public void deleteArtifact(String org, String name, String version, String ext) */ public void deleteArtifacts(String gid) throws IOException { String mdPath = executorTool.metadataPath(executorHelper.executorRequest(), gid, null); - Path dir = Paths.get(getLocalRepository()).resolve(mdPath).getParent(); - FileUtils.deleteDirectory(dir.toFile()); + Path dir = getLocalRepository().resolve(mdPath).getParent(); + deleteDirectoryRecursively(dir); } /** @@ -894,8 +863,8 @@ public void deleteArtifacts(String gid, String aid, String version) throws IOExc String mdPath = executorTool.metadataPath(executorHelper.executorRequest(), gid + ":" + aid + ":" + version, null); - Path dir = Paths.get(getLocalRepository()).resolve(mdPath).getParent(); - FileUtils.deleteDirectory(dir.toFile()); + Path dir = getLocalRepository().resolve(mdPath).getParent(); + deleteDirectoryRecursively(dir); } /** @@ -906,15 +875,36 @@ public void deleteArtifacts(String gid, String aid, String version) throws IOExc * @since 1.2 */ public void deleteDirectory(String path) throws IOException { - FileUtils.deleteDirectory(new File(getBasedir(), path)); + deleteDirectoryRecursively(basedir.resolve(path)); + } + + /** + * Recursively deletes a directory and all its contents using NIO2. + * + * @param dir The directory to delete, must not be null. + * @throws IOException If the directory could not be deleted. + */ + private static void deleteDirectoryRecursively(Path dir) throws IOException { + if (Files.exists(dir)) { + try (Stream paths = Files.walk(dir)) { + paths.sorted(Comparator.reverseOrder()) + .forEach(path -> { + try { + Files.delete(path); + } catch (IOException e) { + // Ignore individual file deletion errors + } + }); + } + } } - public File filterFile(String srcPath, String dstPath) throws IOException { - return filterFile(srcPath, dstPath, (String) null); + public Path filterFile(String srcPath, String dstPath) throws IOException { + return filterFile(basedir.resolve(srcPath), basedir.resolve(dstPath), null, newDefaultFilterMap()); } - public File filterFile(String srcPath, String dstPath, Map filterMap) throws IOException { - return filterFile(srcPath, dstPath, null, filterMap); + public Path filterFile(String srcPath, String dstPath, Map filterMap) throws IOException { + return filterFile(basedir.resolve(srcPath), basedir.resolve(dstPath), null, filterMap); } /** @@ -935,8 +925,8 @@ public File filterFile(String srcPath, String dstPath, Map filte * @throws IOException If the file could not be filtered. * @since 2.0 */ - public File filterFile(String srcPath, String dstPath, String fileEncoding) throws IOException { - return filterFile(srcPath, dstPath, fileEncoding, newDefaultFilterMap()); + public Path filterFile(String srcPath, String dstPath, String fileEncoding) throws IOException { + return filterFile(basedir.resolve(srcPath), basedir.resolve(dstPath), fileEncoding, newDefaultFilterMap()); } /** @@ -953,22 +943,36 @@ public File filterFile(String srcPath, String dstPath, String fileEncoding) thro * @throws IOException If the file could not be filtered. * @since 1.2 */ - public File filterFile(String srcPath, String dstPath, String fileEncoding, Map filterMap) + public Path filterFile(String srcPath, String dstPath, String fileEncoding, Map filterMap) + throws IOException { + return filterFile(basedir.resolve(srcPath), basedir.resolve(dstPath), fileEncoding, filterMap); + } + + /** + * Filters a text file by replacing some user-defined tokens. + * + * @param srcPath The path to the input file, must not be null. + * @param dstPath The path to the output file, must not be null. + * @param fileEncoding The file encoding to use, may be null or empty to use the platform's default + * encoding. + * @param filterMap The mapping from tokens to replacement values, must not be null. + * @return The path to the filtered output file, never null. + * @throws IOException If the file could not be filtered. + * @since 4.0.0 + */ + public Path filterFile(Path srcPath, Path dstPath, String fileEncoding, Map filterMap) throws IOException { Charset charset = fileEncoding != null ? Charset.forName(fileEncoding) : StandardCharsets.UTF_8; - File srcFile = new File(getBasedir(), srcPath); - String data = Files.readString(srcFile.toPath(), charset); + String data = Files.readString(srcPath, charset); for (Map.Entry entry : filterMap.entrySet()) { data = StringUtils.replace(data, entry.getKey(), entry.getValue()); } - File dstFile = new File(getBasedir(), dstPath); - //noinspection ResultOfMethodCallIgnored - dstFile.getParentFile().mkdirs(); - Files.writeString(dstFile.toPath(), data, charset); + Files.createDirectories(dstPath.getParent()); + Files.writeString(dstPath, data, charset); - return dstFile; + return dstPath; } /** @@ -981,7 +985,7 @@ public File filterFile(String srcPath, String dstPath, String fileEncoding, Map< public Map newDefaultFilterMap() { Map filterMap = new HashMap<>(); - Path basedir = Paths.get(getBasedir()).toAbsolutePath(); + Path basedir = getBasedir(); filterMap.put("@basedir@", basedir.toString()); filterMap.put("@baseurl@", basedir.toUri().toASCIIString()); @@ -998,6 +1002,16 @@ public void verifyFilePresent(String file) throws VerificationException { verifyFilePresence(file, true); } + /** + * Verifies that the given file exists. + * + * @param file the path of the file to check + * @throws VerificationException in case the given file does not exist + */ + public void verifyFilePresent(Path file) throws VerificationException { + verifyFilePresence(file.toString(), true); + } + /** * Verifies that the given file does not exist. * @@ -1008,11 +1022,21 @@ public void verifyFileNotPresent(String file) throws VerificationException { verifyFilePresence(file, false); } + /** + * Verifies that the given file does not exist. + * + * @param file the path of the file to check + * @throws VerificationException if the given file exists + */ + public void verifyFileNotPresent(Path file) throws VerificationException { + verifyFilePresence(file.toString(), false); + } + private void verifyArtifactPresence(boolean wanted, String groupId, String artifactId, String version, String ext) throws VerificationException { - List files = getArtifactFileNameList(groupId, artifactId, version, ext); - for (String fileName : files) { - verifyFilePresence(fileName, wanted); + List files = getArtifactFileNameList(groupId, artifactId, version, ext); + for (Path fileName : files) { + verifyFilePresence(fileName.toString(), wanted); } } @@ -1046,7 +1070,6 @@ public void verifyArtifactNotPresent(String groupId, String artifactId, String v private void verifyFilePresence(String filePath, boolean wanted) throws VerificationException { if (filePath.contains("!/")) { - Path basedir = Paths.get(getBasedir()).toAbsolutePath(); String urlString = "jar:" + basedir.toUri().toASCIIString() + "/" + filePath; InputStream is = null; @@ -1080,52 +1103,52 @@ private void verifyFilePresence(String filePath, boolean wanted) throws Verifica } } } else { - File expectedFile = new File(filePath); + Path expectedPath = Paths.get(filePath); // NOTE: On Windows, a path with a leading (back-)slash is relative to the current drive - if (!expectedFile.isAbsolute() && !expectedFile.getPath().startsWith(File.separator)) { - expectedFile = new File(getBasedir(), filePath); + if (!expectedPath.isAbsolute() && !filePath.startsWith("/") && !filePath.startsWith("\\")) { + expectedPath = basedir.resolve(filePath); } if (filePath.indexOf('*') > -1) { - File parent = expectedFile.getParentFile(); + Path parent = expectedPath.getParent(); - if (!parent.exists()) { + if (parent == null || !Files.exists(parent)) { if (wanted) { throw new VerificationException( - "Expected file pattern was not found: " + expectedFile.getPath()); + "Expected file pattern was not found: " + expectedPath); } } else { - String shortNamePattern = expectedFile.getName().replaceAll("\\*", ".*"); - - String[] candidates = parent.list(); + String shortNamePattern = expectedPath.getFileName().toString().replaceAll("\\*", ".*"); boolean found = false; - if (candidates != null) { - for (String candidate : candidates) { - if (candidate.matches(shortNamePattern)) { + try (DirectoryStream stream = Files.newDirectoryStream(parent)) { + for (Path candidate : stream) { + if (candidate.getFileName().toString().matches(shortNamePattern)) { found = true; break; } } + } catch (IOException e) { + // Ignore directory access errors } if (!found && wanted) { throw new VerificationException( - "Expected file pattern was not found: " + expectedFile.getPath()); + "Expected file pattern was not found: " + expectedPath); } else if (found && !wanted) { - throw new VerificationException("Unwanted file pattern was found: " + expectedFile.getPath()); + throw new VerificationException("Unwanted file pattern was found: " + expectedPath); } } } else { - if (!expectedFile.exists()) { + if (!Files.exists(expectedPath)) { if (wanted) { - throw new VerificationException("Expected file was not found: " + expectedFile.getPath()); + throw new VerificationException("Expected file was not found: " + expectedPath); } } else { if (!wanted) { - throw new VerificationException("Unwanted file was found: " + expectedFile.getPath()); + throw new VerificationException("Unwanted file was found: " + expectedPath); } } } @@ -1145,8 +1168,9 @@ private void verifyFilePresence(String filePath, boolean wanted) throws Verifica */ public void verifyArtifactContent(String groupId, String artifactId, String version, String ext, String content) throws IOException, VerificationException { - String fileName = getArtifactPath(groupId, artifactId, version, ext); - if (!content.equals(FileUtils.fileRead(fileName))) { + Path fileName = getArtifactPath(groupId, artifactId, version, ext); + String actualContent = Files.readString(fileName); + if (!content.equals(actualContent)) { throw new VerificationException("Content of " + fileName + " does not equal " + content); } } diff --git a/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/AbstractMavenIntegrationTestCaseNIO2Test.java b/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/AbstractMavenIntegrationTestCaseNIO2Test.java new file mode 100644 index 000000000000..bd6de2fbcd89 --- /dev/null +++ b/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/AbstractMavenIntegrationTestCaseNIO2Test.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * Test class to verify NIO2 migration of AbstractMavenIntegrationTestCase class. + */ +public class AbstractMavenIntegrationTestCaseNIO2Test extends AbstractMavenIntegrationTestCase { + + @Test + void testExtractResourcesAsPath() throws IOException { + String resourcePath = "test-resource"; + + // Test the new Path-based method + Path result = extractResources(resourcePath); + + assertNotNull(result); + assertTrue(result.isAbsolute()); + assertTrue(result.toString().endsWith(resourcePath)); + } + + @Test + void testPathToFileConversion() throws IOException { + String resourcePath = "test-resource"; + + // Test that Path can be converted to File when needed + Path pathResult = extractResources(resourcePath); + File fileResult = pathResult.toFile(); + + assertNotNull(fileResult); + assertTrue(fileResult.isAbsolute()); + assertTrue(fileResult.getPath().endsWith(resourcePath)); + + // Verify round-trip conversion + assertEquals(pathResult, fileResult.toPath()); + } +} diff --git a/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/NIO2MigrationVerificationTest.java b/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/NIO2MigrationVerificationTest.java new file mode 100644 index 000000000000..e3ad9117a21b --- /dev/null +++ b/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/NIO2MigrationVerificationTest.java @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * Test to verify that the NIO2 migration of integration test infrastructure works correctly. + * This simulates the patterns used in actual integration tests. + */ +public class NIO2MigrationVerificationTest extends AbstractMavenIntegrationTestCase { + + @TempDir + Path tempDir; + + @Test + void testExtractResourcesAsPathPattern() throws IOException { + // Simulate the pattern: Path testDir = extractResources("/some-test") + Path testDir = extractResources("test-resource"); + + assertNotNull(testDir); + assertTrue(testDir.isAbsolute()); + assertTrue(testDir.toString().endsWith("test-resource")); + } + + @Test + void testPathResolvePattern() throws IOException { + // Simulate the pattern: Path subDir = testDir.resolve("subdir") + Path testDir = extractResources("test-resource"); + Path subDir = testDir.resolve("subdir"); + Path fileInSubDir = testDir.resolve("subdir/file.txt"); + + assertNotNull(subDir); + assertNotNull(fileInSubDir); + assertTrue(subDir.toString().endsWith("subdir")); + assertTrue(fileInSubDir.toString().endsWith("file.txt")); + } + + @Test + void testPathToStringPattern() throws IOException { + // Simulate the pattern: newVerifier(testDir.toString()) + Path testDir = extractResources("test-resource"); + String testDirString = testDir.toString(); + + assertNotNull(testDirString); + assertTrue(testDirString.endsWith("test-resource")); + + // This would be used like: newVerifier(testDirString) + // We can't actually create a verifier without Maven distribution, + // but we can verify the string is correct + assertTrue(Paths.get(testDirString).isAbsolute()); + } + + @Test + void testPathToFileConversion() throws IOException { + // Verify that Path can be converted to File when needed for legacy APIs + Path testDir = extractResources("test-resource"); + java.io.File fileDir = testDir.toFile(); + + assertNotNull(fileDir); + assertTrue(fileDir.isAbsolute()); + assertTrue(fileDir.getPath().endsWith("test-resource")); + + // Verify round-trip conversion + assertEquals(testDir, fileDir.toPath()); + } + + @Test + void testNewVerifierWithPathString() throws IOException { + // Test the common pattern of creating a verifier with Path.toString() + Path testDir = extractResources("test-resource"); + + // This simulates: Verifier verifier = newVerifier(testDir.toString()); + String basedir = testDir.toString(); + assertNotNull(basedir); + assertTrue(Paths.get(basedir).isAbsolute()); + + // We can't actually create a verifier without the Maven distribution, + // but we can verify the path string is valid + Path reconstructed = Paths.get(basedir); + assertEquals(testDir, reconstructed); + } + + @Test + void testComplexPathOperations() throws IOException { + // Test more complex path operations that might be used in integration tests + Path testDir = extractResources("test-resource"); + Path projectDir = testDir.resolve("project"); + Path pomFile = projectDir.resolve("pom.xml"); + Path targetDir = projectDir.resolve("target"); + Path classesDir = targetDir.resolve("classes"); + + // Verify all paths are constructed correctly + assertTrue(projectDir.toString().contains("project")); + assertTrue(pomFile.toString().endsWith("pom.xml")); + assertTrue(targetDir.toString().contains("target")); + assertTrue(classesDir.toString().contains("classes")); + + // Verify parent-child relationships + assertEquals(testDir, projectDir.getParent()); + assertEquals(projectDir, pomFile.getParent()); + assertEquals(projectDir, targetDir.getParent()); + assertEquals(targetDir, classesDir.getParent()); + } +} diff --git a/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/VerifierNIO2Test.java b/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/VerifierNIO2Test.java new file mode 100644 index 000000000000..7645f4c4fd35 --- /dev/null +++ b/its/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/VerifierNIO2Test.java @@ -0,0 +1,161 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * Test class to verify NIO2 migration of Verifier class. + */ +public class VerifierNIO2Test { + + @TempDir + Path tempDir; + + private Verifier verifier; + + @BeforeEach + void setUp() throws VerificationException { + verifier = new Verifier(Paths.get(tempDir.toString()), null); + } + + @Test + void testLoadPropertiesWithPath() throws IOException, VerificationException { + // Create a test properties file + Path propsFile = tempDir.resolve("test.properties"); + Files.writeString(propsFile, "key1=value1\nkey2=value2\n"); + + // Test the new Path-based method + Properties props = verifier.loadProperties(propsFile); + assertEquals("value1", props.getProperty("key1")); + assertEquals("value2", props.getProperty("key2")); + } + + @Test + void testLoadFileWithPath() throws IOException, VerificationException { + // Create a test file + Path testFile = tempDir.resolve("test.txt"); + Files.writeString(testFile, "line1\nline2\n# comment\nline3\n"); + + // Test the new Path-based method + List lines = verifier.loadFile(testFile); + assertEquals(3, lines.size()); + assertEquals("line1", lines.get(0)); + assertEquals("line2", lines.get(1)); + assertEquals("line3", lines.get(2)); + } + + @Test + void testFilterFileWithPath() throws IOException { + // Create source file + Path srcFile = tempDir.resolve("src.txt"); + Files.writeString(srcFile, "Hello @name@, welcome to @place@!"); + + // Create filter map + Map filterMap = new HashMap<>(); + filterMap.put("@name@", "World"); + filterMap.put("@place@", "Maven"); + + // Test the new Path-based method + Path dstFile = tempDir.resolve("dst.txt"); + Path result = verifier.filterFile(srcFile, dstFile, null, filterMap); + + assertEquals(dstFile, result); + assertTrue(Files.exists(result)); + String content = Files.readString(result); + assertEquals("Hello World, welcome to Maven!", content); + } + + @Test + void testDeleteDirectoryRecursively() throws IOException { + // Create a directory structure + Path testDir = tempDir.resolve("testdir"); + Path subDir = testDir.resolve("subdir"); + Files.createDirectories(subDir); + + Path file1 = testDir.resolve("file1.txt"); + Path file2 = subDir.resolve("file2.txt"); + Files.writeString(file1, "content1"); + Files.writeString(file2, "content2"); + + assertTrue(Files.exists(testDir)); + assertTrue(Files.exists(subDir)); + assertTrue(Files.exists(file1)); + assertTrue(Files.exists(file2)); + + // Test directory deletion + verifier.deleteDirectory("testdir"); + + assertFalse(Files.exists(testDir)); + assertFalse(Files.exists(subDir)); + assertFalse(Files.exists(file1)); + assertFalse(Files.exists(file2)); + } + + @Test + void testVerifyFilePresence() throws IOException, VerificationException { + // Create a test file + Path testFile = tempDir.resolve("present.txt"); + Files.writeString(testFile, "content"); + + // Test file presence verification + verifier.verifyFilePresent("present.txt"); + + // Test file absence verification + verifier.verifyFileNotPresent("absent.txt"); + + // Test exception when expected file is not present + assertThrows(VerificationException.class, () -> { + verifier.verifyFilePresent("absent.txt"); + }); + + // Test exception when unwanted file is present + assertThrows(VerificationException.class, () -> { + verifier.verifyFileNotPresent("present.txt"); + }); + } + + @Test + void testVerifyFilePresenceWithWildcard() throws IOException, VerificationException { + // Create test files + Path testFile1 = tempDir.resolve("test-1.txt"); + Path testFile2 = tempDir.resolve("test-2.txt"); + Files.writeString(testFile1, "content1"); + Files.writeString(testFile2, "content2"); + + // Test wildcard file presence verification + verifier.verifyFilePresent("test-*.txt"); + + // Test wildcard file absence verification + verifier.verifyFileNotPresent("missing-*.txt"); + } +}