fix cli tests on windows

Author: supersaiyansubtlety

enigma-cli/src/test/java/org/quiltmc/enigma/command/DropInvalidMappingsTest.java

@@ -7,6 +7,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import static org.quiltmc.enigma.TestUtil.toNewLineEndings;
+
 public class DropInvalidMappingsTest extends CommandTest {
 	private static final Path LONE_JAR = TestUtil.obfJar("lone_class");
 	private static final Path INNER_JAR = TestUtil.obfJar("inner_classes");
@@ -31,8 +33,8 @@ public void testInvalidMappings() throws Exception {
 
 		DropInvalidMappingsCommand.run(LONE_JAR, INVALID_MAPPINGS_INPUT, resultFile);
 
-		String expectedLines = Files.readString(INVALID_MAPPINGS_EXPECTED);
-		String actualLines = Files.readString(resultFile);
+		String expectedLines = toNewLineEndings(Files.readString(INVALID_MAPPINGS_EXPECTED));
+		String actualLines = toNewLineEndings(Files.readString(resultFile));
 
 		Assertions.assertEquals(expectedLines, actualLines);
 	}
@@ -55,8 +57,8 @@ public void testMappingSave() throws Exception {
 
 		DropInvalidMappingsCommand.run(INNER_JAR, MAPPING_SAVE_INPUT, resultFile);
 
-		String expectedLines = Files.readString(MAPPING_SAVE_EXPECTED);
-		String actualLines = Files.readString(resultFile);
+		String expectedLines = toNewLineEndings(Files.readString(MAPPING_SAVE_EXPECTED));
+		String actualLines = toNewLineEndings(Files.readString(resultFile));
 
 		Assertions.assertEquals(expectedLines, actualLines);
 	}
@@ -67,8 +69,8 @@ public void testDiscardInnerClass() throws Exception {
 
 		DropInvalidMappingsCommand.run(INNER_JAR, DISCARD_INNER_CLASS_INPUT, resultFile);
 
-		String expectedLines = Files.readString(DISCARD_INNER_CLASS_EXPECTED);
-		String actualLines = Files.readString(resultFile);
+		String expectedLines = toNewLineEndings(Files.readString(DISCARD_INNER_CLASS_EXPECTED));
+		String actualLines = toNewLineEndings(Files.readString(resultFile));
 
 		Assertions.assertEquals(expectedLines, actualLines);
 	}
@@ -79,8 +81,8 @@ public void testEnums() throws Exception {
 
 		DropInvalidMappingsCommand.run(ENUMS_JAR, ENUMS_INPUT, resultFile);
 
-		String expectedLines = Files.readString(ENUMS_EXPECTED);
-		String actualLines = Files.readString(resultFile);
+		String expectedLines = toNewLineEndings(Files.readString(ENUMS_EXPECTED));
+		String actualLines = toNewLineEndings(Files.readString(resultFile));
 
 		Assertions.assertEquals(expectedLines, actualLines);
 	}

enigma/src/testFixtures/java/org/quiltmc/enigma/TestUtil.java

@@ -5,9 +5,17 @@
 
 import java.net.URISyntaxException;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 public final class TestUtil {
 	private TestUtil() {
+		throw new UnsupportedOperationException();
+	}
+
+	private static final Pattern UNWANTED_LINE_ENDING = Pattern.compile("\\r\\n?");
+
+	public static String toNewLineEndings(String string) {
+		return UNWANTED_LINE_ENDING.matcher(string).replaceAll("\n");
 	}
 
 	public static Path obfJar(String name) {