Skip to content

Commit 6c1a62e

Browse files
committed
Complete NIO2 migration by making Path-based methods primary API
This commit completes the NIO2 migration by: 1. Removing all File-based filterFile() methods from Verifier class 2. Making Path-based filterFile() methods return Path instead of File 3. Renaming extractResourcesAsPath() back to extractResources() in AbstractMavenIntegrationTestCase 4. Updating all 687 integration test files to use the renamed extractResources() method The integration test infrastructure now uses NIO2 Path API as the primary API: - extractResources() returns Path (was File) - filterFile() methods return Path (were File) - All File-based wrapper methods have been removed This provides a clean, modern API surface while maintaining the familiar method names. All integration tests compile and run successfully with the new Path-based API.
1 parent 6a0d5e1 commit 6c1a62e

File tree

689 files changed

+896
-896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

689 files changed

+896
-896
lines changed

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCas
3535
*/
3636
@Test
3737
public void testit0008() throws Exception {
38-
Path testDir = extractResourcesAsPath("/it0008");
38+
Path testDir = extractResources("/it0008");
3939
Verifier verifier = newVerifier(testDir.toString());
4040
verifier.setAutoclean(false);
4141
verifier.deleteDirectory("target");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testit0009() throws Exception {
4343
// Inline version check: [3.1.0,) - current Maven version supports space in XML
4444
boolean supportSpaceInXml = true;
4545

46-
Path testDir = extractResourcesAsPath("/it0009");
46+
Path testDir = extractResources("/it0009");
4747
Verifier verifier = newVerifier(testDir.toString());
4848
verifier.setAutoclean(false);
4949
verifier.deleteDirectory("target");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenInt
3737
*/
3838
@Test
3939
public void testit0010() throws Exception {
40-
Path testDir = extractResourcesAsPath("/it0010");
40+
Path testDir = extractResources("/it0010");
4141

4242
Verifier verifier = newVerifier(testDir.toString());
4343
verifier.setAutoclean(false);

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest extends Abstrac
3535
*/
3636
@Test
3737
public void testit0011() throws Exception {
38-
Path testDir = extractResourcesAsPath("/it0011");
38+
Path testDir = extractResources("/it0011");
3939
Verifier verifier = newVerifier(testDir.toString());
4040
verifier.setAutoclean(false);
4141
verifier.deleteDirectory("target");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTes
3232
*/
3333
@Test
3434
public void testit0012() throws Exception {
35-
Path testDir = extractResourcesAsPath("/it0012");
35+
Path testDir = extractResources("/it0012");
3636
Verifier verifier = newVerifier(testDir.toString());
3737
verifier.setAutoclean(false);
3838
verifier.deleteDirectory("target");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegratio
3434
*/
3535
@Test
3636
public void testit0018() throws Exception {
37-
Path testDir = extractResourcesAsPath("/it0018");
37+
Path testDir = extractResources("/it0018");
3838
Verifier verifier = newVerifier(testDir.toString());
3939
verifier.setAutoclean(false);
4040
verifier.deleteArtifacts("org.apache.maven.its.it0018");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenInt
3232
*/
3333
@Test
3434
public void testit0019() throws Exception {
35-
Path testDir = extractResourcesAsPath("/it0019");
35+
Path testDir = extractResources("/it0019");
3636
Verifier verifier = newVerifier(testDir.toString());
3737
verifier.setAutoclean(false);
3838
verifier.deleteDirectory("target");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase
3333
*/
3434
@Test
3535
public void testit0021() throws Exception {
36-
Path testDir = extractResourcesAsPath("/it0021");
36+
Path testDir = extractResources("/it0021");
3737

3838
Verifier verifier = newVerifier(testDir.toString());
3939
verifier.setAutoclean(false);

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class MavenIT0023SettingsProfileTest extends AbstractMavenIntegrationTest
3333
*/
3434
@Test
3535
public void testit0023() throws Exception {
36-
Path testDir = extractResourcesAsPath("/it0023");
36+
Path testDir = extractResources("/it0023");
3737

3838
Verifier verifier = newVerifier(testDir.toString());
3939
verifier.setAutoclean(false);

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class MavenIT0024MultipleGoalExecutionsTest extends AbstractMavenIntegrat
3939
*/
4040
@Test
4141
public void testit0024() throws Exception {
42-
Path testDir = extractResourcesAsPath("/it0024");
42+
Path testDir = extractResources("/it0024");
4343

4444
Verifier verifier = newVerifier(testDir.toString());
4545
verifier.setAutoclean(false);

0 commit comments

Comments
 (0)