@@ -51,8 +51,10 @@ class FormatDiffTest {
 
     @Test
     void parsing_git_diff_output_works() throws IOException {
+        // A Windows checkout gives the fixture CRLF line endings, while git prints a diff with LF.
         String example1 = Files.readString(
-                Paths.get("src/test/resources/com/palantir/javaformat/java/FormatDiffCliTest/example1.patch"));
+                        Paths.get("src/test/resources/com/palantir/javaformat/java/FormatDiffCliTest/example1.patch"))
+                .replace("\r\n", "\n");
 
         List<String> strings = FormatDiff.parseGitDiffOutput(example1)
                 .map(FormatDiff.SingleFileDiff::toString)
 
@@ -90,7 +90,8 @@ palantirJavaFormat files(file("%s").text.split(File.pathSeparator))
 
         BuildResult result = project.succeeds("spotlessApply", "--info");
 
-        assertThat(project.readFile(MAIN_JAVA)).isEqualTo(validJavaFile());
+        // Spotless writes the platform's line endings, CRLF on Windows.
+        assertThat(project.readFile(MAIN_JAVA)).isEqualToNormalizingNewlines(validJavaFile());
         assertThat(result.getOutput()).contains(expectedOutput);
     }
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ palantirJavaFormat files(file("%s").text.split(File.pathSeparator))`
`90`	`90`
`91`	`91`	`BuildResult result = project.succeeds("spotlessApply", "--info");`
`92`	`92`
`93`		`- assertThat(project.readFile(MAIN_JAVA)).isEqualTo(validJavaFile());`
	`93`	`+ // Spotless writes the platform's line endings, CRLF on Windows.`
	`94`	`+ assertThat(project.readFile(MAIN_JAVA)).isEqualToNormalizingNewlines(validJavaFile());`
`94`	`95`	`assertThat(result.getOutput()).contains(expectedOutput);`
`95`	`96`	`}`
`96`	`97`