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 ++++++++--------
 .../java/cuchaz/enigma/TestJarIndexInheritanceTree.java  |  8 ++++----
 src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

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

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, "<init>", "()V");
-		Collection<EntryReference<MethodEntry, MethodDefEntry>> references = index.getMethodReferences(source);
+		Collection<EntryReference<MethodEntry, MethodDefEntry>> references = index.getMethodsReferencing(source);
 		assertThat(references, containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"),
 				newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "()V"),
@@ -67,7 +67,7 @@ public class TestJarIndexConstructorReferences {
 	@SuppressWarnings("unchecked")
 	public void baseInt() {
 		MethodEntry source = newMethod(baseClass, "<init>", "(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, "<init>", "()V");
-		assertThat(index.getMethodReferences(source), containsInAnyOrder(
+		assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"),
 				newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "(I)V")
 		));
@@ -86,7 +86,7 @@ public class TestJarIndexConstructorReferences {
 	@SuppressWarnings("unchecked")
 	public void subInt() {
 		MethodEntry source = newMethod(subClass, "<init>", "(I)V");
-		assertThat(index.getMethodReferences(source), containsInAnyOrder(
+		assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"),
 				newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "(II)V"),
 				newBehaviorReferenceByMethod(source, subsubClass.getName(), "<init>", "(I)V")
@@ -97,7 +97,7 @@ public class TestJarIndexConstructorReferences {
 	@SuppressWarnings("unchecked")
 	public void subIntInt() {
 		MethodEntry source = newMethod(subClass, "<init>", "(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, "<init>", "(III)V");
-		assertThat(index.getMethodReferences(source), is(empty()));
+		assertThat(index.getMethodsReferencing(source), is(empty()));
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	public void subsubInt() {
 		MethodEntry source = newMethod(subsubClass, "<init>", "(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, "<init>", "()V");
-		assertThat(index.getMethodReferences(source), containsInAnyOrder(
+		assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V")
 		));
 	}
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java b/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 5bef4e5..23df1a9 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -152,7 +152,7 @@ public class TestJarIndexInheritanceTree {
 
 		// baseClass constructor
 		source = newMethod(baseClass, "<init>", "(Ljava/lang/String;)V");
-		references = index.getMethodReferences(source);
+		references = index.getMethodsReferencing(source);
 		assertThat(references, containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, subClassA.getName(), "<init>", "(Ljava/lang/String;)V"),
 				newBehaviorReferenceByMethod(source, subClassB.getName(), "<init>", "()V")
@@ -160,14 +160,14 @@ public class TestJarIndexInheritanceTree {
 
 		// subClassA constructor
 		source = newMethod(subClassA, "<init>", "(Ljava/lang/String;)V");
-		references = index.getMethodReferences(source);
+		references = index.getMethodsReferencing(source);
 		assertThat(references, containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, subClassAA.getName(), "<init>", "()V")
 		));
 
 		// baseClass.getName()
 		source = newMethod(baseClass, "a", "()Ljava/lang/String;");
-		references = index.getMethodReferences(source);
+		references = index.getMethodsReferencing(source);
 		assertThat(references, containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, subClassAA.getName(), "a", "()Ljava/lang/String;"),
 				newBehaviorReferenceByMethod(source, subClassB.getName(), "a", "()V")
@@ -175,7 +175,7 @@ public class TestJarIndexInheritanceTree {
 
 		// subclassAA.getName()
 		source = newMethod(subClassAA, "a", "()Ljava/lang/String;");
-		references = index.getMethodReferences(source);
+		references = index.getMethodsReferencing(source);
 		assertThat(references, containsInAnyOrder(
 				newBehaviorReferenceByMethod(source, subClassAA.getName(), "a", "()V")
 		));
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