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 --- .../enigma/TestJarIndexConstructorReferences.java | 78 +++++++++++----------- 1 file changed, 38 insertions(+), 40 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java index edb859a..b20b27b 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java @@ -13,22 +13,20 @@ package cuchaz.enigma; import cuchaz.enigma.analysis.EntryReference; import cuchaz.enigma.analysis.JarIndex; -import cuchaz.enigma.mapping.BehaviorEntry; +import cuchaz.enigma.analysis.ParsedJar; import cuchaz.enigma.mapping.ClassEntry; +import cuchaz.enigma.mapping.MethodDefEntry; +import cuchaz.enigma.mapping.MethodEntry; +import cuchaz.enigma.mapping.ReferencedEntryPool; import org.junit.Test; import java.io.File; import java.util.Collection; import java.util.jar.JarFile; -import static cuchaz.enigma.TestEntryFactory.newBehaviorReferenceByConstructor; -import static cuchaz.enigma.TestEntryFactory.newBehaviorReferenceByMethod; -import static cuchaz.enigma.TestEntryFactory.newClass; -import static cuchaz.enigma.TestEntryFactory.newConstructor; +import static cuchaz.enigma.TestEntryFactory.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; public class TestJarIndexConstructorReferences { @@ -41,90 +39,90 @@ public class TestJarIndexConstructorReferences { private ClassEntry callerClass = newClass("b"); public TestJarIndexConstructorReferences() - throws Exception { + throws Exception { File jarFile = new File("build/test-obf/constructors.jar"); - index = new JarIndex(); - index.indexJar(new JarFile(jarFile), false); + index = new JarIndex(new ReferencedEntryPool()); + index.indexJar(new ParsedJar(new JarFile(jarFile)), false); } @Test public void obfEntries() { assertThat(index.getObfClassEntries(), containsInAnyOrder(newClass("cuchaz/enigma/inputs/Keep"), baseClass, - subClass, subsubClass, defaultClass, callerClass)); + subClass, subsubClass, defaultClass, callerClass)); } @Test @SuppressWarnings("unchecked") public void baseDefault() { - BehaviorEntry source = newConstructor(baseClass, "()V"); - Collection> references = index.getBehaviorReferences(source); + MethodEntry source = newMethod(baseClass, "", "()V"); + Collection> references = index.getMethodReferences(source); assertThat(references, containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"), - newBehaviorReferenceByConstructor(source, subClass.getName(), "()V"), - newBehaviorReferenceByConstructor(source, subClass.getName(), "(III)V") + newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"), + newBehaviorReferenceByMethod(source, subClass.getName(), "", "()V"), + newBehaviorReferenceByMethod(source, subClass.getName(), "", "(III)V") )); } @Test @SuppressWarnings("unchecked") public void baseInt() { - BehaviorEntry source = newConstructor(baseClass, "(I)V"); - assertThat(index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "b", "()V") + MethodEntry source = newMethod(baseClass, "", "(I)V"); + assertThat(index.getMethodReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "b", "()V") )); } @Test @SuppressWarnings("unchecked") public void subDefault() { - BehaviorEntry source = newConstructor(subClass, "()V"); - assertThat(index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"), - newBehaviorReferenceByConstructor(source, subClass.getName(), "(I)V") + MethodEntry source = newMethod(subClass, "", "()V"); + assertThat(index.getMethodReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"), + newBehaviorReferenceByMethod(source, subClass.getName(), "", "(I)V") )); } @Test @SuppressWarnings("unchecked") public void subInt() { - BehaviorEntry source = newConstructor(subClass, "(I)V"); - assertThat(index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"), - newBehaviorReferenceByConstructor(source, subClass.getName(), "(II)V"), - newBehaviorReferenceByConstructor(source, subsubClass.getName(), "(I)V") + MethodEntry source = newMethod(subClass, "", "(I)V"); + assertThat(index.getMethodReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"), + newBehaviorReferenceByMethod(source, subClass.getName(), "", "(II)V"), + newBehaviorReferenceByMethod(source, subsubClass.getName(), "", "(I)V") )); } @Test @SuppressWarnings("unchecked") public void subIntInt() { - BehaviorEntry source = newConstructor(subClass, "(II)V"); - assertThat(index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "e", "()V") + MethodEntry source = newMethod(subClass, "", "(II)V"); + assertThat(index.getMethodReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "e", "()V") )); } @Test public void subIntIntInt() { - BehaviorEntry source = newConstructor(subClass, "(III)V"); - assertThat(index.getBehaviorReferences(source), is(empty())); + MethodEntry source = newMethod(subClass, "", "(III)V"); + assertThat(index.getMethodReferences(source), is(empty())); } @Test @SuppressWarnings("unchecked") public void subsubInt() { - BehaviorEntry source = newConstructor(subsubClass, "(I)V"); - assertThat(index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "f", "()V") + MethodEntry source = newMethod(subsubClass, "", "(I)V"); + assertThat(index.getMethodReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "f", "()V") )); } @Test @SuppressWarnings("unchecked") public void defaultConstructable() { - BehaviorEntry source = newConstructor(defaultClass, "()V"); - assertThat(index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V") + MethodEntry source = newMethod(defaultClass, "", "()V"); + assertThat(index.getMethodReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V") )); } } -- 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 --- .../java/cuchaz/enigma/TestJarIndexConstructorReferences.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java index b20b27b..dd275b3 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java @@ -14,10 +14,10 @@ package cuchaz.enigma; import cuchaz.enigma.analysis.EntryReference; import cuchaz.enigma.analysis.JarIndex; import cuchaz.enigma.analysis.ParsedJar; -import cuchaz.enigma.mapping.ClassEntry; -import cuchaz.enigma.mapping.MethodDefEntry; -import cuchaz.enigma.mapping.MethodEntry; -import cuchaz.enigma.mapping.ReferencedEntryPool; +import cuchaz.enigma.mapping.entry.ClassEntry; +import cuchaz.enigma.mapping.entry.MethodDefEntry; +import cuchaz.enigma.mapping.entry.MethodEntry; +import cuchaz.enigma.mapping.entry.ReferencedEntryPool; import org.junit.Test; import java.io.File; -- 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 --- .../cuchaz/enigma/TestJarIndexConstructorReferences.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java index dd275b3..763639a 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java @@ -55,7 +55,7 @@ public class TestJarIndexConstructorReferences { @SuppressWarnings("unchecked") public void baseDefault() { MethodEntry source = newMethod(baseClass, "", "()V"); - Collection> references = index.getMethodReferences(source); + Collection> references = index.getMethodsReferencing(source); assertThat(references, containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"), newBehaviorReferenceByMethod(source, subClass.getName(), "", "()V"), @@ -67,7 +67,7 @@ public class TestJarIndexConstructorReferences { @SuppressWarnings("unchecked") public void baseInt() { MethodEntry source = newMethod(baseClass, "", "(I)V"); - assertThat(index.getMethodReferences(source), containsInAnyOrder( + assertThat(index.getMethodsReferencing(source), containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "b", "()V") )); } @@ -76,7 +76,7 @@ public class TestJarIndexConstructorReferences { @SuppressWarnings("unchecked") public void subDefault() { MethodEntry source = newMethod(subClass, "", "()V"); - assertThat(index.getMethodReferences(source), containsInAnyOrder( + assertThat(index.getMethodsReferencing(source), containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"), newBehaviorReferenceByMethod(source, subClass.getName(), "", "(I)V") )); @@ -86,7 +86,7 @@ public class TestJarIndexConstructorReferences { @SuppressWarnings("unchecked") public void subInt() { MethodEntry source = newMethod(subClass, "", "(I)V"); - assertThat(index.getMethodReferences(source), containsInAnyOrder( + assertThat(index.getMethodsReferencing(source), containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"), newBehaviorReferenceByMethod(source, subClass.getName(), "", "(II)V"), newBehaviorReferenceByMethod(source, subsubClass.getName(), "", "(I)V") @@ -97,7 +97,7 @@ public class TestJarIndexConstructorReferences { @SuppressWarnings("unchecked") public void subIntInt() { MethodEntry source = newMethod(subClass, "", "(II)V"); - assertThat(index.getMethodReferences(source), containsInAnyOrder( + assertThat(index.getMethodsReferencing(source), containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "e", "()V") )); } @@ -105,14 +105,14 @@ public class TestJarIndexConstructorReferences { @Test public void subIntIntInt() { MethodEntry source = newMethod(subClass, "", "(III)V"); - assertThat(index.getMethodReferences(source), is(empty())); + assertThat(index.getMethodsReferencing(source), is(empty())); } @Test @SuppressWarnings("unchecked") public void subsubInt() { MethodEntry source = newMethod(subsubClass, "", "(I)V"); - assertThat(index.getMethodReferences(source), containsInAnyOrder( + assertThat(index.getMethodsReferencing(source), containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "f", "()V") )); } @@ -121,7 +121,7 @@ public class TestJarIndexConstructorReferences { @SuppressWarnings("unchecked") public void defaultConstructable() { MethodEntry source = newMethod(defaultClass, "", "()V"); - assertThat(index.getMethodReferences(source), containsInAnyOrder( + assertThat(index.getMethodsReferencing(source), containsInAnyOrder( newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V") )); } -- cgit v1.2.3