svn commit: r1398437 - in /maven/shared/trunk: maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java

[krosenvold]

Author: krosenvold
Date: Mon Oct 15 18:34:01 2012
New Revision: 1398437

URL: http://svn.apache.org/viewvc?rev=1398437&view=rev
Log:
o Moved to different method

Modified:
    
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
    
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java

Modified: 
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java?rev=1398437&r1=1398436&r2=1398437&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
 (original)
+++ 
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
 Mon Oct 15 18:34:01 2012
@@ -30,7 +30,7 @@ import java.io.Writer;
 
 import org.apache.maven.shared.utils.io.IOUtil;
 import org.apache.maven.shared.utils.ReaderFactory;
-import org.codehaus.plexus.util.WriterFactory;
+import org.apache.maven.shared.utils.WriterFactory;
 
 public final class TestUtils
 {

Modified: 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java?rev=1398437&r1=1398436&r2=1398437&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
 Mon Oct 15 18:34:01 2012
@@ -124,36 +124,36 @@ public class BourneShellTest
         commandline.createArg().setValue( "--password" );
         commandline.createArg().setValue( ";password" );
 
-        String[] lines = commandline.getShellCommandline();
-        System.out.println( Arrays.asList( lines ) );
+        List<String> lines = commandline.getShell().getShellCommandLine( 
commandline.getArguments() );
+        System.out.println( lines  );
 
-        assertEquals( "/bin/sh", lines[0] );
-        assertEquals( "-c", lines[1] );
-        assertEquals( "chmod --password ';password'", lines[2] );
+        assertEquals( "/bin/sh", lines.get( 0 ) );
+        assertEquals( "-c", lines.get( 1 ) );
+        assertEquals( "chmod --password ';password'", lines.get( 2) );
 
         commandline = new Commandline( newShell() );
         commandline.setExecutable( "chmod" );
         commandline.getShell().setQuotedArgumentsEnabled( true );
         commandline.createArg().setValue( "--password" );
         commandline.createArg().setValue( ";password" );
-        lines = commandline.getShellCommandline();
+        lines = commandline.getShell().getShellCommandLine( 
commandline.getArguments() );
         System.out.println( Arrays.asList( lines ) );
 
-        assertEquals( "/bin/sh", lines[0] );
-        assertEquals( "-c", lines[1] );
-        assertEquals( "chmod --password ';password'", lines[2] );
+        assertEquals( "/bin/sh", lines.get( 0) );
+        assertEquals( "-c", lines.get( 1 ) );
+        assertEquals( "chmod --password ';password'", lines.get( 2 ) );
 
         commandline = new Commandline( new CmdShell() );
         commandline.getShell().setQuotedArgumentsEnabled( true );
         commandline.createArg().setValue( "--password" );
         commandline.createArg().setValue( ";password" );
-        lines = commandline.getShellCommandline();
+        lines = commandline.getShell().getShellCommandLine( 
commandline.getArguments() );
         System.out.println( Arrays.asList( lines ) );
 
-        assertEquals( "cmd.exe", lines[0] );
-        assertEquals( "/X", lines[1] );
-        assertEquals( "/C", lines[2] );
-        assertEquals( "\"--password ;password\"", lines[3] );
+        assertEquals( "cmd.exe", lines.get( 0) );
+        assertEquals( "/X", lines.get( 1 ));
+        assertEquals( "/C", lines.get( 2 ));
+        assertEquals( "\"--password ;password\"", lines.get( 3) );
     }
 
     public void testBourneShellQuotingCharacters()
@@ -184,13 +184,13 @@ public class BourneShellTest
         commandline.createArg().setValue( "}" );
         commandline.createArg().setValue( "`" );
 
-        String[] lines = commandline.getShellCommandline();
-        System.out.println( Arrays.asList( lines ) );
+        List<String> lines = commandline.getShell().getShellCommandLine( 
commandline.getArguments() );
+        System.out.println( lines  );
 
-        assertEquals( "/bin/sh", lines[0] );
-        assertEquals( "-c", lines[1] );
+        assertEquals( "/bin/sh", lines.get( 0 ));
+        assertEquals( "-c", lines.get( 1 ));
         assertEquals( "chmod ' ' '|' '&&' '||' ';' ';;' '&' '()' '<' '<<' '>' 
'>>' '*' '?' '[' ']' '{' '}' '`'",
-                      lines[2] );
+                      lines.get(  2 ) );
 
     }