Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved encodeHttpHeaderFieldParam method to HttpHeaders itself (including tests)

Browse Source 
This commit also sets the test source encoding to UTF-8.

Issue: SPR-14547
(cherry picked from commit a8f7f75)
This commit is contained in:
Juergen Hoeller
2016-08-26 11:14:02 +02:00
parent 9b91b9db8c
commit 696f687419
8 changed files with 99 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.util;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Locale;
import java.util.Properties;
@@ -628,8 +627,7 @@ public class StringUtilsTests {
assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
}
// SPR-3671
@Test
@Test // SPR-3671
public void testParseLocaleWithMultiValuedVariant() throws Exception {
final String variant = "proper_northern";
final String localeString = "en_GB_" + variant;
@@ -637,8 +635,7 @@ public class StringUtilsTests {
assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
}
// SPR-3671
@Test
@Test // SPR-3671
public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparators() throws Exception {
final String variant = "proper northern";
final String localeString = "en GB " + variant;
@@ -646,8 +643,7 @@ public class StringUtilsTests {
assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
}
// SPR-3671
@Test
@Test // SPR-3671
public void testParseLocaleWithMultiValuedVariantUsingMixtureOfUnderscoresAndSpacesAsSeparators() throws Exception {
final String variant = "proper northern";
final String localeString = "en_GB_" + variant;
@@ -655,8 +651,7 @@ public class StringUtilsTests {
assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
}
// SPR-3671
@Test
@Test // SPR-3671
public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception {
final String variant = "proper northern";
final String localeString = "en GB " + variant; // lots of whitespace
@@ -664,8 +659,7 @@ public class StringUtilsTests {
assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
}
// SPR-3671
@Test
@Test // SPR-3671
public void testParseLocaleWithMultiValuedVariantUsingUnderscoresAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception {
final String variant = "proper_northern";
final String localeString = "en_GB_____" + variant; // lots of underscores
@@ -673,8 +667,7 @@ public class StringUtilsTests {
assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
}
// SPR-7779
@Test
@Test // SPR-7779
public void testParseLocaleWithInvalidCharacters() {
try {
StringUtils.parseLocaleString("%0D%0AContent-length:30%0D%0A%0D%0A%3Cscript%3Ealert%28123%29%3C/script%3E");
@@ -685,15 +678,13 @@ public class StringUtilsTests {
}
}
// SPR-9420
@Test
@Test // SPR-9420
public void testParseLocaleWithSameLowercaseTokenForLanguageAndCountry() {
assertEquals("tr_TR", StringUtils.parseLocaleString("tr_tr").toString());
assertEquals("bg_BG_vnt", StringUtils.parseLocaleString("bg_bg_vnt").toString());
}
// SPR-11806
@Test
@Test // SPR-11806
public void testParseLocaleWithVariantContainingCountryCode() {
String variant = "GBtest";
String localeString = "en_GB_" + variant;
@@ -701,19 +692,4 @@ public class StringUtilsTests {
assertEquals("Variant containing country code not extracted correctly", variant, locale.getVariant());
}
// SPR-14547
@Test
public void encodeHttpHeaderFieldParam() {
String result = StringUtils.encodeHttpHeaderFieldParam("test.txt", Charset.forName("US-ASCII"));
assertEquals("test.txt", result);
result = StringUtils.encodeHttpHeaderFieldParam("中文.txt", Charset.forName("UTF-8"));
assertEquals("UTF-8''%E4%B8%AD%E6%96%87.txt", result);
}
@Test(expected = IllegalArgumentException.class)
public void encodeHttpHeaderFieldParamInvalidCharset() {
StringUtils.encodeHttpHeaderFieldParam("test", Charset.forName("UTF-16"));
}
}