From b60af42e23bf0d4fcc3a2e67fdb873b19e1597e8 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 16 Sep 2016 11:18:50 +0200 Subject: [PATCH] Polishing (cherry picked from commit ace25d4) --- .../util/StringUtilsTests.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 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 21cc737496..a1abde60b2 100644 --- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java @@ -618,51 +618,50 @@ public class StringUtilsTests { assertNull("When given an empty Locale string, must return null.", locale); } - // SPR-8637 - @Test + @Test // SPR-8637 public void testParseLocaleWithMultiSpecialCharactersInVariant() throws Exception { - final String variant = "proper-northern"; - final String localeString = "en_GB_" + variant; + String variant = "proper-northern"; + String localeString = "en_GB_" + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariant() throws Exception { - final String variant = "proper_northern"; - final String localeString = "en_GB_" + variant; + String variant = "proper_northern"; + String localeString = "en_GB_" + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparators() throws Exception { - final String variant = "proper northern"; - final String localeString = "en GB " + variant; + String variant = "proper northern"; + String localeString = "en GB " + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingMixtureOfUnderscoresAndSpacesAsSeparators() throws Exception { - final String variant = "proper northern"; - final String localeString = "en_GB_" + variant; + String variant = "proper northern"; + String localeString = "en_GB_" + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception { - final String variant = "proper northern"; - final String localeString = "en GB " + variant; // lots of whitespace + String variant = "proper northern"; + String localeString = "en GB " + variant; // lots of whitespace Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingUnderscoresAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception { - final String variant = "proper_northern"; - final String localeString = "en_GB_____" + variant; // lots of underscores + String variant = "proper_northern"; + String localeString = "en_GB_____" + variant; // lots of underscores Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); }