From 35ba1e2f344d87f77f2782a188ea436cbe596a53 Mon Sep 17 00:00:00 2001 From: Basha Date: Sun, 30 Apr 2017 00:48:24 +0530 Subject: [PATCH] LANG-1326 - Fixed isAllEmpty and isAllBlank --- .../java/org/apache/commons/lang3/StringUtils.java | 10 ++++++---- .../commons/lang3/StringUtilsEmptyBlankTest.java | 13 +++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index bd660bccec0..e0c5ba2d224 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -286,7 +286,8 @@ public static boolean isNoneEmpty(final CharSequence... css) { *
      * StringUtils.isAllEmpty(null)             = true
      * StringUtils.isAllEmpty(null, "")         = true
-     * StringUtils.isAllEmpty(new String[] {})  = true
+     * StringUtils.isAllEmpty(new String[] {})  = false
+     * StringUtils.isAllEmpty(new String[]{""}) = true
      * StringUtils.isAllEmpty(null, "foo")      = false
      * StringUtils.isAllEmpty("", "bar")        = false
      * StringUtils.isAllEmpty("bob", "")        = false
@@ -301,7 +302,7 @@ public static boolean isNoneEmpty(final CharSequence... css) {
      */
     public static boolean isAllEmpty(final CharSequence... css) {
         if (ArrayUtils.isEmpty(css)) {
-            return true;
+            return false;
         }
         for (final CharSequence cs : css) {
             if (isNotEmpty(cs)) {
@@ -437,7 +438,8 @@ public static boolean isNoneBlank(final CharSequence... css) {
      * StringUtils.isAllBlank("  bob  ", null)  = false
      * StringUtils.isAllBlank(" ", "bar")       = false
      * StringUtils.isAllBlank("foo", "bar")     = false
-     * StringUtils.isAllBlank(new String[] {})  = true
+     * StringUtils.isAllBlank(new String[] {})  = false
+     * StringUtils.isAllBlank(new String[]{""}) = true
      * 
* * @param css the CharSequences to check, may be null or empty @@ -446,7 +448,7 @@ public static boolean isNoneBlank(final CharSequence... css) { */ public static boolean isAllBlank(final CharSequence... css) { if (ArrayUtils.isEmpty(css)) { - return true; + return false; } for (final CharSequence cs : css) { if (isNotBlank(cs)) { diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java index 8e88f6ea3d1..2b010e2c82c 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java @@ -70,10 +70,13 @@ public void testIsNoneEmpty() { @Test public void testIsAllEmpty() { - assertTrue(StringUtils.isAllEmpty()); - assertTrue(StringUtils.isAllEmpty(new String[]{})); + assertFalse(StringUtils.isAllEmpty()); + assertFalse(StringUtils.isAllEmpty(new String[]{})); + assertTrue(StringUtils.isAllEmpty(new String[]{""})); + assertTrue(StringUtils.isAllEmpty(new String[]{"", null})); + assertFalse(StringUtils.isAllEmpty(new String[]{"", "foo"})); assertTrue(StringUtils.isAllEmpty((String) null)); - assertTrue(StringUtils.isAllEmpty((String[]) null)); + assertFalse(StringUtils.isAllEmpty((String[]) null)); assertFalse(StringUtils.isAllEmpty(null, "foo")); assertFalse(StringUtils.isAllEmpty("", "bar")); assertFalse(StringUtils.isAllEmpty("bob", "")); @@ -130,7 +133,9 @@ public void testIsNoneBlank() { @Test public void testIsAllBlank() { assertTrue(StringUtils.isAllBlank((String) null)); - assertTrue(StringUtils.isAllBlank((String[]) null)); + assertFalse(StringUtils.isAllBlank((String[]) null)); + assertFalse(StringUtils.isAllBlank(new String[]{"", "foo"})); + assertTrue(StringUtils.isAllBlank(new String[]{"", null})); assertTrue(StringUtils.isAllBlank(null, null)); assertTrue(StringUtils.isAllBlank(null, " ")); assertFalse(StringUtils.isAllBlank(null, "foo"));