mirror of https://github.com/apache/maven.git
Fix these tests for running with spaces in the base directory structure.
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@676100 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2652c6066a
commit
a27d5d3e04
|
@ -24,7 +24,7 @@ public class MavenIT0095Test
|
|||
Verifier verifier = new Verifier( sub1.getAbsolutePath() );
|
||||
|
||||
List options = new ArrayList();
|
||||
options.add( "-Doutput=" + new File( sub1, "target/effective-pom.xml" ).getAbsolutePath() );
|
||||
options.add( "-Doutput=\"" + new File( sub1, "target/effective-pom.xml" ).getAbsolutePath() + "\"" );
|
||||
|
||||
verifier.setCliOptions( options );
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ public class MavenIT0100Test
|
|||
Verifier verifier = new Verifier( child.getAbsolutePath() );
|
||||
|
||||
List options = new ArrayList();
|
||||
options.add( "-Doutput=" + new File( child, "target/effective-pom.txt" ).getAbsolutePath() );
|
||||
options.add( "-Doutput=\"" + new File( child, "target/effective-pom.txt" ).getAbsolutePath() + "\"" );
|
||||
|
||||
verifier.setCliOptions( options );
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ public class MavenITmng3099SettingsProfilesWithNoPOM
|
|||
*/
|
||||
List cliOptions = new ArrayList();
|
||||
cliOptions.add( "-s" );
|
||||
cliOptions.add( new File( testDir, "settings.xml" ).getAbsolutePath() );
|
||||
cliOptions.add( "\"" + new File( testDir, "settings.xml" ).getAbsolutePath() + "\"" );
|
||||
|
||||
verifier.setCliOptions( cliOptions );
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ public class MavenITmng3372DirectInvocationOfPlugins
|
|||
|
||||
List cliOptions = new ArrayList();
|
||||
cliOptions.add( "-s" );
|
||||
cliOptions.add( settingsFile.getAbsolutePath() );
|
||||
cliOptions.add( "\"" + settingsFile.getAbsolutePath() + "\"" );
|
||||
|
||||
verifier.setCliOptions( cliOptions );
|
||||
verifier.executeGoal( "mng3372:test" );
|
||||
|
|
|
@ -82,8 +82,7 @@ public class MavenITmng3482DependencyPomInterpolationTest
|
|||
List cliOptions = new ArrayList();
|
||||
|
||||
cliOptions.add( "-s" );
|
||||
cliOptions.add( settings.getAbsolutePath() );
|
||||
cliOptions.add( "-X" );
|
||||
cliOptions.add( "\"" + settings.getAbsolutePath() + "\"" );
|
||||
|
||||
verifier.setCliOptions( cliOptions );
|
||||
|
||||
|
@ -128,9 +127,8 @@ public class MavenITmng3482DependencyPomInterpolationTest
|
|||
"@TESTDIR@",
|
||||
testDir.getAbsolutePath() );
|
||||
|
||||
File settingsOut = new File( testDir, "settings.xml" );
|
||||
|
||||
System.out.println( "Writing tets settings to: " + settingsOut );
|
||||
File settingsOut = File.createTempFile( "settings.", ".xml" );
|
||||
settingsOut.deleteOnExit();
|
||||
|
||||
if ( settingsOut.exists() )
|
||||
{
|
||||
|
|
|
@ -15,4 +15,30 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<!-- NOTE: This build section has only a single function:
|
||||
to upgrade the version of plexus-utils, so this test
|
||||
can handle paths with spaces in them.
|
||||
|
||||
Once a new release of the javadoc plugin takes care of
|
||||
http://jira.codehaus.org/browse/MJAVADOC-144
|
||||
we should be able to remove this section of the POM.
|
||||
-->
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-utils</artifactId>
|
||||
<version>1.5.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
</project>
|
||||
|
|
Loading…
Reference in New Issue