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/TestDeobfed.java | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/test/java/cuchaz/enigma/TestDeobfed.java')

diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/src/test/java/cuchaz/enigma/TestDeobfed.java
index 14b1418..3d875df 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfed.java
+++ b/src/test/java/cuchaz/enigma/TestDeobfed.java
@@ -11,12 +11,12 @@
 
 package cuchaz.enigma;
 
-import cuchaz.enigma.analysis.ParsedJar;
+import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.index.JarIndex;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.jar.JarFile;
+import java.nio.file.Paths;
 
 import static cuchaz.enigma.TestEntryFactory.newClass;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,15 +24,16 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
 
 public class TestDeobfed {
 
-	private static ParsedJar jar;
+	private static Enigma enigma;
+	private static ClassCache classCache;
 	private static JarIndex index;
 
 	@BeforeClass
-	public static void beforeClass()
-		throws Exception {
-		jar = new ParsedJar(new JarFile("build/test-deobf/translation.jar"));
-		index = JarIndex.empty();
-		index.indexJar(jar, s -> {});
+	public static void beforeClass() throws Exception {
+		enigma = Enigma.create();
+
+		classCache = ClassCache.of(Paths.get("build/test-deobf/translation.jar"));
+		index = classCache.index(ProgressListener.none());
 	}
 
 	@Test
@@ -67,8 +68,9 @@ public class TestDeobfed {
 	@Test
 	public void decompile()
 		throws Exception {
-		Deobfuscator deobfuscator = new Deobfuscator(jar);
-		SourceProvider sourceProvider = deobfuscator.getObfSourceProvider();
+		EnigmaProject project = new EnigmaProject(enigma, classCache, index);
+
+		SourceProvider sourceProvider = project.getObfSourceProvider();
 		sourceProvider.getSources("a");
 		sourceProvider.getSources("b");
 		sourceProvider.getSources("c");
-- 
cgit v1.2.3