diff --git a/.idea/misc.xml b/.idea/misc.xml index 4fad875593bf0b1f46e03a0f28b11e51eeda032e..de4681d34c0c01daa8523d1bb35eef25a41d9d1b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ <component name="FrameworkDetectionExcludesConfiguration"> <file type="web" url="file://$PROJECT_DIR$" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="10" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> \ No newline at end of file diff --git a/src/main/java/tester/Main.java b/src/main/java/tester/Main.java index bef72f9391701e983b89331e788d707ca0662916..dd821810c9196eda2a3abf701daa128f14d8c987 100644 --- a/src/main/java/tester/Main.java +++ b/src/main/java/tester/Main.java @@ -2,14 +2,13 @@ package tester; import com.google.gson.Gson; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.OutputStream; -import java.io.PrintStream; +import java.io.*; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Stream; public class Main { public static void main(String[] args) throws FileNotFoundException { @@ -92,7 +91,7 @@ public class Main { System.out.printf("File: %s\n", f); System.out.println(); try { - String got = Files.readString(Path.of(f)); + String got = fileToString(f); boolean er = compareStrings(got, e); if (er) { error.set(true); @@ -166,4 +165,11 @@ public class Main { } return error; } + + private static String fileToString(String path) throws IOException { + StringBuilder build = new StringBuilder(); + Stream<String> stream = Files.lines(Paths.get(path), StandardCharsets.UTF_8); + stream.forEach(s -> build.append(s).append("\n")); + return build.toString(); + } }