Applying Brian Egge's improvement from CLI-132

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

Author: hen

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

@@ -295,7 +295,10 @@ private void checkRequiredOptions()
         if (requiredOptions.size() > 0)
         {
             Iterator iter = requiredOptions.iterator();
-            StringBuffer buff = new StringBuffer();
+            StringBuffer buff = new StringBuffer("Missing required option");
+            buff.append(requiredOptions.size() == 1 ? "" : "s");
+            buff.append(": ");
+
 
             // loop through the required options
             while (iter.hasNext())

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

@@ -94,7 +94,28 @@ public void testHelpOptions(){
         assertTrue("Everything in help should be in all",allOptions.containsAll(helpOptions));        
     }
 
+    public void testMissingOptionException() throws ParseException {
+        Options options = new Options();
+        options.addOption(OptionBuilder.isRequired().create("f"));
+        try {
+            new PosixParser().parse(options, new String[0]);
+            fail("Expected MissingOptionException to be thrown");
+        } catch (MissingOptionException e) {
+            assertEquals("Missing required option: f", e.getMessage());
+        }
+    }
 
+    public void testMissingOptionsException() throws ParseException {
+        Options options = new Options();
+        options.addOption(OptionBuilder.isRequired().create("f"));
+        options.addOption(OptionBuilder.isRequired().create("x"));
+        try {
+            new PosixParser().parse(options, new String[0]);
+            fail("Expected MissingOptionException to be thrown");
+        } catch (MissingOptionException e) {
+            assertEquals("Missing required options: fx", e.getMessage());
+        }
+    }
 
 }