From 0b31b58b7950cfef3c957190ae2038614b5bf79d Mon Sep 17 00:00:00 2001 From: 2xsaiko Date: Fri, 2 Oct 2020 15:44:37 +0200 Subject: Fix build issues --- .../test/java/cuchaz/enigma/TestAllowableClashes.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'enigma/src/test/java') diff --git a/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java b/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java index bfc21de..ce82e38 100644 --- a/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java +++ b/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java @@ -1,5 +1,12 @@ package cuchaz.enigma; +import java.io.IOException; +import java.nio.file.Paths; + +import org.hamcrest.MatcherAssert; +import org.junit.Assert; +import org.junit.Test; + import cuchaz.enigma.classprovider.ClasspathClassProvider; import cuchaz.enigma.translation.mapping.EntryMapping; import cuchaz.enigma.translation.mapping.EntryRemapper; @@ -9,26 +16,18 @@ import cuchaz.enigma.translation.mapping.tree.EntryTree; import cuchaz.enigma.translation.mapping.tree.EntryTreeNode; import cuchaz.enigma.translation.representation.entry.MethodEntry; import cuchaz.enigma.utils.validation.ValidationContext; -import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Test; - -import java.io.IOException; -import java.nio.file.Paths; /** * Test that we can accept some name clashes that are allowed by javac */ public class TestAllowableClashes { - private static final String inputBaseName = "build/test-obf/visibility"; - @Test public void test() throws IOException, MappingParseException { //Load produced mappings Enigma enigma = Enigma.create(); - EnigmaProject project = enigma.openJar(Paths.get(inputBaseName + ".jar"), new ClasspathClassProvider(), ProgressListener.none()); - EntryTree obfToDeobf = MappingFormat.PROGUARD.read(Paths.get(inputBaseName + "-mapping.txt"), ProgressListener.none(), null); + EnigmaProject project = enigma.openJar(Paths.get("build/test-obf/visibility.jar"), new ClasspathClassProvider(), ProgressListener.none()); + EntryTree obfToDeobf = MappingFormat.PROGUARD.read(Paths.get("build/visibility-mapping.txt"), ProgressListener.none(), null); //Load them into enigma, none should conflict EntryRemapper mapper = project.getMapper(); -- cgit v1.2.3