@@ -618,51 +618,50 @@ public void testParseLocaleStringWithEmptyLocaleStringYieldsNullLocale() throws
618
618
assertNull ("When given an empty Locale string, must return null." , locale );
619
619
}
620
620
621
- // SPR-8637
622
- @ Test
621
+ @ Test // SPR-8637
623
622
public void testParseLocaleWithMultiSpecialCharactersInVariant () throws Exception {
624
- final String variant = "proper-northern" ;
625
- final String localeString = "en_GB_" + variant ;
623
+ String variant = "proper-northern" ;
624
+ String localeString = "en_GB_" + variant ;
626
625
Locale locale = StringUtils .parseLocaleString (localeString );
627
626
assertEquals ("Multi-valued variant portion of the Locale not extracted correctly." , variant , locale .getVariant ());
628
627
}
629
628
630
629
@ Test // SPR-3671
631
630
public void testParseLocaleWithMultiValuedVariant () throws Exception {
632
- final String variant = "proper_northern" ;
633
- final String localeString = "en_GB_" + variant ;
631
+ String variant = "proper_northern" ;
632
+ String localeString = "en_GB_" + variant ;
634
633
Locale locale = StringUtils .parseLocaleString (localeString );
635
634
assertEquals ("Multi-valued variant portion of the Locale not extracted correctly." , variant , locale .getVariant ());
636
635
}
637
636
638
637
@ Test // SPR-3671
639
638
public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparators () throws Exception {
640
- final String variant = "proper northern" ;
641
- final String localeString = "en GB " + variant ;
639
+ String variant = "proper northern" ;
640
+ String localeString = "en GB " + variant ;
642
641
Locale locale = StringUtils .parseLocaleString (localeString );
643
642
assertEquals ("Multi-valued variant portion of the Locale not extracted correctly." , variant , locale .getVariant ());
644
643
}
645
644
646
645
@ Test // SPR-3671
647
646
public void testParseLocaleWithMultiValuedVariantUsingMixtureOfUnderscoresAndSpacesAsSeparators () throws Exception {
648
- final String variant = "proper northern" ;
649
- final String localeString = "en_GB_" + variant ;
647
+ String variant = "proper northern" ;
648
+ String localeString = "en_GB_" + variant ;
650
649
Locale locale = StringUtils .parseLocaleString (localeString );
651
650
assertEquals ("Multi-valued variant portion of the Locale not extracted correctly." , variant , locale .getVariant ());
652
651
}
653
652
654
653
@ Test // SPR-3671
655
654
public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparatorsWithLotsOfLeadingWhitespace () throws Exception {
656
- final String variant = "proper northern" ;
657
- final String localeString = "en GB " + variant ; // lots of whitespace
655
+ String variant = "proper northern" ;
656
+ String localeString = "en GB " + variant ; // lots of whitespace
658
657
Locale locale = StringUtils .parseLocaleString (localeString );
659
658
assertEquals ("Multi-valued variant portion of the Locale not extracted correctly." , variant , locale .getVariant ());
660
659
}
661
660
662
661
@ Test // SPR-3671
663
662
public void testParseLocaleWithMultiValuedVariantUsingUnderscoresAsSeparatorsWithLotsOfLeadingWhitespace () throws Exception {
664
- final String variant = "proper_northern" ;
665
- final String localeString = "en_GB_____" + variant ; // lots of underscores
663
+ String variant = "proper_northern" ;
664
+ String localeString = "en_GB_____" + variant ; // lots of underscores
666
665
Locale locale = StringUtils .parseLocaleString (localeString );
667
666
assertEquals ("Multi-valued variant portion of the Locale not extracted correctly." , variant , locale .getVariant ());
668
667
}
0 commit comments