From 122ca4dd98dd7a749c85175551e9ae380e628257 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 5 May 2022 17:26:33 +0200
Subject: [PATCH] Assert with isEqualToNormalizingNewlines for Windows
 compatibility

---
 .../aot/nativex/BasicJsonWriterTests.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/aot/nativex/BasicJsonWriterTests.java b/spring-core/src/test/java/org/springframework/aot/nativex/BasicJsonWriterTests.java
index 5c401340a1..db5e23d2cd 100644
--- a/spring-core/src/test/java/org/springframework/aot/nativex/BasicJsonWriterTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/nativex/BasicJsonWriterTests.java
@@ -45,7 +45,7 @@ class BasicJsonWriterTests {
 		Map<String, Object> attributes = orderedMap("test", "value");
 		attributes.put("another", true);
 		this.json.writeObject(attributes);
-		assertThat(out.toString()).isEqualTo("""
+		assertThat(out.toString()).isEqualToNormalizingNewlines("""
 				{
 					"test": "value",
 					"another": true
@@ -54,11 +54,11 @@ class BasicJsonWriterTests {
 	}
 
 	@Test
-	void writeObjectWitNestedObject() {
+	void writeObjectWithNestedObject() {
 		Map<String, Object> attributes = orderedMap("test", "value");
 		attributes.put("nested", orderedMap("enabled", false));
 		this.json.writeObject(attributes);
-		assertThat(out.toString()).isEqualTo("""
+		assertThat(out.toString()).isEqualToNormalizingNewlines("""
 				{
 					"test": "value",
 					"nested": {
@@ -69,11 +69,11 @@ class BasicJsonWriterTests {
 	}
 
 	@Test
-	void writeObjectWitNestedArrayOfString() {
+	void writeObjectWithNestedArrayOfString() {
 		Map<String, Object> attributes = orderedMap("test", "value");
 		attributes.put("nested", List.of("test", "value", "another"));
 		this.json.writeObject(attributes);
-		assertThat(out.toString()).isEqualTo("""
+		assertThat(out.toString()).isEqualToNormalizingNewlines("""
 				{
 					"test": "value",
 					"nested": [
@@ -86,13 +86,13 @@ class BasicJsonWriterTests {
 	}
 
 	@Test
-	void writeObjectWitNestedArrayOfObject() {
+	void writeObjectWithNestedArrayOfObject() {
 		Map<String, Object> attributes = orderedMap("test", "value");
 		LinkedHashMap<String, Object> secondNested = orderedMap("name", "second");
 		secondNested.put("enabled", false);
 		attributes.put("nested", List.of(orderedMap("name", "first"), secondNested, orderedMap("name", "third")));
 		this.json.writeObject(attributes);
-		assertThat(out.toString()).isEqualTo("""
+		assertThat(out.toString()).isEqualToNormalizingNewlines("""
 				{
 					"test": "value",
 					"nested": [
@@ -116,7 +116,7 @@ class BasicJsonWriterTests {
 		Map<String, Object> attributes = orderedMap("test", "value");
 		attributes.put("nested", Collections.emptyList());
 		this.json.writeObject(attributes);
-		assertThat(out.toString()).isEqualTo("""
+		assertThat(out.toString()).isEqualToNormalizingNewlines("""
 				{
 					"test": "value",
 					"nested": [ ]
@@ -129,7 +129,7 @@ class BasicJsonWriterTests {
 		Map<String, Object> attributes = orderedMap("test", "value");
 		attributes.put("nested", Collections.emptyMap());
 		this.json.writeObject(attributes);
-		assertThat(out.toString()).isEqualTo("""
+		assertThat(out.toString()).isEqualToNormalizingNewlines("""
 				{
 					"test": "value",
 					"nested": { }