Compare line-ending-neutral in the two tests that failed on Windows

The first Windows run of the plugin tests failed three cases, none of them in the native formatter. The Windows checkout gives example1.patch CRLF line endings, so parsing it as git output found no files; git itself prints a diff with LF, so the test now reads the fixture that way. And Spotless writes the platform's line endings, CRLF on Windows, which the Spotless test compared against a text block with LF; it now compares ignoring line endings.

Author: abashev

gradle-open-java-format/src/test/java/com/palantir/javaformat/gradle/FormatDiffTest.java

@@ -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)

gradle-open-java-format/src/test/java/com/palantir/javaformat/gradle/PalantirJavaFormatSpotlessPluginTest.java

@@ -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);
     }