From adc6bc4104514063b3e8ebe7a301d5dd4bce36d3 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Thu, 7 May 2015 17:47:20 +0200 Subject: [PATCH] Clarify behavior of containsAny for null entries in the supplied CharSequence array --- src/main/java/org/apache/commons/lang3/StringUtils.java | 1 + .../org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index 617361e38..fcd924ca9 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -1684,6 +1684,7 @@ public static boolean containsAny(final CharSequence cs, final CharSequence sear * StringUtils.containsAny(*, null) = false * StringUtils.containsAny(*, []) = false * StringUtils.containsAny("abcd", "ab", "cd") = false + * StringUtils.containsAny("abcd", "ab", null) = false * StringUtils.containsAny("abc", "d", "abc") = true * * diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java index 1a1f37ad3..edf1e7a72 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java @@ -226,6 +226,8 @@ public void testContainsAny_StringStringArray() { assertTrue(StringUtils.containsAny("hello, goodbye", new String[] { "hello", "goodbye" })); assertTrue(StringUtils.containsAny("hello, goodbye", new String[] { "hello", "Goodbye" })); assertFalse(StringUtils.containsAny("hello, goodbye", new String[] { "Hello", "Goodbye" })); + assertFalse(StringUtils.containsAny("hello, goodbye", new String[] { "Hello", null })); + assertFalse(StringUtils.containsAny("hello, null", new String[] { "Hello", null })); } @Test