From 2b2249e873c4adfd2dd6e8f1f2489ccd9f6aa021 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sat, 19 May 2018 17:02:46 +0200 Subject: Initial port to ASM --- .../java/cuchaz/enigma/TestJarIndexLoneClass.java | 37 ++++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java index 6cab1c8..d03f3fb 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java @@ -28,16 +28,16 @@ public class TestJarIndexLoneClass { private JarIndex index; public TestJarIndexLoneClass() - throws Exception { - index = new JarIndex(); - index.indexJar(new JarFile("build/test-obf/loneClass.jar"), false); + throws Exception { + index = new JarIndex(new ReferencedEntryPool()); + index.indexJar(new ParsedJar(new JarFile("build/test-obf/loneClass.jar")), false); } @Test public void obfEntries() { assertThat(index.getObfClassEntries(), containsInAnyOrder( - newClass("cuchaz/enigma/inputs/Keep"), - newClass("a") + newClass("cuchaz/enigma/inputs/Keep"), + newClass("a") )); } @@ -61,7 +61,7 @@ public class TestJarIndexLoneClass { @Test public void classInheritance() { - ClassInheritanceTreeNode node = index.getClassInheritance(new Translator(), newClass("a")); + ClassInheritanceTreeNode node = index.getClassInheritance(new DirectionalTranslator(new ReferencedEntryPool()), newClass("a")); assertThat(node, is(not(nullValue()))); assertThat(node.getObfClassName(), is("a")); assertThat(node.getChildCount(), is(0)); @@ -70,7 +70,7 @@ public class TestJarIndexLoneClass { @Test public void methodInheritance() { MethodEntry source = newMethod("a", "a", "()Ljava/lang/String;"); - MethodInheritanceTreeNode node = index.getMethodInheritance(new Translator(), source); + MethodInheritanceTreeNode node = index.getMethodInheritance(new DirectionalTranslator(new ReferencedEntryPool()), source); assertThat(node, is(not(nullValue()))); assertThat(node.getMethodEntry(), is(source)); assertThat(node.getChildCount(), is(0)); @@ -78,21 +78,21 @@ public class TestJarIndexLoneClass { @Test public void classImplementations() { - ClassImplementationsTreeNode node = index.getClassImplementations(new Translator(), newClass("a")); + ClassImplementationsTreeNode node = index.getClassImplementations(new DirectionalTranslator(new ReferencedEntryPool()), newClass("a")); assertThat(node, is(nullValue())); } @Test public void methodImplementations() { MethodEntry source = newMethod("a", "a", "()Ljava/lang/String;"); - assertThat(index.getMethodImplementations(new Translator(), source), is(empty())); + assertThat(index.getMethodImplementations(new DirectionalTranslator(new ReferencedEntryPool()), source), is(empty())); } @Test public void relatedMethodImplementations() { Set entries = index.getRelatedMethodImplementations(newMethod("a", "a", "()Ljava/lang/String;")); assertThat(entries, containsInAnyOrder( - newMethod("a", "a", "()Ljava/lang/String;") + newMethod("a", "a", "()Ljava/lang/String;") )); } @@ -100,16 +100,16 @@ public class TestJarIndexLoneClass { @SuppressWarnings("unchecked") public void fieldReferences() { FieldEntry source = newField("a", "a", "Ljava/lang/String;"); - Collection> references = index.getFieldReferences(source); + Collection> references = index.getFieldReferences(source); assertThat(references, containsInAnyOrder( - newFieldReferenceByConstructor(source, "a", "(Ljava/lang/String;)V"), - newFieldReferenceByMethod(source, "a", "a", "()Ljava/lang/String;") + newFieldReferenceByMethod(source, "a", "", "(Ljava/lang/String;)V"), + newFieldReferenceByMethod(source, "a", "a", "()Ljava/lang/String;") )); } @Test public void behaviorReferences() { - assertThat(index.getBehaviorReferences(newMethod("a", "a", "()Ljava/lang/String;")), is(empty())); + assertThat(index.getMethodReferences(newMethod("a", "a", "()Ljava/lang/String;")), is(empty())); } @Test @@ -122,11 +122,6 @@ public class TestJarIndexLoneClass { assertThat(index.getOuterClass(newClass("a")), is(nullValue())); } - @Test - public void isAnonymousClass() { - assertThat(index.isAnonymousClass(newClass("a")), is(false)); - } - @Test public void interfaces() { assertThat(index.getInterfaces("a"), is(empty())); @@ -149,7 +144,7 @@ public class TestJarIndexLoneClass { assertThat(index.containsObfField(newField("a", "a", "Ljava/lang/String;")), is(true)); assertThat(index.containsObfField(newField("a", "b", "Ljava/lang/String;")), is(false)); assertThat(index.containsObfField(newField("a", "a", "LFoo;")), is(false)); - assertThat(index.containsObfBehavior(newMethod("a", "a", "()Ljava/lang/String;")), is(true)); - assertThat(index.containsObfBehavior(newMethod("a", "b", "()Ljava/lang/String;")), is(false)); + assertThat(index.containsObfMethod(newMethod("a", "a", "()Ljava/lang/String;")), is(true)); + assertThat(index.containsObfMethod(newMethod("a", "b", "()Ljava/lang/String;")), is(false)); } } -- cgit v1.2.3 From 406b9a89318473571d27de60b8aa1b51f84af245 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sat, 19 May 2018 17:06:26 +0200 Subject: Package updates --- src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java index d03f3fb..b1c128c 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java @@ -13,6 +13,7 @@ package cuchaz.enigma; import cuchaz.enigma.analysis.*; import cuchaz.enigma.mapping.*; +import cuchaz.enigma.mapping.entry.*; import org.junit.Test; import java.util.Collection; -- cgit v1.2.3 From 8a0e350a04e570074557ff0a53d67e82d54d3005 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sun, 24 Jun 2018 12:24:48 +0200 Subject: Fix method reference and bridge detection --- src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java index b1c128c..b4529dd 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java @@ -110,7 +110,7 @@ public class TestJarIndexLoneClass { @Test public void behaviorReferences() { - assertThat(index.getMethodReferences(newMethod("a", "a", "()Ljava/lang/String;")), is(empty())); + assertThat(index.getMethodsReferencing(newMethod("a", "a", "()Ljava/lang/String;")), is(empty())); } @Test -- cgit v1.2.3