add mocking for asm MethodNode

PaperMC · Jul 27, 2023 · b079b1f · b079b1f
1 parent 0c8ec95
commit b079b1f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/io/papermc/codebook/lvt/LvtAssignmentSuggester.java b/src/main/java/io/papermc/codebook/lvt/LvtAssignmentSuggester.java
@@ -439,7 +439,7 @@ private static boolean isStringAllUppercase(final String input) {
         // I think it's best to only work with primitive types here, as other types should already have names
         // and this dramatically cuts down on the number of methods analyzed because we aren't filtering by
         // method name
-        if (!(method.computeDescriptor().getReturnType() instanceof PrimitiveType)) {
+        if (!(method.descriptor().getReturnType() instanceof PrimitiveType)) {
             return null;
         }
         final List<IntPredicate> codes = new ArrayList<>(OPCODES_IN_ORDER);

diff --git a/src/test/java/io/papermc/codebook/lvt/LvtAssignmentSuggesterTest.java b/src/test/java/io/papermc/codebook/lvt/LvtAssignmentSuggesterTest.java
@@ -47,7 +47,9 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.quality.Strictness;
 import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 @ExtendWith(MockitoExtension.class)
 class LvtAssignmentSuggesterTest {
@@ -81,19 +83,24 @@ void testSuggester(
 
         final AsmClassData owner = mock(LENIENT);
         final AsmMethodData method = mock(LENIENT);
+        final MethodNode methodNode = mock(LENIENT);
+        methodNode.instructions = new InsnList();
 
         when(owner.kind()).thenReturn(ClassKind.CLASS);
         when(owner.name()).thenReturn(methodOwner);
         when(method.name()).thenReturn(methodName);
 
         final MethodDescriptor desc = MethodDescriptor.parseDescriptor(methodDescriptor);
         when(method.descriptor()).thenReturn(desc);
+        when(method.computeDescriptor()).thenReturn(desc);
 
         // params() and returnType() methods will defer to the descriptor
         when(method.params()).thenCallRealMethod();
         when(method.param(anyInt())).thenCallRealMethod();
         when(method.returnType()).thenCallRealMethod();
 
+        when(method.getNode()).thenReturn(methodNode);
+
         if (methodOwner.equals(RANDOM_SOURCE_NAME)) {
             when(owner.doesExtendOrImplement(this.randomSourceClass)).thenReturn(true);
         } else {