Parser now keeps the normalised list of arguments.

Added ParserTest

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@190828 13f79535-47bb-0310-9956-ffa450edef68

Author: Robert James Oxspring

src/java/org/apache/commons/cli2/commandline/Parser.java

@@ -16,7 +16,6 @@
 package org.apache.commons.cli2.commandline;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
@@ -68,7 +67,7 @@ public CommandLine parse(final String[] arguments) throws OptionException {
 
         // wet up a command line for this group
         final WriteableCommandLine commandLine =
-            new WriteableCommandLineImpl(group, new ArrayList());
+            new WriteableCommandLineImpl(group, argumentList);
 
         // pick up any defaults from the model
         group.defaults(commandLine);

src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java

@@ -204,4 +204,9 @@ public void setDefaultSwitch(final Option option, final Boolean defaultSwitch) {
             defaultSwitches.put(option, defaultSwitch);
         }
     }
+    
+    public List getNormalised() {
+        return Collections.unmodifiableList(normalised);
+    }
+    
 }

src/test/org/apache/commons/cli2/commandline/ParserTest.java

@@ -0,0 +1,124 @@
+package org.apache.commons.cli2.commandline;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import org.apache.commons.cli2.CommandLine;
+import org.apache.commons.cli2.Group;
+import org.apache.commons.cli2.OptionException;
+import org.apache.commons.cli2.builder.DefaultOptionBuilder;
+import org.apache.commons.cli2.builder.GroupBuilder;
+import org.apache.commons.cli2.option.DefaultOption;
+import org.apache.commons.cli2.util.HelpFormatter;
+
+import junit.framework.TestCase;
+
+public class ParserTest extends TestCase {
+    
+    private Parser parser;
+    private DefaultOption verboseOption;
+    private DefaultOption helpOption;
+    private Group options;
+    private HelpFormatter helpFormatter;
+    private StringWriter out;
+    private BufferedReader in;
+
+    public void setUp() {
+        parser = new Parser();
+        
+        final GroupBuilder gBuilder = new GroupBuilder();
+        final DefaultOptionBuilder oBuilder = new DefaultOptionBuilder();
+        
+        helpOption = oBuilder.withLongName("help").withShortName("h").create();
+        verboseOption = oBuilder.withLongName("verbose").withShortName("v").create();
+        options = gBuilder.withOption(helpOption).withOption(verboseOption).create();
+        parser.setGroup(options);
+        
+        helpFormatter = new HelpFormatter();
+        out = new StringWriter();
+        helpFormatter.setPrintWriter(new PrintWriter(out));
+        parser.setHelpFormatter(helpFormatter);
+    }
+
+    public void testParse_Successful() throws OptionException {
+        final CommandLine cl = parser.parse(new String[]{"-hv"});
+        
+        assertTrue(cl.hasOption(helpOption));
+        assertTrue(cl.hasOption(verboseOption));
+        
+        assertEquals("--help --verbose",cl.toString());
+        
+        final WriteableCommandLineImpl wcli = (WriteableCommandLineImpl)cl;
+        assertEquals("[--help, --verbose]",wcli.getNormalised().toString());
+    }
+
+    public void testParse_WithUnexpectedOption() {
+        try {
+            parser.parse(new String[]{"--unexpected"});
+            fail("OptionException");
+        }
+        catch(OptionException e) {
+            assertEquals(options,e.getOption());
+            assertEquals("Unexpected --unexpected while processing --help|--verbose",e.getMessage());
+        }
+    }
+
+    public void testParseAndHelp_Successful() throws IOException {
+        final CommandLine cl = parser.parseAndHelp(new String[]{"-v"});
+        
+        assertTrue(cl.hasOption(verboseOption));
+        assertEquals("",out.getBuffer().toString());
+    }
+
+    public void testParseAndHelp_ByHelpOption() throws IOException {
+        parser.setHelpOption(helpOption);
+        
+        assertNull(parser.parseAndHelp(new String[]{"-hv"}));
+        
+        inReader();
+        assertInReaderUsage();
+        assertInReaderEOF();
+    }
+
+    public void testParseAndHelp_ByHelpTrigger() throws IOException {
+        parser.setHelpTrigger("--help");
+        
+        assertNull(parser.parseAndHelp(new String[]{"-hv"}));
+        
+        inReader();
+        assertInReaderUsage();
+        assertInReaderEOF();
+    }
+
+    public void testParseAndHelp_WithUnexpectedOption() throws IOException {
+        assertNull(parser.parseAndHelp(new String[]{"--unexpected"}));
+        
+        inReader();
+        assertInReaderLine("Unexpected --unexpected while processing --help|--verbose");
+        assertInReaderUsage();
+        assertInReaderEOF();
+    }
+
+    private void assertInReaderUsage() throws IOException {
+        assertInReaderLine("Usage:");
+        assertInReaderLine("[--help --verbose]");
+        assertInReaderLine("--help|--verbose");
+        assertInReaderLine("--help (-h)");
+        assertInReaderLine("--verbose (-v)");
+    }
+
+    private void assertInReaderLine(final String string) throws IOException {
+        assertEquals(string,in.readLine().trim());
+    }
+
+    private void assertInReaderEOF() throws IOException {
+        assertNull(in.readLine());
+    }
+
+    private void inReader() {
+        in = new BufferedReader(new StringReader(out.getBuffer().toString()));
+    }
+}