From eca0ab1bbddcb4b9797d75a8d3d0a05b02336276 Mon Sep 17 00:00:00 2001 From: modmuss Date: Sat, 13 Sep 2025 09:18:47 +0100 Subject: Remove legacy mapping handling (#560) * Remove legacy mapping handling * Minor cleanup * More cleanup--- .../enigma/translation/mapping/TestComments.java | 37 ------------------ .../translation/mapping/TestReadWriteCycle.java | 5 --- .../mapping/TestTinyV2InnerClasses.java | 37 ------------------ .../enigma/translation/mapping/TestV2Main.java | 23 ----------- .../translation/mapping/serde/recaf/TestRecaf.java | 45 ---------------------- 5 files changed, 147 deletions(-) delete mode 100644 enigma/src/test/java/cuchaz/enigma/translation/mapping/TestComments.java delete mode 100644 enigma/src/test/java/cuchaz/enigma/translation/mapping/TestTinyV2InnerClasses.java delete mode 100644 enigma/src/test/java/cuchaz/enigma/translation/mapping/TestV2Main.java delete mode 100644 enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java (limited to 'enigma/src/test/java') diff --git a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestComments.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestComments.java deleted file mode 100644 index 15ec44e..0000000 --- a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestComments.java +++ /dev/null @@ -1,37 +0,0 @@ -package cuchaz.enigma.translation.mapping; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.junit.Test; - -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat; -import cuchaz.enigma.translation.mapping.serde.MappingParseException; -import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters; -import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader; -import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer; -import cuchaz.enigma.translation.mapping.tree.EntryTree; - -public class TestComments { - private static Path DIRECTORY; - - static { - try { - DIRECTORY = Paths.get(TestTinyV2InnerClasses.class.getResource("/comments/").toURI()); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - } - - @Test - public void testParseAndWrite() throws IOException, MappingParseException { - ProgressListener progressListener = ProgressListener.none(); - MappingSaveParameters params = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF); - EntryTree mappings = EnigmaMappingsReader.DIRECTORY.read(DIRECTORY, progressListener, params); - - new TinyV2Writer("intermediary", "named").write(mappings, DIRECTORY.resolve("convertedtiny.tiny"), progressListener, params); - } -} diff --git a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestReadWriteCycle.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestReadWriteCycle.java index 25f11fb..f665c36 100644 --- a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestReadWriteCycle.java +++ b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestReadWriteCycle.java @@ -103,11 +103,6 @@ public class TestReadWriteCycle { testReadWriteCycle(MappingFormat.ENIGMA_DIRECTORY, true, ".tmp"); } - @Test - public void testEnigmaZip() throws IOException, MappingParseException { - testReadWriteCycle(MappingFormat.ENIGMA_ZIP, true, ".zip"); - } - @Test public void testTinyFile() throws IOException, MappingParseException { testReadWriteCycle(MappingFormat.TINY_FILE, false, ".tiny"); diff --git a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestTinyV2InnerClasses.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestTinyV2InnerClasses.java deleted file mode 100644 index 9164abe..0000000 --- a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestTinyV2InnerClasses.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2015 Jeff Martin. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the GNU Lesser General Public -* License v3.0 which accompanies this distribution, and is available at -* http://www.gnu.org/licenses/lgpl.html -* -*

Contributors: -* Jeff Martin - initial API and implementation -******************************************************************************/ - -package cuchaz.enigma.translation.mapping; - -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; - -import cuchaz.enigma.Enigma; -import cuchaz.enigma.EnigmaProject; -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader; - -public final class TestTinyV2InnerClasses { - private Path jar; - private Path mappings; - - public TestTinyV2InnerClasses() throws Exception { - jar = Paths.get("build/test-obf/innerClasses.jar"); - mappings = Paths.get(TestTinyV2InnerClasses.class.getResource("/tinyV2InnerClasses/").toURI()); - } - - // @Test - public void testMappings() throws Exception { - EnigmaProject project = Enigma.create().openJar(jar, List.of(), ProgressListener.none()); - project.setMappings(EnigmaMappingsReader.DIRECTORY.read(mappings, ProgressListener.none(), project.getEnigma().getProfile().getMappingSaveParameters())); - } -} diff --git a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestV2Main.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestV2Main.java deleted file mode 100644 index cc08b85..0000000 --- a/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestV2Main.java +++ /dev/null @@ -1,23 +0,0 @@ -package cuchaz.enigma.translation.mapping; - -import java.nio.file.Path; -import java.nio.file.Paths; - -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat; -import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters; -import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader; -import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer; -import cuchaz.enigma.translation.mapping.tree.EntryTree; - -public final class TestV2Main { - public static void main(String... args) throws Exception { - Path path = Paths.get(TestV2Main.class.getResource("/tinyV2InnerClasses/").toURI()); - - MappingSaveParameters parameters = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF); - - EntryTree tree = EnigmaMappingsReader.DIRECTORY.read(path, ProgressListener.none(), parameters); - - new TinyV2Writer("obf", "deobf").write(tree, Paths.get("currentYarn.tiny"), ProgressListener.none(), parameters); - } -} diff --git a/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java deleted file mode 100644 index 5f3e47c..0000000 --- a/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java +++ /dev/null @@ -1,45 +0,0 @@ -package cuchaz.enigma.translation.mapping.serde.recaf; - -import static org.junit.Assert.assertEquals; - -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.FileSystem; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.HashSet; -import java.util.Set; - -import com.google.common.jimfs.Jimfs; -import org.junit.Test; - -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.translation.mapping.EntryMapping; -import cuchaz.enigma.translation.mapping.tree.EntryTree; - -public class TestRecaf { - @Test - public void testIntegrity() throws Exception { - Set contents; - - try (InputStream in = getClass().getResourceAsStream("/recaf.mappings")) { - contents = Set.of(new String(in.readAllBytes(), StandardCharsets.UTF_8).split("\\R")); - } - - try (FileSystem fs = Jimfs.newFileSystem()) { - Path path = fs.getPath("recaf.mappings"); - Files.writeString(path, String.join("\n", contents)); - - RecafMappingsWriter writer = RecafMappingsWriter.INSTANCE; - RecafMappingsReader reader = RecafMappingsReader.INSTANCE; - - EntryTree mappings = reader.read(path, ProgressListener.none(), null); - writer.write(mappings, path, ProgressListener.none(), null); - - reader.read(path, ProgressListener.none(), null); - Set newContents = new HashSet<>(Files.readAllLines(path)); - - assertEquals(contents, newContents); - } - } -} -- cgit v1.2.3