From ecc8c9111f15aca7bd3bc9f74d8407213f687598 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 8 Feb 2009 14:51:16 +0000 Subject: [PATCH] o Compensated for the unfortunate fact that the Verifier treats CLI options as CLI lines rather than individual args (which would be subject to proper quoting) git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@742112 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/org/apache/maven/it/MavenIT0007Test.java | 2 +- .../it/MavenITmng0294MergeGlobalAndUserSettingsTest.java | 4 ++-- .../maven/it/MavenITmng2883LegacyRepoOfflineTest.java | 6 +++--- .../maven/it/MavenITmng3415JunkRepositoryMetadataTest.java | 4 ++-- .../maven/it/MavenITmng3944BasedirInterpolationTest.java | 2 +- .../maven/it/MavenITmng3953AuthenticatedDeploymentTest.java | 2 +- .../maven/it/MavenITmng3955EffectiveSettingsTest.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java index e8edb9ae33..97c2f0917b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java @@ -42,7 +42,7 @@ public class MavenIT0007Test verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); verifier.deleteArtifacts( "org.apache.maven.its.it0007" ); verifier.getCliOptions().add( "-s" ); - verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); 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 b2903cb9b9..20be5a995b 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 @@ -51,11 +51,11 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.getCliOptions().add( "--settings" ); - verifier.getCliOptions().add( new File( testDir, "user-settings.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "user-settings.xml" ); if ( matchesVersionRange( "[3.0-alpha-1,)" ) ) { verifier.getCliOptions().add( "--global-settings" ); - verifier.getCliOptions().add( new File( testDir, "global-settings.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "global-settings.xml" ); } else { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java index 921c9d9e8a..ff10f77541 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java @@ -68,7 +68,7 @@ public class MavenITmng2883LegacyRepoOfflineTest // used to inject the remote repository cliOptions.add( "-s" ); - cliOptions.add( settings.getAbsolutePath() ); + cliOptions.add( settings.getName() ); verifier.setCliOptions( cliOptions ); @@ -167,7 +167,7 @@ public class MavenITmng2883LegacyRepoOfflineTest // used to inject the remote repository cliOptions.add( "-s" ); - cliOptions.add( settings.getAbsolutePath() ); + cliOptions.add( settings.getName() ); verifier.setCliOptions( cliOptions ); @@ -269,7 +269,7 @@ public class MavenITmng2883LegacyRepoOfflineTest // used to inject the remote repository cliOptions.add( "-s" ); - cliOptions.add( settings.getAbsolutePath() ); + cliOptions.add( settings.getName() ); verifier.setCliOptions( cliOptions ); 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 bdba7b7fe8..000a268362 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 @@ -103,7 +103,7 @@ public class MavenITmng3415JunkRepositoryMetadataTest List cliOptions = new ArrayList(); cliOptions.add( "-X" ); cliOptions.add( "-s" ); - cliOptions.add( settings.getPath() ); + cliOptions.add( settings.getName() ); verifier.setCliOptions( cliOptions ); verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" ); @@ -176,7 +176,7 @@ public class MavenITmng3415JunkRepositoryMetadataTest List cliOptions = new ArrayList(); cliOptions.add( "-X" ); cliOptions.add( "-s" ); - cliOptions.add( settings.getPath() ); + cliOptions.add( settings.getName() ); verifier.setCliOptions( cliOptions ); 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 fca192530e..3766e2744d 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 @@ -51,7 +51,7 @@ public class MavenITmng3944BasedirInterpolationTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.getCliOptions().add( "-f" ); - verifier.getCliOptions().add( new File( testDir, "pom-with-unusual-name.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "pom-with-unusual-name.xml" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); 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 9bf896bfe6..e9d5e76eb7 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 @@ -152,7 +152,7 @@ public class MavenITmng3953AuthenticatedDeploymentTest Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.getCliOptions().add( "--settings" ); - verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "settings.xml" ); verifier.getCliOptions().add( "-DdeploymentPort=" + port ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); 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 48743dbb79..4e6eb2fcee 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 @@ -52,7 +52,7 @@ public class MavenITmng3955EffectiveSettingsTest Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.getCliOptions().add( "--settings" ); - verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "settings.xml" ); verifier.getCliOptions().add( "--offline" ); verifier.getCliOptions().add( "--batch-mode" ); verifier.executeGoal( "validate" );