Fixing so that newline string wraps after too long words

- Fixing bug that made newline not be respected in case wrapLongWords is
false and the first word on a line was too long
- Adding test cases for above, and for the same condition with wrapOn

Author: michaelkarnerfors

src/main/java/org/apache/commons/text/WordUtils.java

@@ -845,9 +845,10 @@ public static String wrap(final String str,
             if(wrapLongWords && nextForcedWrap < nextNewlineStr && nextForcedWrap < nextWrapOn) {
                 // We need to wrap the line due to a long word
                 lineEnd = nextLineStart = nextForcedWrap;
-            } else if(nextNewlineStr <= nextForcedWrap) {
+            } else if(nextNewlineStr <= nextForcedWrap || (nextNewlineStr > nextForcedWrap && nextNewlineStr <= nextWrapOn)) {
                 // There is a newLineStr before the length limit of the line, 
-                // so we wrap just after that.
+                // or after the length limit and before the next wrapOn, 
+                // so we wrap just after that newline string.
                 // This preserves trailing instances of wrapOn.
                 nextLineStart = !newlineStrMatcher.hitEnd() ? newlineStrMatcher.end() : inputLineLength;
                 lineEnd = nextLineStart;

src/test/java/org/apache/commons/text/WordUtilsTest.java

@@ -446,7 +446,24 @@ private static Stream<Arguments> provideDataForTypicalUseCasesLengthArgument() {
             Arguments.of(
                 "Strip leading, keep trailing",
                 "word1             word2                        word3", 7,
-                "word1  " + systemNewLine + "word2  " + systemNewLine + "word3")
+                "word1  " + systemNewLine + "word2  " + systemNewLine + "word3"),
+
+            Arguments.of(
+                "Long word, followed by wrap",
+                "LongForALine Line 2 and Line 3", 12,
+                "LongForALine" + systemNewLine + "Line 2 and" + systemNewLine + "Line 3"),
+            Arguments.of(
+                "Long word, followed by newline",
+                "LongForALine" + systemNewLine + "Line 2 and Line 3", 12,
+                "LongForALine" + systemNewLine + "Line 2 and" + systemNewLine + "Line 3"),
+            Arguments.of(
+                "Too long word, followed by wrap",
+                "TooLongForALine Line 2 and Line 3", 10,
+                "TooLongForALine" + systemNewLine + "Line 2 and" + systemNewLine + "Line 3"),
+            Arguments.of(
+                "Too long word, followed by newline",
+                "TooLongForALine" + systemNewLine + "Line 2 and Line 3", 10,
+                "TooLongForALine" + systemNewLine + "Line 2 and" + systemNewLine + "Line 3")
         );
     }