Issue #17: Binary PATH execution regression on Windows (since 3.0.15)

This fixes #17

Author: axel3rd

src/main/java/org/codehaus/plexus/util/cli/Commandline.java

@@ -487,18 +487,24 @@ public String[] getEnvironmentVariables()
         for ( Object o : envVars.keySet() )
         {
             String name = (String) o;
-            String value = (String) envVars.get( name );
+            String value = envVars.get( name );
             environmentVars[i] = name + "=" + value;
             i++;
         }
         return environmentVars;
     }
 
     /**
-     * Returns the executable and all defined arguments.
+     * Returns the executable and all defined arguments.<br/>
+     * For Windows Family, {@link Commandline#getShellCommandline()} is returned
      */
     public String[] getCommandline()
     {
+        if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+        {
+            return getShellCommandline();
+        }
+
         final String[] args = getArguments();
         String executable = getLiteralExecutable();
 

src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java

@@ -196,7 +196,6 @@ public void testFollowSymlinks()
         assertEquals( 5, includedDirs.size() );
     }
 
-
     private void createTestDirectories()
         throws IOException
     {

src/test/java/org/codehaus/plexus/util/cli/CommandlineTest.java

@@ -88,6 +88,29 @@ public void testCommandlineWithCommandInConstructor()
         }
     }
 
+    public void testExecuteBinaryOnPath()
+    {
+        try
+        {
+            // Maven startup script on PATH is required for this test
+            Commandline cmd = new Commandline();
+            cmd.setWorkingDirectory( baseDir );
+            cmd.setExecutable( "mvn" );
+            assertEquals( "mvn", cmd.getShell().getOriginalExecutable() );
+            cmd.createArg().setValue( "-version" );
+            Process process = cmd.execute();
+            String out = IOUtil.toString( process.getInputStream() );
+            assertTrue( out.contains( "Apache Maven" ) );
+            assertTrue( out.contains( "Maven home:" ) );
+            assertTrue( out.contains( "Java version:" ) );
+            assertTrue( out.contains( "Java home:" ) );
+        }
+        catch ( Exception e )
+        {
+            fail( "Maven startup script seems not on the PATH: " + e.getMessage() );
+        }
+    }
+
     public void testExecute()
     {
         try
@@ -99,21 +122,8 @@ public void testExecute()
             assertEquals( "echo", cmd.getShell().getOriginalExecutable() );
             cmd.createArgument().setValue( "Hello" );
 
-            StringWriter swriter = new StringWriter();
             Process process = cmd.execute();
-
-            Reader reader = new InputStreamReader( process.getInputStream() );
-
-            char[] chars = new char[16];
-            int read = -1;
-            while ( ( read = reader.read( chars ) ) > -1 )
-            {
-                swriter.write( chars, 0, read );
-            }
-
-            String output = swriter.toString().trim();
-
-            assertEquals( "Hello", output );
+            assertEquals( "Hello", IOUtil.toString( process.getInputStream() ).trim() );
         }
         catch ( Exception e )
         {
@@ -248,7 +258,7 @@ public void testGetShellCommandLineBash()
         String expectedShellCmd = "'/bin/echo' 'hello world'";
         if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
-            expectedShellCmd = "\\bin\\echo \'hello world\'";
+            expectedShellCmd = "'\\bin\\echo' \'hello world\'";
         }
         assertEquals( expectedShellCmd, shellCommandline[2] );
     }
@@ -307,7 +317,7 @@ public void testGetShellCommandLineBash_WithSingleQuotedArg()
         String expectedShellCmd = "'/bin/echo' ''\"'\"'hello world'\"'\"''";
         if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
-            expectedShellCmd = "\\bin\\echo \'hello world\'";
+            expectedShellCmd = expectedShellCmd.replace( "/bin/echo", "\\bin\\echo" );
         }
         assertEquals( expectedShellCmd, shellCommandline[2] );
     }
@@ -330,7 +340,7 @@ public void testGetShellCommandLineNonWindows()
 
         if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
-            assertEquals( "\\usr\\bin a b", shellCommandline[2] );
+            assertEquals( "'\\usr\\bin' 'a' 'b'", shellCommandline[2] );
         }
         else
         {