Ruby: Add call graph tests for protected methods

Author: hvitved

ruby/ql/test/library-tests/modules/ancestors.expected

@@ -97,6 +97,9 @@ calls.rb:
 
 #  477| ExtendSingletonMethod
 
+#  487| ProtectedMethods
+#-----| super -> Object
+
 hello.rb:
 #    1| EnglishWords
 

ruby/ql/test/library-tests/modules/callgraph.expected

@@ -172,11 +172,25 @@ getTarget
 | calls.rb:447:1:447:30 | call to new | calls.rb:114:5:114:16 | new |
 | calls.rb:448:1:448:30 | call to new | calls.rb:114:5:114:16 | new |
 | calls.rb:449:1:449:30 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:451:27:469:3 | call to new | calls.rb:114:5:114:16 | new |
 | calls.rb:454:13:454:22 | call to puts | calls.rb:102:5:102:30 | puts |
 | calls.rb:458:5:462:7 | call to new | calls.rb:114:5:114:16 | new |
 | calls.rb:458:5:462:11 | call to new | calls.rb:114:5:114:16 | new |
 | calls.rb:460:13:460:22 | call to puts | calls.rb:102:5:102:30 | puts |
 | calls.rb:466:13:466:27 | call to puts | calls.rb:102:5:102:30 | puts |
+| calls.rb:471:1:471:27 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:472:1:472:27 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:473:1:473:27 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:474:1:474:27 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:475:1:475:27 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:489:9:489:35 | call to puts | calls.rb:102:5:102:30 | puts |
+| calls.rb:493:9:493:11 | call to foo | calls.rb:488:15:490:7 | foo |
+| calls.rb:494:9:494:28 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:494:9:494:32 | call to foo | calls.rb:488:15:490:7 | foo |
+| calls.rb:498:1:498:20 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:498:1:498:24 | call to foo | calls.rb:488:15:490:7 | foo |
+| calls.rb:499:1:499:20 | call to new | calls.rb:114:5:114:16 | new |
+| calls.rb:499:1:499:24 | call to bar | calls.rb:492:5:495:7 | bar |
 | hello.rb:12:5:12:24 | call to include | calls.rb:107:5:107:20 | include |
 | hello.rb:14:16:14:20 | call to hello | hello.rb:2:5:4:7 | hello |
 | hello.rb:20:16:20:20 | call to super | hello.rb:13:5:15:7 | message |
@@ -265,27 +279,21 @@ unresolvedCall
 | calls.rb:447:1:447:33 | call to m3 |
 | calls.rb:448:1:448:33 | call to m4 |
 | calls.rb:449:1:449:33 | call to m5 |
-| calls.rb:450:1:450:4 | call to exit |
-| calls.rb:451:27:469:3 | call to new |
 | calls.rb:452:5:452:11 | call to [] |
 | calls.rb:452:5:456:7 | call to each |
 | calls.rb:458:5:462:15 | call to bar |
 | calls.rb:464:5:464:11 | call to [] |
 | calls.rb:464:5:468:7 | call to each |
 | calls.rb:465:9:467:11 | call to define_method |
-| calls.rb:471:1:471:27 | call to new |
 | calls.rb:471:1:471:31 | call to foo |
-| calls.rb:472:1:472:27 | call to new |
 | calls.rb:472:1:472:31 | call to bar |
-| calls.rb:473:1:473:27 | call to new |
 | calls.rb:473:1:473:33 | call to baz_0 |
-| calls.rb:474:1:474:27 | call to new |
 | calls.rb:474:1:474:33 | call to baz_1 |
-| calls.rb:475:1:475:27 | call to new |
 | calls.rb:475:1:475:33 | call to baz_2 |
 | calls.rb:479:9:479:46 | call to puts |
 | calls.rb:482:5:482:15 | call to extend |
 | calls.rb:485:1:485:31 | call to singleton |
+| calls.rb:488:5:490:7 | call to protected |
 | hello.rb:20:16:20:26 | ... + ... |
 | hello.rb:20:16:20:34 | ... + ... |
 | hello.rb:20:16:20:40 | ... + ... |
@@ -385,6 +393,7 @@ publicMethod
 | calls.rb:427:13:429:15 | m4 |
 | calls.rb:437:13:439:15 | m5 |
 | calls.rb:478:5:480:7 | singleton |
+| calls.rb:492:5:495:7 | bar |
 | hello.rb:2:5:4:7 | hello |
 | hello.rb:5:5:7:7 | world |
 | hello.rb:13:5:15:7 | message |
@@ -401,5 +410,6 @@ publicMethod
 | private.rb:66:3:67:5 | public |
 | private.rb:91:3:93:5 | call_m1 |
 protectedMethod
+| calls.rb:488:15:490:7 | foo |
 | private.rb:32:3:33:5 | protected1 |
 | private.rb:35:3:36:5 | protected2 |

ruby/ql/test/library-tests/modules/calls.rb

@@ -447,7 +447,7 @@ def m5
 ConditionalInstanceMethods.new.m3 # currently unable to resolve
 ConditionalInstanceMethods.new.m4 # currently unable to resolve
 ConditionalInstanceMethods.new.m5 # NoMethodError
-exit
+
 EsotericInstanceMethods = Class.new do
     [0,1,2].each do
         def foo
@@ -483,3 +483,17 @@ def singleton
 end
 
 ExtendSingletonMethod.singleton # currently unable to resolve
+
+class ProtectedMethods
+    protected def foo
+        puts "ProtectedMethods#foo"
+    end
+
+    def bar
+        foo
+        ProtectedMethods.new.foo
+    end
+end
+
+ProtectedMethods.new.foo # NoMethodError
+ProtectedMethods.new.bar

ruby/ql/test/library-tests/modules/methods.expected

@@ -39,6 +39,8 @@ getMethod
 | calls.rb:414:1:442:3 | ConditionalInstanceMethods | m1 | calls.rb:416:9:418:11 | m1 |
 | calls.rb:414:1:442:3 | ConditionalInstanceMethods | m2 | calls.rb:421:5:433:7 | m2 |
 | calls.rb:477:1:483:3 | ExtendSingletonMethod | singleton | calls.rb:478:5:480:7 | singleton |
+| calls.rb:487:1:496:3 | ProtectedMethods | bar | calls.rb:492:5:495:7 | bar |
+| calls.rb:487:1:496:3 | ProtectedMethods | foo | calls.rb:488:15:490:7 | foo |
 | hello.rb:1:1:8:3 | EnglishWords | hello | hello.rb:2:5:4:7 | hello |
 | hello.rb:1:1:8:3 | EnglishWords | world | hello.rb:5:5:7:7 | world |
 | hello.rb:11:1:16:3 | Greeting | message | hello.rb:13:5:15:7 | message |
@@ -353,6 +355,20 @@ lookupMethod
 | calls.rb:414:1:442:3 | ConditionalInstanceMethods | puts | calls.rb:102:5:102:30 | puts |
 | calls.rb:414:1:442:3 | ConditionalInstanceMethods | to_s | calls.rb:169:5:170:7 | to_s |
 | calls.rb:477:1:483:3 | ExtendSingletonMethod | singleton | calls.rb:478:5:480:7 | singleton |
+| calls.rb:487:1:496:3 | ProtectedMethods | add_singleton | calls.rb:364:1:368:3 | add_singleton |
+| calls.rb:487:1:496:3 | ProtectedMethods | bar | calls.rb:492:5:495:7 | bar |
+| calls.rb:487:1:496:3 | ProtectedMethods | call_block | calls.rb:81:1:83:3 | call_block |
+| calls.rb:487:1:496:3 | ProtectedMethods | call_instance_m | calls.rb:39:1:41:3 | call_instance_m |
+| calls.rb:487:1:496:3 | ProtectedMethods | create | calls.rb:275:1:283:3 | create |
+| calls.rb:487:1:496:3 | ProtectedMethods | foo | calls.rb:488:15:490:7 | foo |
+| calls.rb:487:1:496:3 | ProtectedMethods | funny | calls.rb:137:1:139:3 | funny |
+| calls.rb:487:1:496:3 | ProtectedMethods | indirect | calls.rb:155:1:157:3 | indirect |
+| calls.rb:487:1:496:3 | ProtectedMethods | new | calls.rb:114:5:114:16 | new |
+| calls.rb:487:1:496:3 | ProtectedMethods | optional_arg | calls.rb:76:1:79:3 | optional_arg |
+| calls.rb:487:1:496:3 | ProtectedMethods | pattern_dispatch | calls.rb:340:1:356:3 | pattern_dispatch |
+| calls.rb:487:1:496:3 | ProtectedMethods | private_on_main | calls.rb:182:1:183:3 | private_on_main |
+| calls.rb:487:1:496:3 | ProtectedMethods | puts | calls.rb:102:5:102:30 | puts |
+| calls.rb:487:1:496:3 | ProtectedMethods | to_s | calls.rb:169:5:170:7 | to_s |
 | file://:0:0:0:0 | Class | include | calls.rb:107:5:107:20 | include |
 | file://:0:0:0:0 | Class | module_eval | calls.rb:106:5:106:24 | module_eval |
 | file://:0:0:0:0 | Class | new | calls.rb:114:5:114:16 | new |
@@ -769,6 +785,15 @@ enclosingMethod
 | calls.rb:479:9:479:46 | self | calls.rb:478:5:480:7 | singleton |
 | calls.rb:479:14:479:46 | "ExtendSingletonMethod#singleton" | calls.rb:478:5:480:7 | singleton |
 | calls.rb:479:15:479:45 | ExtendSingletonMethod#singleton | calls.rb:478:5:480:7 | singleton |
+| calls.rb:489:9:489:35 | call to puts | calls.rb:488:15:490:7 | foo |
+| calls.rb:489:9:489:35 | self | calls.rb:488:15:490:7 | foo |
+| calls.rb:489:14:489:35 | "ProtectedMethods#foo" | calls.rb:488:15:490:7 | foo |
+| calls.rb:489:15:489:34 | ProtectedMethods#foo | calls.rb:488:15:490:7 | foo |
+| calls.rb:493:9:493:11 | call to foo | calls.rb:492:5:495:7 | bar |
+| calls.rb:493:9:493:11 | self | calls.rb:492:5:495:7 | bar |
+| calls.rb:494:9:494:24 | ProtectedMethods | calls.rb:492:5:495:7 | bar |
+| calls.rb:494:9:494:28 | call to new | calls.rb:492:5:495:7 | bar |
+| calls.rb:494:9:494:32 | call to foo | calls.rb:492:5:495:7 | bar |
 | hello.rb:3:9:3:22 | return | hello.rb:2:5:4:7 | hello |
 | hello.rb:3:16:3:22 | "hello" | hello.rb:2:5:4:7 | hello |
 | hello.rb:3:17:3:21 | hello | hello.rb:2:5:4:7 | hello |