LANG-1271: StringUtils#isAnyEmpty and #isAnyBlank should return false for an empty array (closes #193)
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/38140a5d Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/38140a5d Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/38140a5d Branch: refs/heads/master Commit: 38140a5d8dffec88f7c88da73ce3989770e086e6 Parents: 5acf310 Author: Pierre Templier <pierre.templ...@gmail.com> Authored: Sat Sep 24 14:52:42 2016 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Wed Oct 19 18:54:14 2016 +0200 ---------------------------------------------------------------------- src/main/java/org/apache/commons/lang3/StringUtils.java | 8 ++++---- .../apache/commons/lang3/StringUtilsEmptyBlankTest.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/38140a5d/src/main/java/org/apache/commons/lang3/StringUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index cec4fa6..d92604d 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -247,7 +247,7 @@ public class StringUtils { */ public static boolean isAnyEmpty(final CharSequence... css) { if (ArrayUtils.isEmpty(css)) { - return true; + return false; } for (final CharSequence cs : css){ if (isEmpty(cs)) { @@ -276,7 +276,7 @@ public class StringUtils { */ public static boolean isAnyNotEmpty(final CharSequence... css) { if (ArrayUtils.isEmpty(css)) { - return true; + return false; } for (final CharSequence cs : css) { if (isNotEmpty(cs)) { @@ -377,7 +377,7 @@ public class StringUtils { */ public static boolean isAnyBlank(final CharSequence... css) { if (ArrayUtils.isEmpty(css)) { - return true; + return false; } for (final CharSequence cs : css){ if (isBlank(cs)) { @@ -407,7 +407,7 @@ public class StringUtils { */ public static boolean isAnyNotBlank(final CharSequence... css) { if (ArrayUtils.isEmpty(css)) { - return true; + return false; } for (final CharSequence cs : css) { if (isNotBlank(cs)) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/38140a5d/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java index 78e16a9..769a138 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java @@ -47,7 +47,7 @@ public class StringUtilsEmptyBlankTest { @Test public void testIsAnyEmpty() { assertTrue(StringUtils.isAnyEmpty((String) null)); - assertTrue(StringUtils.isAnyEmpty((String[]) null)); + assertFalse(StringUtils.isAnyEmpty((String[]) null)); assertTrue(StringUtils.isAnyEmpty(null, "foo")); assertTrue(StringUtils.isAnyEmpty("", "bar")); assertTrue(StringUtils.isAnyEmpty("bob", "")); @@ -59,7 +59,7 @@ public class StringUtilsEmptyBlankTest { @Test public void testIsAnyNotEmpty() { assertFalse(StringUtils.isAnyNotEmpty((String) null)); - assertTrue(StringUtils.isAnyNotEmpty((String[]) null)); + assertFalse(StringUtils.isAnyNotEmpty((String[]) null)); assertTrue(StringUtils.isAnyNotEmpty(null, "foo")); assertTrue(StringUtils.isAnyNotEmpty("", "bar")); assertTrue(StringUtils.isAnyNotEmpty("bob", "")); @@ -72,7 +72,7 @@ public class StringUtilsEmptyBlankTest { @Test public void testIsNoneEmpty() { assertFalse(StringUtils.isNoneEmpty((String) null)); - assertFalse(StringUtils.isNoneEmpty((String[]) null)); + assertTrue(StringUtils.isNoneEmpty((String[]) null)); assertFalse(StringUtils.isNoneEmpty(null, "foo")); assertFalse(StringUtils.isNoneEmpty("", "bar")); assertFalse(StringUtils.isNoneEmpty("bob", "")); @@ -102,7 +102,7 @@ public class StringUtilsEmptyBlankTest { @Test public void testIsAnyBlank() { assertTrue(StringUtils.isAnyBlank((String) null)); - assertTrue(StringUtils.isAnyBlank((String[]) null)); + assertFalse(StringUtils.isAnyBlank((String[]) null)); assertTrue(StringUtils.isAnyBlank(null, "foo")); assertTrue(StringUtils.isAnyBlank(null, null)); assertTrue(StringUtils.isAnyBlank("", "bar")); @@ -115,7 +115,7 @@ public class StringUtilsEmptyBlankTest { @Test public void testIsAnyNotBlank() { assertFalse(StringUtils.isAnyNotBlank((String) null)); - assertTrue(StringUtils.isAnyNotBlank((String[]) null)); + assertFalse(StringUtils.isAnyNotBlank((String[]) null)); assertTrue(StringUtils.isAnyNotBlank(null, "foo")); assertFalse(StringUtils.isAnyNotBlank(null, null)); assertTrue(StringUtils.isAnyNotBlank("", "bar")); @@ -128,7 +128,7 @@ public class StringUtilsEmptyBlankTest { @Test public void testIsNoneBlank() { assertFalse(StringUtils.isNoneBlank((String) null)); - assertFalse(StringUtils.isNoneBlank((String[]) null)); + assertTrue(StringUtils.isNoneBlank((String[]) null)); assertFalse(StringUtils.isNoneBlank(null, "foo")); assertFalse(StringUtils.isNoneBlank(null, null)); assertFalse(StringUtils.isNoneBlank("", "bar"));