Compare text with system line separator (for Windows compatibility)

See gh-32756

Author: jhoeller

spring-test/src/test/java/org/springframework/test/http/MediaTypeAssertTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.test.http;
 
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
@@ -63,11 +62,12 @@ void isEqualWhenDifferentStringShouldFail() {
 
 	@Test
 	void isEqualInvalidStringShouldFail() {
+		String ls = System.lineSeparator();  // output below is different between Unix and Windows
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> assertThat(mediaType("application/json")).isEqualTo("example of a bad value"))
 				.withMessageContaining("[Media type]")
-				.withMessageEndingWith("To be a valid media type but got:\n" +
-						"  \"Invalid mime type \"example of a bad value\": does not contain '/'\"\n");
+				.withMessageEndingWith("To be a valid media type but got:" + ls +
+						"  \"Invalid mime type \"example of a bad value\": does not contain '/'\"" + ls);
 	}
 
 	@Test
@@ -108,11 +108,12 @@ void isNotEqualWhenSameStringShouldFail() {
 
 	@Test
 	void isNotEqualInvalidStringShouldFail() {
+		String ls = System.lineSeparator();  // output below is different between Unix and Windows
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> assertThat(mediaType("application/json")).isNotEqualTo("example of a bad value"))
 				.withMessageContaining("[Media type]")
-				.withMessageEndingWith("To be a valid media type but got:\n" +
-						"  \"Invalid mime type \"example of a bad value\": does not contain '/'\"\n");
+				.withMessageEndingWith("To be a valid media type but got:" + ls +
+						"  \"Invalid mime type \"example of a bad value\": does not contain '/'\"" + ls);
 	}
 
 	@Test

spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java

@@ -152,7 +152,7 @@ void encodeNonStreamEmpty() {
 				.verifyComplete());
 	}
 
-	@Test // gh-29038
+	@Test  // gh-29038
 	void encodeNonStreamWithErrorAsFirstSignal() {
 		String message = "I'm a teapot";
 		Flux<Object> input = Flux.error(new IllegalStateException(message));
@@ -264,8 +264,7 @@ public void jacksonValueUnwrappedBeforeObjectMapperSelection() {
 
 		String ls = System.lineSeparator();  // output below is different between Unix and Windows
 		testEncode(Mono.just(jacksonValue), type, halMediaType, Collections.emptyMap(), step -> step
-				.consumeNextWith(expectString("{" + ls + "  \"withView1\" : \"with\"" + ls + "}")
-						)
+				.consumeNextWith(expectString("{" + ls + "  \"withView1\" : \"with\"" + ls + "}"))
 				.verifyComplete()
 		);
 	}