Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Bentmann 2009-02-08 14:51:16 +00:00
parent b21221220d
commit ecc8c9111f
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
View File

@ -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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
View File

@ -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
{

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
View File

@ -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 );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
View File

@ -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 );

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
View File

@ -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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
View File

@ -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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
View File

@ -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" );