Long descriptions with newlines are now correctly formatted

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

Author: Robert James Oxspring

src/java/org/apache/commons/cli2/util/HelpFormatter.java

@@ -362,10 +362,10 @@ protected static List wrap(final String text, final int width) {
 
         while (left < chars.length) {
             int right = left;
-            while (right < chars.length && chars[right] != '\n') {
+            while (right < chars.length && chars[right] != '\n' && right<left+width+1) {
                 right++;
             }
-            if (right < chars.length) {
+            if (right<chars.length && chars[right] == '\n') {
                 final String line = new String(chars, left, right - left);
                 lines.add(line);
                 left = right + 1;

src/test/org/apache/commons/cli2/util/HelpFormatterTest.java

@@ -21,6 +21,7 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Iterator;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -345,6 +346,23 @@ public void testWrap_NewLine() {
         assertEquals("", i.next());
         assertFalse(i.hasNext());
     }
+
+    public void testWrap_NewLine2() {
+        List wrapped = HelpFormatter.wrap("A really quite long general description of the option with specific alternatives documented:\n"+
+                    "  Indented special case\n"+
+                    "  Alternative scenario", 30);
+        
+        final Iterator i =
+            wrapped.iterator();
+        
+        assertEquals("A really quite long general", i.next());
+        assertEquals("description of the option", i.next());
+        assertEquals("with specific alternatives", i.next());
+        assertEquals("documented:", i.next());
+        assertEquals("  Indented special case", i.next());
+        assertEquals("  Alternative scenario", i.next());
+        assertFalse(i.hasNext());
+    }
 
     public void testWrap_Below1Length() {
         try{