Added a formatter test for options with a null or empty named argument

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

Author: ebourg

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

@@ -629,7 +629,7 @@ private static void appendOption(final StringBuffer buff,
         }
 
         // if the Option has a value
-        if (option.hasArg() && (option.getArgName() != null))
+        if (option.hasArg() && option.hasArgName())
         {
             buff.append(" <").append(option.getArgName()).append(">");
         }

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

@@ -257,4 +257,20 @@ public void testPrintRequiredOptionGroupUsage() {
         assertEquals("usage: app -a | -b | -c" + EOL, out.toString());
     }
 
+    public void testPrintOptionWithEmptyArgNameUsage() {
+        Option option = new Option("f", true, null);
+        option.setArgName("");
+        option.setRequired(true);
+
+        Options options = new Options();
+        options.addOption(option);
+
+        StringWriter out = new StringWriter();
+
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printUsage(new PrintWriter(out), 80, "app", options);
+
+        assertEquals("usage: app -f" + EOL, out.toString());
+    }
+
 }