You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/07/26 16:16:06 UTC

[maven-shared-utils] 02/03: MSHARED-416 Added test for uneven number of double quotations and refactored finals

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MSHARED-416
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit 1546492884d35221093e652a7fddf75994ef5f05
Author: Kathryn <ka...@anaplan.com>
AuthorDate: Thu Jul 26 16:17:16 2018 +0100

    MSHARED-416 Added test for uneven number of double quotations and refactored finals
---
 .../apache/maven/shared/utils/cli/shell/BourneShell.java    |  8 +++++---
 .../apache/maven/shared/utils/cli/CommandLineUtilsTest.java | 13 ++++++++++---
 .../maven/shared/utils/cli/shell/BourneShellTest.java       |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
index cd905ea..1793cbb 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
@@ -31,17 +31,19 @@ import org.apache.maven.shared.utils.StringUtils;
 public class BourneShell
     extends Shell
 {
+    private static final char DOUBLE_QUOTATION = '"';
+
     private static final char[] BASH_QUOTING_TRIGGER_CHARS =
         { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')', '[', ']', '{', '}', '`' };
 
     /**
-     * Create instance of BournShell.
+     * Create instance of BourneShell.
      */
     public BourneShell()
     {
         setShellCommand( "/bin/sh" );
-        setArgumentQuoteDelimiter( '\"' );
-        setExecutableQuoteDelimiter( '\"' );
+        setArgumentQuoteDelimiter( DOUBLE_QUOTATION );
+        setExecutableQuoteDelimiter( DOUBLE_QUOTATION );
         setSingleQuotedArgumentEscaped( true );
         setSingleQuotedExecutableEscaped( false );
         setQuotedExecutableEnabled( true );
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
index 821eba1..9935e4a 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
@@ -103,7 +103,14 @@ public class CommandLineUtilsTest
 
     @Test
     public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception {
-        Process p = exec("echo \"let's go\"");
+        final Process p = exec("echo \"let's go\"");
+
+        Assert.assertEquals(0, p.exitValue());
+    }
+
+    @Test
+    public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception {
+        final Process p = exec("echo \"let\"s go\"");
 
         Assert.assertEquals(0, p.exitValue());
     }
@@ -111,8 +118,8 @@ public class CommandLineUtilsTest
     private Process exec(String cmd) throws CommandLineException, InterruptedException {
         Process p = new Commandline(cmd).execute();
         Thread.sleep(1000);
-        BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream()));
-        BufferedReader out = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        final BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+        final BufferedReader out = new BufferedReader(new InputStreamReader(p.getInputStream()));
 
         return p;
     }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index 60e6080..c83287c 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -78,7 +78,7 @@ public class BourneShellTest
         sh.setWorkingDirectory( "/usr/bin" );
         sh.setExecutable( "chmod" );
 
-        String[] args = { "\"some arg with spaces\"" };
+        final String[] args = { "\"some arg with spaces\"" };
 
         List<String> shellCommandLine = sh.getShellCommandLine( args );