Changed UnrecognizedOptionException to include the option that wasn't recognized

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@679583 13f79535-47bb-0310-9956-ffa450edef68

Author: ebourg

src/java/org/apache/commons/cli/Parser.java

@@ -379,8 +379,7 @@ protected void processOption(String arg, ListIterator iter)
         // if there is no option throw an UnrecognisedOptionException
         if (!hasOption)
         {
-            throw new UnrecognizedOptionException("Unrecognized option: " 
-                                                  + arg);
+            throw new UnrecognizedOptionException("Unrecognized option: " + arg, arg);
         }
 
         // get the option represented by arg

src/java/org/apache/commons/cli/UnrecognizedOptionException.java

@@ -26,6 +26,9 @@
  */
 public class UnrecognizedOptionException extends ParseException
 {
+    /** The  unrecognized option */
+    private String option;
+
     /**
      * Construct a new <code>UnrecognizedArgumentException</code>
      * with the specified detail message.
@@ -36,4 +39,28 @@ public UnrecognizedOptionException(String message)
     {
         super(message);
     }
+
+    /**
+     * Construct a new <code>UnrecognizedArgumentException</code>
+     * with the specified option and detail message.
+     *
+     * @param message the detail message
+     * @param option  the unrecognized option
+     * @since 1.2
+     */
+    public UnrecognizedOptionException(String message, String option)
+    {
+        this(message);
+        this.option = option;
+    }
+
+    /**
+     * Returns the unrecognized option.
+     *
+     * @since 1.2
+     */
+    public String getOption()
+    {
+        return option;
+    }
 }

src/test/org/apache/commons/cli/GnuParserTest.java

@@ -65,28 +65,19 @@ public void testSimpleLong() throws Exception
         assertTrue("Confirm size of extra args", cl.getArgList().size() == 2);
     }
 
-    public void testExtraOption() throws Exception
+    public void testUnrecognizedOption() throws Exception
     {
-        String[] args = new String[] { "-a", "-d", "-b", "toast",
-                                       "foo", "bar" };
-
-        boolean caught = false;
+        String[] args = new String[] { "-a", "-d", "-b", "toast", "foo", "bar" };
 
         try
         {
-            CommandLine cl = parser.parse(options, args);
-
-            assertTrue("Confirm -a is set", cl.hasOption("a"));
-            assertTrue("Confirm -b is set", cl.hasOption("b"));
-            assertTrue("confirm arg of -b", cl.getOptionValue("b").equals("toast"));
-            assertTrue("Confirm size of extra args", cl.getArgList().size() == 3);
+            parser.parse(options, args);
+            fail("UnrecognizedOptionException wasn't thrown");
         }
         catch (UnrecognizedOptionException e)
         {
-            caught = true;
+            assertEquals("-d", e.getOption());
         }
-
-        assertTrue( "Confirm UnrecognizedOptionException caught", caught );
     }
 
     public void testMissingArg() throws Exception

src/test/org/apache/commons/cli/PosixParserTest.java

@@ -85,28 +85,19 @@ public void testComplexShort() throws Exception
         assertTrue( "Confirm size of extra args", cl.getArgList().size() == 2);
     }
 
-    public void testExtraOption() throws Exception
+    public void testUnrecognizedOption() throws Exception
     {
-        String[] args = new String[] { "-adbtoast",
-                                       "foo", "bar" };
-
-        boolean caught = false;
+        String[] args = new String[] { "-adbtoast", "foo", "bar" };
 
         try
         {
-            CommandLine cl = parser.parse(options, args);
-
-            assertTrue( "Confirm -a is set", cl.hasOption("a") );
-            assertTrue( "Confirm -b is set", cl.hasOption("b") );
-            assertTrue( "confirm arg of -b", cl.getOptionValue("b").equals("toast") );
-            assertTrue( "Confirm size of extra args", cl.getArgList().size() == 3);
+            parser.parse(options, args);
+            fail("UnrecognizedOptionException wasn't thrown");
         }
         catch (UnrecognizedOptionException e)
         {
-            caught = true;
+            assertEquals("-adbtoast", e.getOption());
         }
-
-        assertTrue( "Confirm UnrecognizedOptionException caught", caught );
     }
 
     public void testMissingArg() throws Exception