From 75ec973bae4b06bd6aed18463507c22170e73dca Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 22 Oct 2017 20:29:46 +0200 Subject: [PATCH] Refined tests for StringUtils.starts/endsWithIgnoreCase Issue: SPR-16095 --- .../util/StringUtilsTests.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java index 45f5201ed7..8ccffe38a6 100644 --- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java @@ -140,19 +140,21 @@ public class StringUtilsTests { @Test public void testStartsWithIgnoreCase() { - String suffix = "fOo"; - assertTrue(StringUtils.startsWithIgnoreCase("foo", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("Foo", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("foobar", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("foobarbar", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("Foobar", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("FoobarBar", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("foObar", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("FOObar", suffix)); - assertTrue(StringUtils.startsWithIgnoreCase("fOobar", suffix)); - assertFalse(StringUtils.startsWithIgnoreCase(null, suffix)); + String prefix = "fOo"; + assertTrue(StringUtils.startsWithIgnoreCase("foo", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("Foo", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("foobar", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("foobarbar", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("Foobar", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("FoobarBar", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("foObar", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("FOObar", prefix)); + assertTrue(StringUtils.startsWithIgnoreCase("fOobar", prefix)); + assertFalse(StringUtils.startsWithIgnoreCase(null, prefix)); assertFalse(StringUtils.startsWithIgnoreCase("fOobar", null)); - assertFalse(StringUtils.startsWithIgnoreCase("b", suffix)); + assertFalse(StringUtils.startsWithIgnoreCase("b", prefix)); + assertFalse(StringUtils.startsWithIgnoreCase("barfoo", prefix)); + assertFalse(StringUtils.startsWithIgnoreCase("barfoobar", prefix)); } @Test @@ -170,6 +172,8 @@ public class StringUtilsTests { assertFalse(StringUtils.endsWithIgnoreCase(null, suffix)); assertFalse(StringUtils.endsWithIgnoreCase("barfOo", null)); assertFalse(StringUtils.endsWithIgnoreCase("b", suffix)); + assertFalse(StringUtils.endsWithIgnoreCase("foobar", suffix)); + assertFalse(StringUtils.endsWithIgnoreCase("barfoobar", suffix)); } @Test -- GitLab