Fixed the handling of unrecognized options starting with '-' by PosixParser (CLI-164) (stopAtNonOption=false case)

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

Author: ebourg

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

@@ -229,13 +229,13 @@ private void processOptionToken(String token, boolean stopAtNonOption)
         if (options.hasOption(token))
         {
             currentOption = options.getOption(token);
-            tokens.add(token);
         }
         else if (stopAtNonOption)
         {
             eatTheRest = true;
-            tokens.add(token);
         }
+
+        tokens.add(token);
     }
 
     /**

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

@@ -100,6 +100,21 @@ public void testUnrecognizedOption() throws Exception
         }
     }
 
+    public void testUnrecognizedOption2() throws Exception
+    {
+        String[] args = new String[] { "-z", "-abtoast", "foo", "bar" };
+
+        try
+        {
+            parser.parse(options, args);
+            fail("UnrecognizedOptionException wasn't thrown");
+        }
+        catch (UnrecognizedOptionException e)
+        {
+            assertEquals("-z", e.getOption());
+        }
+    }
+
     public void testMissingArg() throws Exception
     {
         String[] args = new String[] { "-acb" };