Fix PropertiesFileGeneratorTest failing on Windows

The properties files are written with OS-specific line breaks, but the
expected output previously only considered '\n' instead  of Windows '\r\n'.

Also simplified the code reading the properties file content in
PropertiesFileGeneratorTest.

Author: Marcono1234

src/main/java/pl/project13/core/util/PropertyManager.java

@@ -60,12 +60,12 @@ protected static void dumpProperties(OutputStream outputStream, OrderedPropertie
       // use the OrderedProperties.store(Writer, ...)-method to avoid illegal reflective access warning
       // see: https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/523
       outputWriter.write("#Generated by Git-Commit-Id-Plugin");
-      outputWriter.write(System.getProperty("line.separator"));
+      outputWriter.write(System.lineSeparator());
       for (Map.Entry<String, String> e : sortedLocalProperties.entrySet()) {
         String key = saveConvert(e.getKey(), true, escapeUnicode);
         String val = saveConvert(e.getValue(), false, escapeUnicode);
         outputWriter.write(key + "=" + val);
-        outputWriter.write(System.getProperty("line.separator"));
+        outputWriter.write(System.lineSeparator());
       }
     }
   }

src/test/java/pl/project13/core/PropertiesFileGeneratorTest.java

@@ -51,6 +51,13 @@ public void setUp() {
     propertiesFileGenerator = new PropertiesFileGenerator(logInterface, buildFileChangeListener, CommitIdPropertiesOutputFormat.PROPERTIES, "", "test");
   }
 
+  /**
+   * Replaces {@code \n} with the OS-specific line break characters.
+   */
+  private static String convertLineBreaks(String s) {
+    return s.replace("\n", System.lineSeparator());
+  }
+
   @Test
   public void generatedPropertiesFileDoesNotEscapeUnicode() throws GitCommitIdExecutionException, IOException {
     Properties properties = new Properties();
@@ -62,12 +69,11 @@ public void generatedPropertiesFileDoesNotEscapeUnicode() throws GitCommitIdExec
     propertiesFileGenerator.maybeGeneratePropertiesFile(
             properties, temporaryFolder.getRoot(), propertiesPath.toFile(), UTF_8, false);
 
-    byte[] bytes = Files.readAllBytes(propertiesPath);
-    String actualContent = new String(bytes, UTF_8);
-    String expectedContent = "#Generated by Git-Commit-Id-Plugin\n"
+    String actualContent = Files.readString(propertiesPath, UTF_8);
+    String expectedContent = convertLineBreaks("#Generated by Git-Commit-Id-Plugin\n"
             + "branch=develop\n"
             + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n"
-            + "commit.message.short=測試中文\n";
+            + "commit.message.short=測試中文\n");
     assertEquals(expectedContent, actualContent);
   }
 
@@ -82,12 +88,11 @@ public void generatedPropertiesFileEscapeUnicode() throws GitCommitIdExecutionEx
     propertiesFileGenerator.maybeGeneratePropertiesFile(
             properties, temporaryFolder.getRoot(), propertiesPath.toFile(), UTF_8, true);
 
-    byte[] bytes = Files.readAllBytes(propertiesPath);
-    String actualContent = new String(bytes, UTF_8);
-    String expectedContent = "#Generated by Git-Commit-Id-Plugin\n"
+    String actualContent = Files.readString(propertiesPath, UTF_8);
+    String expectedContent = convertLineBreaks("#Generated by Git-Commit-Id-Plugin\n"
             + "branch=develop\n"
             + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n"
-            + "commit.message.short=\\u6E2C\\u8A66\\u4E2D\\u6587\n";
+            + "commit.message.short=\\u6E2C\\u8A66\\u4E2D\\u6587\n");
     assertEquals(expectedContent, actualContent);
   }
 
@@ -101,11 +106,10 @@ public void generatedPropertiesFileDoesNotContainDateComment() throws GitCommitI
     propertiesFileGenerator.maybeGeneratePropertiesFile(
             properties, temporaryFolder.getRoot(), propertiesPath.toFile(), UTF_8, true);
 
-    byte[] bytes = Files.readAllBytes(propertiesPath);
-    String actualContent = new String(bytes, UTF_8);
-    String expectedContent = "#Generated by Git-Commit-Id-Plugin\n"
+    String actualContent = Files.readString(propertiesPath, UTF_8);
+    String expectedContent = convertLineBreaks("#Generated by Git-Commit-Id-Plugin\n"
         + "branch=develop\n"
-        + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n";
+        + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n");
     assertEquals(expectedContent, actualContent);
   }
 
@@ -123,11 +127,10 @@ public void rereadGeneratedPropertiesFile() throws GitCommitIdExecutionException
     propertiesFileGenerator.maybeGeneratePropertiesFile(
             properties, temporaryFolder.getRoot(), propertiesPath.toFile(), UTF_8, true);
 
-    byte[] bytes = Files.readAllBytes(propertiesPath);
-    String actualContent = new String(bytes, UTF_8);
-    String expectedContent = "#Generated by Git-Commit-Id-Plugin\n"
+    String actualContent = Files.readString(propertiesPath, UTF_8);
+    String expectedContent = convertLineBreaks("#Generated by Git-Commit-Id-Plugin\n"
         + "branch=develop\n"
-        + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n";
+        + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n");
     assertEquals(expectedContent, actualContent);
   }
 
@@ -143,10 +146,9 @@ public void worksWithRelativeFileLocation() throws GitCommitIdExecutionException
 
     Path absolutePath = temporaryFolder.getRoot().toPath().resolve("src/blah/blub/git.properties");
     assertTrue(absolutePath.toFile().exists());
-    byte[] bytes = Files.readAllBytes(absolutePath);
-    String actualContent = new String(bytes, UTF_8);
-    String expectedContent = "#Generated by Git-Commit-Id-Plugin\n"
-            + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n";
+    String actualContent = Files.readString(absolutePath, UTF_8);
+    String expectedContent = convertLineBreaks("#Generated by Git-Commit-Id-Plugin\n"
+            + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n");
     assertEquals(expectedContent, actualContent);
   }
 }