From 0b31b58b7950cfef3c957190ae2038614b5bf79d Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Fri, 2 Oct 2020 15:44:37 +0200
Subject: Fix build issues

---
 enigma/build.gradle                                   |  2 +-
 .../test/java/cuchaz/enigma/TestAllowableClashes.java | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/enigma/build.gradle b/enigma/build.gradle
index 8d081457..2c5d329f 100644
--- a/enigma/build.gradle
+++ b/enigma/build.gradle
@@ -53,7 +53,7 @@ file('src/test/java/cuchaz/enigma/inputs').listFiles().each { theFile ->
 
             args '@src/test/resources/proguard-test.conf', '-injars', file('build/test-inputs/' +
                     "${theFile.name}.jar"), '-libraryjars', libraryJarsArg,
-                    '-outjars', file('build/test-obf/' + "${theFile.name}.jar"), '-printmapping', file("build/test-obf/${theFile.name}-mapping.txt")
+                    '-outjars', file('build/test-obf/' + "${theFile.name}.jar"), '-printmapping', file("build/${theFile.name}-mapping.txt")
         }
 
         test.dependsOn "${theFile.name}TestObf"
diff --git a/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java b/enigma/src/test/java/cuchaz/enigma/TestAllowableClashes.java
index bfc21de3..ce82e380 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<EntryMapping> 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<EntryMapping> 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