@@ -291,51 +291,70 @@ def test_find_method(apkinfo, test_input, expected):
291291 assert expect_method in result
292292
293293 def test_find_method_in_regular_class (self , apkinfo ):
294- result = apkinfo . find_method (
294+ expected = [
295295 "Ljava/lang/reflect/Field;" , "setAccessible" , "(Z)V"
296+ ]
297+ expect_method = MethodObject (
298+ expected [0 ],
299+ expected [1 ],
300+ expected [2 ],
301+ )
302+
303+ result = apkinfo .find_method (
304+ expected [0 ],
305+ expected [1 ],
306+ expected [2 ],
296307 )
297308
298- assert isinstance (result , MethodObject )
299- assert str (result .class_name ) == "Ljava/lang/reflect/Field;"
300- assert str (result .name ) == "setAccessible"
301- assert str (result .descriptor ) == "(Z)V"
309+ assert isinstance (result , list )
310+ assert len (result ) > 0
311+ assert expect_method in result
302312
303313 def test_find_method_in_inner_class (self , apkinfo ):
304- result = apkinfo . find_method (
314+ expected = [
305315 "Landroid/support/v4/accessibilityservice/Accessibility"
306316 + "ServiceInfoCompat$AccessibilityServiceInfoVersionImpl;" ,
307317 "getId" ,
308318 "(Landroid/accessibilityservice/AccessibilityServiceInfo;)"
309319 + "Ljava/lang/String;" ,
320+ ]
321+ expect_method = MethodObject (
322+ expected [0 ],
323+ expected [1 ],
324+ expected [2 ],
310325 )
311326
312- assert isinstance (result , MethodObject )
313- assert (
314- str (result .class_name )
315- == "Landroid/support/v4/accessibilityservice/Accessibility"
316- + "ServiceInfoCompat$AccessibilityServiceInfoVersionImpl;"
317- )
318- assert str (result .name ) == "getId"
319- assert (
320- str (result .descriptor )
321- == "(Landroid/accessibilityservice/AccessibilityServiceInfo;)"
322- + "Ljava/lang/String;"
327+ result = apkinfo .find_method (
328+ expected [0 ],
329+ expected [1 ],
330+ expected [2 ],
323331 )
324332
333+ assert isinstance (result , list )
334+ assert len (result ) > 0
335+ assert expect_method in result
336+
325337 def test_find_method_in_anonymous_class (self , apkinfo ):
326- result = apkinfo . find_method (
338+ expected = [
327339 "Landroid/support/v4/view/AccessibilityDelegateCompatIcs$1;" ,
328340 "sendAccessibilityEvent" ,
329341 "(Landroid/view/View; I)V" ,
342+ ]
343+ expect_method = MethodObject (
344+ expected [0 ],
345+ expected [1 ],
346+ expected [2 ],
330347 )
331348
332- assert isinstance ( result , MethodObject )
333- assert (
334- str ( result . class_name )
335- == "Landroid/support/v4/view/AccessibilityDelegateCompatIcs$1;"
349+ result = apkinfo . find_method (
350+ expected [ 0 ],
351+ expected [ 1 ],
352+ expected [ 2 ],
336353 )
337- assert str (result .name ) == "sendAccessibilityEvent"
338- assert str (result .descriptor ) == "(Landroid/view/View; I)V"
354+
355+ assert isinstance (result , list )
356+ assert len (result ) > 0
357+ assert expect_method in result
339358
340359 def test_upperfunc (self , apkinfo ):
341360 api = apkinfo .find_method (
0 commit comments