diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java index 4a0a4ccf5..f384ebbb7 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java @@ -175,6 +175,27 @@ public void testContainsAny_StringString() { assertFalse(StringUtils.containsAny("ab", "z")); } + @Test + public void testContainsAny_StringStringArray() { + assertFalse(StringUtils.containsAny(null, (String[]) null)); + assertFalse(StringUtils.containsAny(null, new String[0])); + assertFalse(StringUtils.containsAny(null, new String[] { "hello" })); + assertFalse(StringUtils.containsAny("", (String[]) null)); + assertFalse(StringUtils.containsAny("", new String[0])); + assertFalse(StringUtils.containsAny("", new String[] { "hello" })); + assertFalse(StringUtils.containsAny("hello, goodbye", (String[]) null)); + assertFalse(StringUtils.containsAny("hello, goodbye", new String[0])); + 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 })); + // Javadoc examples: + assertTrue(StringUtils.containsAny("abcd", "ab", null)); + assertTrue(StringUtils.containsAny("abcd", "ab", "cd")); + assertTrue(StringUtils.containsAny("abc", "d", "abc")); + } + /** * See http://www.oracle.com/technetwork/articles/javase/supplementary-142654.html */ @@ -206,27 +227,6 @@ public void testContainsAny_StringWithSupplementaryChars() { assertFalse(StringUtils.containsAny(CharU20001, CharU20000)); } - @Test - public void testContainsAny_StringStringArray() { - assertFalse(StringUtils.containsAny(null, (String[]) null)); - assertFalse(StringUtils.containsAny(null, new String[0])); - assertFalse(StringUtils.containsAny(null, new String[] { "hello" })); - assertFalse(StringUtils.containsAny("", (String[]) null)); - assertFalse(StringUtils.containsAny("", new String[0])); - assertFalse(StringUtils.containsAny("", new String[] { "hello" })); - assertFalse(StringUtils.containsAny("hello, goodbye", (String[]) null)); - assertFalse(StringUtils.containsAny("hello, goodbye", new String[0])); - 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 })); - // Javadoc examples: - assertTrue(StringUtils.containsAny("abcd", "ab", null)); - assertTrue(StringUtils.containsAny("abcd", "ab", "cd")); - assertTrue(StringUtils.containsAny("abc", "d", "abc")); - } - @DefaultLocale(language = "de", country = "DE") @Test public void testContainsIgnoreCase_LocaleIndependence() {