fix(test): Windows line endings comparison

graphs4value · Apr 7, 2024 · 064c48a · 064c48a
1 parent be3c99a
commit 064c48a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/subprojects/generator/src/test/java/tools/refinery/generator/ProblemLoaderTest.java b/subprojects/generator/src/test/java/tools/refinery/generator/ProblemLoaderTest.java
@@ -47,7 +47,9 @@ void loadScopeConstraintsTest(String originalScopes, List<String> scopes, List<S
 			modifiedProblem.eResource().save(outputStream, Map.of());
 			serializedProblem = outputStream.toString(StandardCharsets.UTF_8);
 		}
-		assertThat(serializedProblem, is(PREFIX + expectedScopes));
+		var normalizedResult = serializedProblem.replace("\r\n", "\n");
+		var normalizedExpected = (PREFIX + expectedScopes).formatted("\r\n", "\n");
+		assertThat(normalizedResult, is(normalizedExpected));
 	}
 
 	static Stream<Arguments> loadScopeConstraintsTest() {

diff --git a/...age-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java b/...age-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java
@@ -72,7 +72,9 @@ void solutionSerializerTest(String prefix, String input, String expectedOutput)
 			solution.eResource().save(outputStream, Map.of());
 			actualOutput = outputStream.toString();
 		}
-		assertThat(actualOutput, is(prefix + "\n" + expectedOutput));
+		var normalizedResult = actualOutput.replace("\r\n", "\n");
+		var normalizedExpected = (prefix + "\n" + expectedOutput).replace("\r\n", "\n");
+		assertThat(normalizedResult, is(normalizedExpected));
 	}
 
 	static Stream<Arguments> solutionSerializerTest() {