summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorGravatar gegy10002018-06-24 12:24:48 +0200
committerGravatar gegy10002018-06-24 12:24:48 +0200
commit8a0e350a04e570074557ff0a53d67e82d54d3005 (patch)
tree621fb8ab321525eadfd95fdd743cfcfee935d4d8 /src/test
parentFix array translation in method calls (diff)
downloadenigma-8a0e350a04e570074557ff0a53d67e82d54d3005.tar.gz
enigma-8a0e350a04e570074557ff0a53d67e82d54d3005.tar.xz
enigma-8a0e350a04e570074557ff0a53d67e82d54d3005.zip
Fix method reference and bridge detection
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java16
-rw-r--r--src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java8
-rw-r--r--src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java2
3 files changed, 13 insertions, 13 deletions
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
index dd275b38..763639a4 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
@@ -55,7 +55,7 @@ public class TestJarIndexConstructorReferences {
55 @SuppressWarnings("unchecked") 55 @SuppressWarnings("unchecked")
56 public void baseDefault() { 56 public void baseDefault() {
57 MethodEntry source = newMethod(baseClass, "<init>", "()V"); 57 MethodEntry source = newMethod(baseClass, "<init>", "()V");
58 Collection<EntryReference<MethodEntry, MethodDefEntry>> references = index.getMethodReferences(source); 58 Collection<EntryReference<MethodEntry, MethodDefEntry>> references = index.getMethodsReferencing(source);
59 assertThat(references, containsInAnyOrder( 59 assertThat(references, containsInAnyOrder(
60 newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"), 60 newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"),
61 newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "()V"), 61 newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "()V"),
@@ -67,7 +67,7 @@ public class TestJarIndexConstructorReferences {
67 @SuppressWarnings("unchecked") 67 @SuppressWarnings("unchecked")
68 public void baseInt() { 68 public void baseInt() {
69 MethodEntry source = newMethod(baseClass, "<init>", "(I)V"); 69 MethodEntry source = newMethod(baseClass, "<init>", "(I)V");
70 assertThat(index.getMethodReferences(source), containsInAnyOrder( 70 assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
71 newBehaviorReferenceByMethod(source, callerClass.getName(), "b", "()V") 71 newBehaviorReferenceByMethod(source, callerClass.getName(), "b", "()V")
72 )); 72 ));
73 } 73 }
@@ -76,7 +76,7 @@ public class TestJarIndexConstructorReferences {
76 @SuppressWarnings("unchecked") 76 @SuppressWarnings("unchecked")
77 public void subDefault() { 77 public void subDefault() {
78 MethodEntry source = newMethod(subClass, "<init>", "()V"); 78 MethodEntry source = newMethod(subClass, "<init>", "()V");
79 assertThat(index.getMethodReferences(source), containsInAnyOrder( 79 assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
80 newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"), 80 newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"),
81 newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "(I)V") 81 newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "(I)V")
82 )); 82 ));
@@ -86,7 +86,7 @@ public class TestJarIndexConstructorReferences {
86 @SuppressWarnings("unchecked") 86 @SuppressWarnings("unchecked")
87 public void subInt() { 87 public void subInt() {
88 MethodEntry source = newMethod(subClass, "<init>", "(I)V"); 88 MethodEntry source = newMethod(subClass, "<init>", "(I)V");
89 assertThat(index.getMethodReferences(source), containsInAnyOrder( 89 assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
90 newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"), 90 newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"),
91 newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "(II)V"), 91 newBehaviorReferenceByMethod(source, subClass.getName(), "<init>", "(II)V"),
92 newBehaviorReferenceByMethod(source, subsubClass.getName(), "<init>", "(I)V") 92 newBehaviorReferenceByMethod(source, subsubClass.getName(), "<init>", "(I)V")
@@ -97,7 +97,7 @@ public class TestJarIndexConstructorReferences {
97 @SuppressWarnings("unchecked") 97 @SuppressWarnings("unchecked")
98 public void subIntInt() { 98 public void subIntInt() {
99 MethodEntry source = newMethod(subClass, "<init>", "(II)V"); 99 MethodEntry source = newMethod(subClass, "<init>", "(II)V");
100 assertThat(index.getMethodReferences(source), containsInAnyOrder( 100 assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
101 newBehaviorReferenceByMethod(source, callerClass.getName(), "e", "()V") 101 newBehaviorReferenceByMethod(source, callerClass.getName(), "e", "()V")
102 )); 102 ));
103 } 103 }
@@ -105,14 +105,14 @@ public class TestJarIndexConstructorReferences {
105 @Test 105 @Test
106 public void subIntIntInt() { 106 public void subIntIntInt() {
107 MethodEntry source = newMethod(subClass, "<init>", "(III)V"); 107 MethodEntry source = newMethod(subClass, "<init>", "(III)V");
108 assertThat(index.getMethodReferences(source), is(empty())); 108 assertThat(index.getMethodsReferencing(source), is(empty()));
109 } 109 }
110 110
111 @Test 111 @Test
112 @SuppressWarnings("unchecked") 112 @SuppressWarnings("unchecked")
113 public void subsubInt() { 113 public void subsubInt() {
114 MethodEntry source = newMethod(subsubClass, "<init>", "(I)V"); 114 MethodEntry source = newMethod(subsubClass, "<init>", "(I)V");
115 assertThat(index.getMethodReferences(source), containsInAnyOrder( 115 assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
116 newBehaviorReferenceByMethod(source, callerClass.getName(), "f", "()V") 116 newBehaviorReferenceByMethod(source, callerClass.getName(), "f", "()V")
117 )); 117 ));
118 } 118 }
@@ -121,7 +121,7 @@ public class TestJarIndexConstructorReferences {
121 @SuppressWarnings("unchecked") 121 @SuppressWarnings("unchecked")
122 public void defaultConstructable() { 122 public void defaultConstructable() {
123 MethodEntry source = newMethod(defaultClass, "<init>", "()V"); 123 MethodEntry source = newMethod(defaultClass, "<init>", "()V");
124 assertThat(index.getMethodReferences(source), containsInAnyOrder( 124 assertThat(index.getMethodsReferencing(source), containsInAnyOrder(
125 newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V") 125 newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V")
126 )); 126 ));
127 } 127 }
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java b/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 5bef4e57..23df1a99 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -152,7 +152,7 @@ public class TestJarIndexInheritanceTree {
152 152
153 // baseClass constructor 153 // baseClass constructor
154 source = newMethod(baseClass, "<init>", "(Ljava/lang/String;)V"); 154 source = newMethod(baseClass, "<init>", "(Ljava/lang/String;)V");
155 references = index.getMethodReferences(source); 155 references = index.getMethodsReferencing(source);
156 assertThat(references, containsInAnyOrder( 156 assertThat(references, containsInAnyOrder(
157 newBehaviorReferenceByMethod(source, subClassA.getName(), "<init>", "(Ljava/lang/String;)V"), 157 newBehaviorReferenceByMethod(source, subClassA.getName(), "<init>", "(Ljava/lang/String;)V"),
158 newBehaviorReferenceByMethod(source, subClassB.getName(), "<init>", "()V") 158 newBehaviorReferenceByMethod(source, subClassB.getName(), "<init>", "()V")
@@ -160,14 +160,14 @@ public class TestJarIndexInheritanceTree {
160 160
161 // subClassA constructor 161 // subClassA constructor
162 source = newMethod(subClassA, "<init>", "(Ljava/lang/String;)V"); 162 source = newMethod(subClassA, "<init>", "(Ljava/lang/String;)V");
163 references = index.getMethodReferences(source); 163 references = index.getMethodsReferencing(source);
164 assertThat(references, containsInAnyOrder( 164 assertThat(references, containsInAnyOrder(
165 newBehaviorReferenceByMethod(source, subClassAA.getName(), "<init>", "()V") 165 newBehaviorReferenceByMethod(source, subClassAA.getName(), "<init>", "()V")
166 )); 166 ));
167 167
168 // baseClass.getName() 168 // baseClass.getName()
169 source = newMethod(baseClass, "a", "()Ljava/lang/String;"); 169 source = newMethod(baseClass, "a", "()Ljava/lang/String;");
170 references = index.getMethodReferences(source); 170 references = index.getMethodsReferencing(source);
171 assertThat(references, containsInAnyOrder( 171 assertThat(references, containsInAnyOrder(
172 newBehaviorReferenceByMethod(source, subClassAA.getName(), "a", "()Ljava/lang/String;"), 172 newBehaviorReferenceByMethod(source, subClassAA.getName(), "a", "()Ljava/lang/String;"),
173 newBehaviorReferenceByMethod(source, subClassB.getName(), "a", "()V") 173 newBehaviorReferenceByMethod(source, subClassB.getName(), "a", "()V")
@@ -175,7 +175,7 @@ public class TestJarIndexInheritanceTree {
175 175
176 // subclassAA.getName() 176 // subclassAA.getName()
177 source = newMethod(subClassAA, "a", "()Ljava/lang/String;"); 177 source = newMethod(subClassAA, "a", "()Ljava/lang/String;");
178 references = index.getMethodReferences(source); 178 references = index.getMethodsReferencing(source);
179 assertThat(references, containsInAnyOrder( 179 assertThat(references, containsInAnyOrder(
180 newBehaviorReferenceByMethod(source, subClassAA.getName(), "a", "()V") 180 newBehaviorReferenceByMethod(source, subClassAA.getName(), "a", "()V")
181 )); 181 ));
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
index b1c128c2..b4529ddc 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -110,7 +110,7 @@ public class TestJarIndexLoneClass {
110 110
111 @Test 111 @Test
112 public void behaviorReferences() { 112 public void behaviorReferences() {
113 assertThat(index.getMethodReferences(newMethod("a", "a", "()Ljava/lang/String;")), is(empty())); 113 assertThat(index.getMethodsReferencing(newMethod("a", "a", "()Ljava/lang/String;")), is(empty()));
114 } 114 }
115 115
116 @Test 116 @Test