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

o Considered file extensions in command search to enable tests for Windows 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677452 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2008-07-16 22:33:58 +00:00
parent d046f6039f
commit a14916cf8c
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
View File

@ -16,13 +16,16 @@ package org.apache.maven.embedder;
*/ */
import java.io.File; import java.io.File;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.CommandLineUtils;
@ -31,10 +34,13 @@ public abstract class AbstractEmbedderTestCase
{ {
protected MavenEmbedder maven; protected MavenEmbedder maven;
private String defaultPath;
private List defaultPathList; private List defaultPathList;
/**
* The file extensions used to resolve command names to executables. Each extension must have a leading period.
*/
private List commandExtensions;
protected void setUp() protected void setUp()
throws Exception throws Exception
{ {
@ -51,7 +57,9 @@ public abstract class AbstractEmbedderTestCase
// but if they are not present on the machine we don't want tests to fail. Case in point would be using SVN via the SCM plugin. We'll // but if they are not present on the machine we don't want tests to fail. Case in point would be using SVN via the SCM plugin. We'll
// run it if we can, pass through gracefully otherwise. // run it if we can, pass through gracefully otherwise.
defaultPath = CommandLineUtils.getSystemEnvVars().getProperty( "PATH" ); Properties env = CommandLineUtils.getSystemEnvVars( !Os.isFamily( Os.FAMILY_WINDOWS ) );
String defaultPath = env.getProperty( "PATH" );
if ( defaultPath == null ) if ( defaultPath == null )
{ {
@ -59,9 +67,7 @@ public abstract class AbstractEmbedderTestCase
} }
else else
{ {
String separator = System.getProperty( "path.separator" ); StringTokenizer tokenizer = new StringTokenizer( defaultPath, File.pathSeparator );
StringTokenizer tokenizer = new StringTokenizer( defaultPath, separator );
defaultPathList = new LinkedList(); defaultPathList = new LinkedList();
@ -72,6 +78,17 @@ public abstract class AbstractEmbedderTestCase
defaultPathList.add( element ); defaultPathList.add( element );
} }
} }
String pathExt = env.getProperty( "PATHEXT" );
if ( pathExt == null )
{
commandExtensions = Collections.EMPTY_LIST;
}
else
{
commandExtensions = Arrays.asList( pathExt.split( "\\" + File.pathSeparatorChar + "+" ) );
}
} }
protected void tearDown() protected void tearDown()
@ -118,12 +135,22 @@ public abstract class AbstractEmbedderTestCase
return null; return null;
} }
// TODO: Need to resolve it with defaults extension of system
// ie. if executable is 'mvn', we must search 'mvn.bat'
for ( Iterator it = path.iterator(); it.hasNext(); ) for ( Iterator it = path.iterator(); it.hasNext(); )
{ {
String s = (String) it.next(); String s = (String) it.next();
for ( Iterator ite = commandExtensions.iterator(); ite.hasNext(); )
{
String ext = (String) ite.next();
f = new File( s, executable + ext );
if ( f.isFile() )
{
return f;
}
}
f = new File( s, executable ); f = new File( s, executable );
if ( f.isFile() ) if ( f.isFile() )