From e27d5967029f4f3da8889dd673ba516dcd9f3ac8 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sun, 16 Jun 2019 23:49:25 +0200 Subject: Plugin rework along with API rework: Enigma split from EnigmaProject; plugins now provide services configurable via a profile --- src/test/java/cuchaz/enigma/TestInnerClasses.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestInnerClasses.java') diff --git a/src/test/java/cuchaz/enigma/TestInnerClasses.java b/src/test/java/cuchaz/enigma/TestInnerClasses.java index 8738fd7..b6e4e2d 100644 --- a/src/test/java/cuchaz/enigma/TestInnerClasses.java +++ b/src/test/java/cuchaz/enigma/TestInnerClasses.java @@ -11,11 +11,12 @@ package cuchaz.enigma; -import cuchaz.enigma.analysis.ParsedJar; +import cuchaz.enigma.analysis.ClassCache; import cuchaz.enigma.analysis.index.JarIndex; import cuchaz.enigma.translation.representation.entry.ClassEntry; import org.junit.Test; +import java.nio.file.Paths; import java.util.jar.JarFile; import static cuchaz.enigma.TestEntryFactory.newClass; @@ -33,14 +34,14 @@ public class TestInnerClasses { private static final ClassEntry ClassTreeLevel2 = newClass("f$a$a"); private static final ClassEntry ClassTreeLevel3 = newClass("f$a$a$a"); private JarIndex index; - private Deobfuscator deobfuscator; + private Enigma enigma; public TestInnerClasses() throws Exception { - index = JarIndex.empty(); - ParsedJar jar = new ParsedJar(new JarFile("build/test-obf/innerClasses.jar")); - index.indexJar(jar, s -> {}); - deobfuscator = new Deobfuscator(jar); + ClassCache classCache = ClassCache.of(Paths.get("build/test-obf/innerClasses.jar")); + index = classCache.index(ProgressListener.none()); + + enigma = new Enigma(jar); } @Test @@ -79,6 +80,6 @@ public class TestInnerClasses { } private void decompile(ClassEntry classEntry) { - deobfuscator.getObfSourceProvider().getSources(classEntry.getName()); + enigma.getObfSourceProvider().getSources(classEntry.getName()); } } -- cgit v1.2.3