Get rid of normalizedLineEndings and readAsString

By reusing `assertEqualToFile` it is possible to handle line endings
nicer and more efficient.

Author: ibbem

src/main/java/org/variantsync/diffdetective/util/FileUtils.java

@@ -4,16 +4,11 @@
 import org.tinylog.Logger;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 
 public class FileUtils {
-    public static String normalizedLineEndings(final String text) {
-        return text.replaceAll(StringUtils.LINEBREAK_REGEX, StringUtils.LINEBREAK);
-    }
-
     public static boolean isEmptyDirectory(final Path p) throws IOException {
         return !Files.exists(p) || (Files.isDirectory(p) && Files.list(p).findAny().isEmpty());
     }
@@ -46,22 +41,6 @@ public static boolean isLineGraph(final Path p) {
         return hasExtension(p, ".lg");
     }
 
-    /**
-     * Read a text file.
-     *
-     * @param path Path to the file to read.
-     * @return The content of the file as a utf8 encoded string.
-     */
-    public static String readUTF8(final Path path) {
-        try {
-            byte[] encoded = Files.readAllBytes(path);
-            return new String(encoded, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-
     public static Path addExtension(final Path p, final String extension) {
         return p.resolveSibling(p.getFileName() + extension);
     }

src/main/java/org/variantsync/diffdetective/util/IO.java

@@ -11,7 +11,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Optional;
 import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
  * Util class for exporting data.
@@ -21,18 +20,6 @@
 public class IO {
     private static final String CSV_DELIMITER = ",";
 
-    public static String readAsString(final Path p) throws IOException {
-        try (
-                final FileReader f = new FileReader(p.toFile());
-                final BufferedReader reader = new BufferedReader(f)
-        ) {
-            return reader.lines().collect(Collectors.joining("\r\n"));
-        } catch (final IOException e) {
-            Logger.error(e, "Failed to read lines from file");
-            throw e;
-        }
-    }
-
     /**
      * Exports data to a csv-file
      * @param fileName Name of the file to export to

src/test/java/PrintWorkingTreeDiff.java

@@ -45,28 +45,9 @@ public void testWorkingTreeDiff() throws IOException, NoHeadException, GitAPIExc
 			diffOutput += patchDiff.getDiff();
 		}
 
-		// Load diff to verfiy computed output
-		String fileForVerification = "src/test/resources/" + repoName + ".txt";
-		String result = read(Paths.get(fileForVerification));
-
-		// Remove all white spaces to simplify comparison 
-		diffOutput = diffOutput.replaceAll("\\s", "");
-		result = result.replaceAll("\\s", "");
-	
 		// Check whether diffs match
-		Assert.assertTrue(diffOutput.equals(result));
+		Path fileForVerification = Path.of("src", "test", "resources", repoName + ".txt");
+		TestUtils.assertEqualToFile(fileForVerification, diffOutput);
 
 	}
-	
-	/**
-	 * Read in diff from external file.
-	 * 
-	 * @param filePath Path to the file
-	 * @return The diff
-	 * @throws IOException 
-	 */
-	private static String read(Path filePath) throws IOException {
-        return IO.readAsString(filePath);
-	}
-	
 }

src/test/java/StarfoldTest.java

@@ -5,6 +5,7 @@
 import org.variantsync.diffdetective.util.FileUtils;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Stream;
@@ -31,9 +32,9 @@ public void testAll() throws IOException {
             final DiffTree t = DiffTree.fromFile(testCase.inputDiff, true, true).unwrap().getSuccess();
             Starfold.RespectNodeOrder().transform(t);
 //            System.out.println(t.toTextDiff());
-            Assert.assertEquals(
-                    FileUtils.normalizedLineEndings(t.toTextDiff().trim()),
-                    FileUtils.normalizedLineEndings(FileUtils.readUTF8(testCase.expectedDiff).trim())
+            TestUtils.assertEqualToFile(
+                    testCase.expectedDiff,
+                    t.toTextDiff().trim()
             );
         }
     }