root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Allow tests to pass on Windows JVM (non-UTF-8 default encoding) 

See gh-33071
This commit is contained in:
Juergen Hoeller 2024-07-08 19:42:28 +02:00
parent 7e7f55cb23
commit 7227c30917
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxViewResolutionIntegrationTests.java
View File

@ -70,8 +70,8 @@ class WebFluxViewResolutionIntegrationTests {
@Test @Test
void freemarkerWithInvalidConfig() { void freemarkerWithInvalidConfig() {
assertThatRuntimeException() assertThatRuntimeException()
.isThrownBy(() -> runTest(InvalidFreeMarkerWebFluxConfig.class)) .isThrownBy(() -> runTest(InvalidFreeMarkerWebFluxConfig.class))
.withMessageContaining("In addition to a FreeMarker view resolver "); .withMessageContaining("In addition to a FreeMarker view resolver ");
} }
@Test @Test

28
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
View File

@ -18,7 +18,6 @@ package org.springframework.web.servlet.config.annotation;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -51,11 +50,7 @@ class ViewResolutionIntegrationTests {
private static final String EXPECTED_BODY = "<html><body>Hello, Java Café</body></html>"; private static final String EXPECTED_BODY = "<html><body>Hello, Java Café</body></html>";
private static final boolean utf8Default = StandardCharsets.UTF_8.name().equals(System.getProperty("file.encoding"));
@BeforeAll
static void verifyDefaultFileEncoding() {
assertThat(System.getProperty("file.encoding")).as("JVM default file encoding").isEqualTo("UTF-8");
}
@Nested @Nested
@ -64,15 +59,17 @@ class ViewResolutionIntegrationTests {
@Test @Test
void freemarkerWithInvalidConfig() { void freemarkerWithInvalidConfig() {
assertThatRuntimeException() assertThatRuntimeException()
.isThrownBy(() -> runTest(InvalidFreeMarkerWebConfig.class)) .isThrownBy(() -> runTest(InvalidFreeMarkerWebConfig.class))
.withMessageContaining("In addition to a FreeMarker view resolver "); .withMessageContaining("In addition to a FreeMarker view resolver ");
} }
@Test @Test
void freemarkerWithDefaults() throws Exception { void freemarkerWithDefaults() throws Exception {
MockHttpServletResponse response = runTest(FreeMarkerWebConfig.class); MockHttpServletResponse response = runTest(FreeMarkerWebConfig.class);
assertThat(response.isCharset()).as("character encoding set in response").isTrue(); assertThat(response.isCharset()).as("character encoding set in response").isTrue();
assertThat(response.getContentAsString()).isEqualTo(EXPECTED_BODY); if (utf8Default) {
assertThat(response.getContentAsString()).isEqualTo(EXPECTED_BODY);
}
// Prior to Spring Framework 6.2, the charset is not updated in the Content-Type. // Prior to Spring Framework 6.2, the charset is not updated in the Content-Type.
// Thus, we expect ISO-8859-1 instead of UTF-8. // Thus, we expect ISO-8859-1 instead of UTF-8.
assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1"); assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1");
@ -83,7 +80,9 @@ class ViewResolutionIntegrationTests {
void freemarkerWithExistingViewResolver() throws Exception { void freemarkerWithExistingViewResolver() throws Exception {
MockHttpServletResponse response = runTest(ExistingViewResolverConfig.class); MockHttpServletResponse response = runTest(ExistingViewResolverConfig.class);
assertThat(response.isCharset()).as("character encoding set in response").isTrue(); assertThat(response.isCharset()).as("character encoding set in response").isTrue();
assertThat(response.getContentAsString()).isEqualTo(EXPECTED_BODY); if (utf8Default) {
assertThat(response.getContentAsString()).isEqualTo(EXPECTED_BODY);
}
// Prior to Spring Framework 6.2, the charset is not updated in the Content-Type. // Prior to Spring Framework 6.2, the charset is not updated in the Content-Type.
// Thus, we expect ISO-8859-1 instead of UTF-8. // Thus, we expect ISO-8859-1 instead of UTF-8.
assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1"); assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1");
@ -190,20 +189,23 @@ class ViewResolutionIntegrationTests {
} }
} }
@Nested @Nested
class GroovyMarkupTests { class GroovyMarkupTests {
@Test @Test
void groovyMarkupInvalidConfig() { void groovyMarkupInvalidConfig() {
assertThatRuntimeException() assertThatRuntimeException()
.isThrownBy(() -> runTest(InvalidGroovyMarkupWebConfig.class)) .isThrownBy(() -> runTest(InvalidGroovyMarkupWebConfig.class))
.withMessageContaining("In addition to a Groovy markup view resolver "); .withMessageContaining("In addition to a Groovy markup view resolver ");
} }
@Test @Test
void groovyMarkup() throws Exception { void groovyMarkup() throws Exception {
MockHttpServletResponse response = runTest(GroovyMarkupWebConfig.class); MockHttpServletResponse response = runTest(GroovyMarkupWebConfig.class);
assertThat(response.getContentAsString()).isEqualTo(EXPECTED_BODY); if (utf8Default) {
assertThat(response.getContentAsString()).isEqualTo(EXPECTED_BODY);
}
} }