Lang 1463: StringUtils abbreviate returns String of length greater th…

…an maxWidth (#477) * fixed LANG-1463 StringUtils abbreviate returns String of length greater than maxWidth * fixed LANG-1463 StringUtils abbreviate returns String of length greater than maxWidth * fixed LANG-1463 StringUtils abbreviate returns String of length greater than maxWidth * formatting fix * removed magic string
apache · Nov 4, 2019 · d0b95be · d0b95be
1 parent 24e6468
commit d0b95be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -294,7 +294,6 @@ public static String abbreviate(final String str, final int offset, final int ma
     public static String abbreviate(final String str, final String abbrevMarker, final int maxWidth) {
         return abbreviate(str, abbrevMarker, 0, maxWidth);
     }
-
     /**
      * <p>Abbreviates a String using a given replacement marker. This will turn
      * "Now is the time for all good men" into "...is the time for..." if "..." was defined
@@ -333,10 +332,13 @@ public static String abbreviate(final String str, final String abbrevMarker, fin
      * @since 3.6
      */
     public static String abbreviate(final String str, final String abbrevMarker, int offset, final int maxWidth) {
-        if (isEmpty(str) || isEmpty(abbrevMarker)) {
+        if (isEmpty(str) && isEmpty(abbrevMarker)) {
+            return str;
+        } else if (isNotEmpty(str) && EMPTY.equals(abbrevMarker) && maxWidth > 0) {
+            return str.substring(0, maxWidth);
+        } else if (isEmpty(str) || isEmpty(abbrevMarker)) {
             return str;
         }
-
         final int abbrevMarkerLength = abbrevMarker.length();
         final int minAbbrevWidth = abbrevMarkerLength + 1;
         final int minAbbrevWidthOffset = abbrevMarkerLength + abbrevMarkerLength + 1;

diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
@@ -236,6 +236,13 @@ private void innerTestSplitPreserveAllTokens(final char separator, final String
     }
 
     //-----------------------------------------------------------------------
+    //Fixed LANG-1463
+    @Test
+    public void testAbbreviateMarkerWithEmptyString() {
+        String greaterThanMaxTest = "much too long text";
+        assertEquals("much too long", StringUtils.abbreviate(greaterThanMaxTest, "", 13));
+    }
+
     @Test
     public void testAbbreviate_StringInt() {
         assertNull(StringUtils.abbreviate(null, 10));