You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/05/31 11:27:04 UTC
svn commit: r661992 - in /maven/shared/trunk/maven-invoker/src:
main/java/org/apache/maven/shared/invoker/
test/java/org/apache/maven/shared/invoker/
Author: bentmann
Date: Sat May 31 02:27:03 2008
New Revision: 661992
URL: http://svn.apache.org/viewvc?rev=661992&view=rev
Log:
o Polished code
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=661992&r1=661991&r2=661992&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Sat May 31 02:27:03 2008
@@ -203,7 +203,8 @@
if ( ( profiles != null ) && !profiles.isEmpty() )
{
- cli.createArgument().setLine( "-P" + StringUtils.join( profiles.iterator(), "," ) );
+ cli.createArgument().setValue( "-P" );
+ cli.createArgument().setValue( StringUtils.join( profiles.iterator(), "," ) );
}
}
@@ -372,11 +373,11 @@
{
if ( InvocationRequest.REACTOR_FAIL_AT_END.equals( failureBehavior ) )
{
- cli.createArgument().setLine( "-fae" );
+ cli.createArgument().setValue( "-fae" );
}
else if ( InvocationRequest.REACTOR_FAIL_NEVER.equals( failureBehavior ) )
{
- cli.createArgument().setLine( "-fn" );
+ cli.createArgument().setValue( "-fn" );
}
}
@@ -387,46 +388,46 @@
{
if ( !request.isInteractive() )
{
- cli.createArgument().setLine( "-B" );
+ cli.createArgument().setValue( "-B" );
}
if ( request.isOffline() )
{
- cli.createArgument().setLine( "-o" );
+ cli.createArgument().setValue( "-o" );
}
if ( request.isUpdateSnapshots() )
{
- cli.createArgument().setLine( "-U" );
+ cli.createArgument().setValue( "-U" );
}
if ( !request.isRecursive() )
{
- cli.createArgument().setLine( "-N" );
+ cli.createArgument().setValue( "-N" );
}
if ( request.isDebug() )
{
- cli.createArgument().setLine( "-X" );
+ cli.createArgument().setValue( "-X" );
}
// this is superceded by -X, if it exists.
else if ( request.isShowErrors() )
{
- cli.createArgument().setLine( "-e" );
+ cli.createArgument().setValue( "-e" );
}
String checksumPolicy = request.getGlobalChecksumPolicy();
if ( InvocationRequest.CHECKSUM_POLICY_FAIL.equals( checksumPolicy ) )
{
- cli.createArgument().setLine( "-C" );
+ cli.createArgument().setValue( "-C" );
}
else if ( InvocationRequest.CHECKSUM_POLICY_WARN.equals( checksumPolicy ) )
{
- cli.createArgument().setLine( "-c" );
+ cli.createArgument().setValue( "-c" );
}
if ( request.isNonPluginUpdates() )
{
- cli.createArgument().setLine( "-npu" );
+ cli.createArgument().setValue( "-npu" );
}
}
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java?rev=661992&r1=661991&r2=661992&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java Sat May 31 02:27:03 2008
@@ -27,6 +27,7 @@
public SystemOutHandler()
{
+ this( false );
}
public SystemOutHandler( boolean alwaysFlush )
Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java?rev=661992&r1=661991&r2=661992&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java (original)
+++ maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java Sat May 31 02:27:03 2008
@@ -80,6 +80,7 @@
}
catch ( IllegalArgumentException e )
{
+ assertTrue( true );
}
}
@@ -103,6 +104,7 @@
}
catch ( IllegalArgumentException e )
{
+ assertTrue( true );
}
}
@@ -125,7 +127,7 @@
tcb.setEnvironmentPaths( newRequest(), cli );
- assertArgumentsPresent( Collections.singleton( "maven.repo.local=" + lrd.getPath() ), cli );
+ assertArgumentsPresentInOrder( new String[] { "-D", "maven.repo.local=" + lrd.getPath() }, cli );
}
public void testShouldSetLocalRepoLocationFromRequest()
@@ -146,7 +148,7 @@
tcb.setEnvironmentPaths( newRequest().setLocalRepositoryDirectory( lrd ), cli );
- assertArgumentsPresent( Collections.singleton( "maven.repo.local=" + lrd.getPath() ), cli );
+ assertArgumentsPresentInOrder( new String[] { "-D", "maven.repo.local=" + lrd.getPath() }, cli );
}
public void testRequestProvidedLocalRepoLocationShouldOverrideGlobal()
@@ -172,7 +174,7 @@
tcb.setEnvironmentPaths( newRequest().setLocalRepositoryDirectory( lrd ), cli );
- assertArgumentsPresent( Collections.singleton( "maven.repo.local=" + lrd.getPath() ), cli );
+ assertArgumentsPresentInOrder( new String[] { "-D", "maven.repo.local=" + lrd.getPath() }, cli );
}
public void testShouldSetWorkingDirectoryGlobally()
@@ -278,7 +280,7 @@
binDir.mkdirs();
toDelete.add( appDir );
- if ( Os.isFamily( "windows" ) )
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
createDummyFile( binDir, "mvn.bat" );
}
@@ -338,7 +340,7 @@
toDelete.add( base );
File check;
- if ( Os.isFamily( "windows" ) )
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
check = createDummyFile( dummyMavenHomeBin, "mvn.bat" );
}
@@ -727,7 +729,7 @@
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
tcb.setProperties( newRequest().setProperties( properties ), cli );
- assertArgumentsPresent( Collections.singleton( "key=value" ), cli );
+ assertArgumentsPresentInOrder( new String[] { "-D", "key=value" }, cli );
}
public void testShouldSpecifyCustomPropertyWithSpacesInValueFromRequest()
@@ -743,7 +745,7 @@
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
tcb.setProperties( newRequest().setProperties( properties ), cli );
- assertArgumentsPresent( Collections.singleton( "key=value with spaces" ), cli );
+ assertArgumentsPresentInOrder( new String[] { "-D", "key=value with spaces" }, cli );
}
public void testShouldSpecifyCustomPropertyWithSpacesInKeyFromRequest()
@@ -759,7 +761,7 @@
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
tcb.setProperties( newRequest().setProperties( properties ), cli );
- assertArgumentsPresent( Collections.singleton( "key with spaces=value with spaces" ), cli );
+ assertArgumentsPresentInOrder( new String[] { "-D", "key with spaces=value with spaces" }, cli );
}
public void testShouldSpecifySingleGoalFromRequest()
@@ -849,7 +851,7 @@
assertArgumentsPresentInOrder( goals, commandline );
File mavenFile;
- if ( Os.isFamily( "windows" ) )
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
mavenFile = new File( mavenDir, "bin/mvn.bat" );
}
@@ -869,7 +871,7 @@
throws Exception
{
logTestStart();
- File mavenDir = setupTempMavenHomeIfMissing();
+ setupTempMavenHomeIfMissing();
InvocationRequest request = newRequest();
@@ -910,7 +912,7 @@
public void testShouldInsertActivatedProfiles()
throws Exception
{
- File mavenDir = setupTempMavenHomeIfMissing();
+ setupTempMavenHomeIfMissing();
String profile1 = "profile-1";
String profile2 = "profile-2";
@@ -927,7 +929,7 @@
Commandline commandline = commandLineBuilder.build( request );
- assertArgumentsPresent( Collections.singleton( "-P" + profile1 + "," + profile2 ), commandline );
+ assertArgumentsPresentInOrder( new String[] { "-P", profile1 + "," + profile2 }, commandline );
}
public void setUp()
@@ -971,6 +973,11 @@
System.out.println( "Starting: " + element.getMethodName() );
}
+ private void assertArgumentsPresentInOrder( String[] expected, Commandline cli )
+ {
+ assertArgumentsPresentInOrder( Arrays.asList( expected ), cli );
+ }
+
private void assertArgumentsPresentInOrder( List expected, Commandline cli )
{
String[] arguments = cli.getArguments();