From 0f47403d0220757fed189b76e2071e25b1025cb8 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 3 Jun 2020 13:39:42 -0400 Subject: Split GUI code to separate module (#242) * Split into modules * Post merge compile fixes Co-authored-by: modmuss50 --- .../java/cuchaz/enigma/mapping/TestComments.java | 40 --------------------- .../enigma/mapping/TestTinyV2InnerClasses.java | 41 ---------------------- .../java/cuchaz/enigma/mapping/TestV2Main.java | 24 ------------- 3 files changed, 105 deletions(-) delete mode 100644 src/test/java/cuchaz/enigma/mapping/TestComments.java delete mode 100644 src/test/java/cuchaz/enigma/mapping/TestTinyV2InnerClasses.java delete mode 100644 src/test/java/cuchaz/enigma/mapping/TestV2Main.java (limited to 'src/test/java/cuchaz/enigma/mapping') diff --git a/src/test/java/cuchaz/enigma/mapping/TestComments.java b/src/test/java/cuchaz/enigma/mapping/TestComments.java deleted file mode 100644 index b3a6005..0000000 --- a/src/test/java/cuchaz/enigma/mapping/TestComments.java +++ /dev/null @@ -1,40 +0,0 @@ -package cuchaz.enigma.mapping; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.nio.file.Path; -import java.nio.file.Paths; - -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.throwables.MappingParseException; -import cuchaz.enigma.translation.mapping.EntryMapping; -import cuchaz.enigma.translation.mapping.MappingFileNameFormat; -import cuchaz.enigma.translation.mapping.MappingSaveParameters; -import cuchaz.enigma.translation.mapping.serde.EnigmaMappingsReader; -import cuchaz.enigma.translation.mapping.serde.TinyV2Writer; -import cuchaz.enigma.translation.mapping.tree.EntryTree; -import org.junit.Test; - -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); - } - -} \ No newline at end of file diff --git a/src/test/java/cuchaz/enigma/mapping/TestTinyV2InnerClasses.java b/src/test/java/cuchaz/enigma/mapping/TestTinyV2InnerClasses.java deleted file mode 100644 index 7cfdaca..0000000 --- a/src/test/java/cuchaz/enigma/mapping/TestTinyV2InnerClasses.java +++ /dev/null @@ -1,41 +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.mapping; - -import cuchaz.enigma.Enigma; -import cuchaz.enigma.EnigmaProject; -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.translation.mapping.serde.EnigmaMappingsReader; -import cuchaz.enigma.translation.representation.entry.ClassEntry; -import org.junit.Test; - -import java.nio.file.Path; -import java.nio.file.Paths; - -import static cuchaz.enigma.TestEntryFactory.newClass; - -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, ProgressListener.none()); - project.setMappings(EnigmaMappingsReader.DIRECTORY.read(mappings, ProgressListener.none(), project.getEnigma().getProfile().getMappingSaveParameters())); - - } -} diff --git a/src/test/java/cuchaz/enigma/mapping/TestV2Main.java b/src/test/java/cuchaz/enigma/mapping/TestV2Main.java deleted file mode 100644 index 021a90c..0000000 --- a/src/test/java/cuchaz/enigma/mapping/TestV2Main.java +++ /dev/null @@ -1,24 +0,0 @@ -package cuchaz.enigma.mapping; - -import cuchaz.enigma.ProgressListener; -import cuchaz.enigma.translation.mapping.EntryMapping; -import cuchaz.enigma.translation.mapping.MappingFileNameFormat; -import cuchaz.enigma.translation.mapping.MappingSaveParameters; -import cuchaz.enigma.translation.mapping.serde.EnigmaMappingsReader; -import cuchaz.enigma.translation.mapping.serde.TinyV2Writer; -import cuchaz.enigma.translation.mapping.tree.EntryTree; - -import java.nio.file.Path; -import java.nio.file.Paths; - -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); - } -} -- cgit v1.2.3