Ruby: Add more call graph tests for private methods

Author: hvitved

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

@@ -187,3 +187,9 @@ private.rb:
 #-----| super -> Object
 
 #   42| F
+
+#   62| PrivateOverride1
+#-----| super -> Object
+
+#   76| PrivateOverride2
+#-----| super -> PrivateOverride1

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

@@ -186,6 +186,16 @@ getTarget
 | private.rb:43:3:44:5 | call to private | calls.rb:109:5:109:20 | private |
 | private.rb:51:3:51:19 | call to private | calls.rb:109:5:109:20 | private |
 | private.rb:53:3:53:9 | call to private | calls.rb:109:5:109:20 | private |
+| private.rb:63:3:65:5 | call to private | calls.rb:109:5:109:20 | private |
+| private.rb:64:7:64:32 | call to puts | calls.rb:102:5:102:30 | puts |
+| private.rb:67:3:69:5 | call to private | calls.rb:109:5:109:20 | private |
+| private.rb:68:7:68:32 | call to puts | calls.rb:102:5:102:30 | puts |
+| private.rb:77:3:81:5 | call to private | calls.rb:109:5:109:20 | private |
+| private.rb:78:7:78:32 | call to puts | calls.rb:102:5:102:30 | puts |
+| private.rb:80:7:80:26 | call to new | calls.rb:114:5:114:16 | new |
+| private.rb:84:1:84:20 | call to new | calls.rb:114:5:114:16 | new |
+| private.rb:84:1:84:28 | call to call_m1 | private.rb:71:3:73:5 | call_m1 |
+| private.rb:85:1:85:20 | call to new | calls.rb:114:5:114:16 | new |
 unresolvedCall
 | calls.rb:26:9:26:18 | call to instance_m |
 | calls.rb:29:5:29:14 | call to instance_m |
@@ -230,6 +240,10 @@ unresolvedCall
 | private.rb:35:1:35:14 | call to private2 |
 | private.rb:36:1:36:14 | call to private3 |
 | private.rb:37:1:37:14 | call to private4 |
+| private.rb:72:7:72:8 | call to m1 |
+| private.rb:79:7:79:8 | call to m2 |
+| private.rb:80:7:80:29 | call to m1 |
+| private.rb:85:1:85:23 | call to m1 |
 privateMethod
 | calls.rb:1:1:3:3 | foo |
 | calls.rb:39:1:41:3 | call_instance_m |
@@ -253,3 +267,6 @@ privateMethod
 | private.rb:49:3:50:5 | private2 |
 | private.rb:55:3:56:5 | private3 |
 | private.rb:58:3:59:5 | private4 |
+| private.rb:63:11:65:5 | m1 |
+| private.rb:67:11:69:5 | m2 |
+| private.rb:77:11:81:5 | m1 |

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

@@ -54,6 +54,7 @@ getMethod
 | private.rb:42:1:60:3 | F | private3 | private.rb:55:3:56:5 | private3 |
 | private.rb:42:1:60:3 | F | private4 | private.rb:58:3:59:5 | private4 |
 | private.rb:42:1:60:3 | F | public | private.rb:46:3:47:5 | public |
+| private.rb:62:1:74:3 | PrivateOverride1 | call_m1 | private.rb:71:3:73:5 | call_m1 |
 lookupMethod
 | calls.rb:21:1:34:3 | M | instance_m | calls.rb:22:5:24:7 | instance_m |
 | calls.rb:43:1:58:3 | C | add_singleton | calls.rb:364:1:368:3 | add_singleton |
@@ -416,6 +417,16 @@ lookupMethod
 | private.rb:42:1:60:3 | F | private3 | private.rb:55:3:56:5 | private3 |
 | private.rb:42:1:60:3 | F | private4 | private.rb:58:3:59:5 | private4 |
 | private.rb:42:1:60:3 | F | public | private.rb:46:3:47:5 | public |
+| private.rb:62:1:74:3 | PrivateOverride1 | call_m1 | private.rb:71:3:73:5 | call_m1 |
+| private.rb:62:1:74:3 | PrivateOverride1 | new | calls.rb:114:5:114:16 | new |
+| private.rb:62:1:74:3 | PrivateOverride1 | private_on_main | private.rb:31:1:32:3 | private_on_main |
+| private.rb:62:1:74:3 | PrivateOverride1 | puts | calls.rb:102:5:102:30 | puts |
+| private.rb:62:1:74:3 | PrivateOverride1 | to_s | calls.rb:169:5:170:7 | to_s |
+| private.rb:76:1:82:3 | PrivateOverride2 | call_m1 | private.rb:71:3:73:5 | call_m1 |
+| private.rb:76:1:82:3 | PrivateOverride2 | new | calls.rb:114:5:114:16 | new |
+| private.rb:76:1:82:3 | PrivateOverride2 | private_on_main | private.rb:31:1:32:3 | private_on_main |
+| private.rb:76:1:82:3 | PrivateOverride2 | puts | calls.rb:102:5:102:30 | puts |
+| private.rb:76:1:82:3 | PrivateOverride2 | to_s | calls.rb:169:5:170:7 | to_s |
 enclosingMethod
 | calls.rb:2:5:2:14 | call to puts | calls.rb:1:1:3:3 | foo |
 | calls.rb:2:5:2:14 | self | calls.rb:1:1:3:3 | foo |
@@ -703,3 +714,22 @@ enclosingMethod
 | hello.rb:20:30:20:34 | self | hello.rb:19:5:21:7 | message |
 | hello.rb:20:38:20:40 | "!" | hello.rb:19:5:21:7 | message |
 | hello.rb:20:39:20:39 | ! | hello.rb:19:5:21:7 | message |
+| private.rb:64:7:64:32 | call to puts | private.rb:63:11:65:5 | m1 |
+| private.rb:64:7:64:32 | self | private.rb:63:11:65:5 | m1 |
+| private.rb:64:12:64:32 | "PrivateOverride1#m1" | private.rb:63:11:65:5 | m1 |
+| private.rb:64:13:64:31 | PrivateOverride1#m1 | private.rb:63:11:65:5 | m1 |
+| private.rb:68:7:68:32 | call to puts | private.rb:67:11:69:5 | m2 |
+| private.rb:68:7:68:32 | self | private.rb:67:11:69:5 | m2 |
+| private.rb:68:12:68:32 | "PrivateOverride1#m2" | private.rb:67:11:69:5 | m2 |
+| private.rb:68:13:68:31 | PrivateOverride1#m2 | private.rb:67:11:69:5 | m2 |
+| private.rb:72:7:72:8 | call to m1 | private.rb:71:3:73:5 | call_m1 |
+| private.rb:72:7:72:8 | self | private.rb:71:3:73:5 | call_m1 |
+| private.rb:78:7:78:32 | call to puts | private.rb:77:11:81:5 | m1 |
+| private.rb:78:7:78:32 | self | private.rb:77:11:81:5 | m1 |
+| private.rb:78:12:78:32 | "PrivateOverride2#m1" | private.rb:77:11:81:5 | m1 |
+| private.rb:78:13:78:31 | PrivateOverride2#m1 | private.rb:77:11:81:5 | m1 |
+| private.rb:79:7:79:8 | call to m2 | private.rb:77:11:81:5 | m1 |
+| private.rb:79:7:79:8 | self | private.rb:77:11:81:5 | m1 |
+| private.rb:80:7:80:22 | PrivateOverride1 | private.rb:77:11:81:5 | m1 |
+| private.rb:80:7:80:26 | call to new | private.rb:77:11:81:5 | m1 |
+| private.rb:80:7:80:29 | call to m1 | private.rb:77:11:81:5 | m1 |

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

@@ -67,6 +67,8 @@ getModule
 | modules_rec.rb:4:1:5:3 | A::B |
 | private.rb:1:1:29:3 | E |
 | private.rb:42:1:60:3 | F |
+| private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:76:1:82:3 | PrivateOverride2 |
 getADeclaration
 | calls.rb:21:1:34:3 | M | calls.rb:21:1:34:3 | M |
 | calls.rb:43:1:58:3 | C | calls.rb:43:1:58:3 | C |
@@ -80,7 +82,7 @@ getADeclaration
 | calls.rb:112:1:115:3 | Object | hello.rb:1:1:22:3 | hello.rb |
 | calls.rb:112:1:115:3 | Object | modules.rb:1:1:129:4 | modules.rb |
 | calls.rb:112:1:115:3 | Object | modules_rec.rb:1:1:11:26 | modules_rec.rb |
-| calls.rb:112:1:115:3 | Object | private.rb:1:1:60:3 | private.rb |
+| calls.rb:112:1:115:3 | Object | private.rb:1:1:85:40 | private.rb |
 | calls.rb:117:1:120:3 | Hash | calls.rb:117:1:120:3 | Hash |
 | calls.rb:122:1:135:3 | Array | calls.rb:122:1:135:3 | Array |
 | calls.rb:162:1:166:3 | S | calls.rb:162:1:166:3 | S |
@@ -134,6 +136,8 @@ getADeclaration
 | modules_rec.rb:4:1:5:3 | A::B | modules_rec.rb:4:1:5:3 | B |
 | private.rb:1:1:29:3 | E | private.rb:1:1:29:3 | E |
 | private.rb:42:1:60:3 | F | private.rb:42:1:60:3 | F |
+| private.rb:62:1:74:3 | PrivateOverride1 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:76:1:82:3 | PrivateOverride2 | private.rb:76:1:82:3 | PrivateOverride2 |
 getSuperClass
 | calls.rb:43:1:58:3 | C | calls.rb:112:1:115:3 | Object |
 | calls.rb:65:1:69:3 | D | calls.rb:43:1:58:3 | C |
@@ -176,6 +180,8 @@ getSuperClass
 | modules_rec.rb:1:1:2:3 | B::A | calls.rb:112:1:115:3 | Object |
 | modules_rec.rb:4:1:5:3 | A::B | calls.rb:112:1:115:3 | Object |
 | private.rb:1:1:29:3 | E | calls.rb:112:1:115:3 | Object |
+| private.rb:62:1:74:3 | PrivateOverride1 | calls.rb:112:1:115:3 | Object |
+| private.rb:76:1:82:3 | PrivateOverride2 | private.rb:62:1:74:3 | PrivateOverride1 |
 getAPrependedModule
 | calls.rb:112:1:115:3 | Object | calls.rb:168:1:171:3 | A |
 | calls.rb:168:1:171:3 | A | modules_rec.rb:4:1:5:3 | A::B |
@@ -268,6 +274,10 @@ resolveConstantReadAccess
 | private.rb:36:1:36:1 | E | E |
 | private.rb:37:1:37:1 | E | E |
 | private.rb:38:1:38:1 | E | E |
+| private.rb:76:26:76:41 | PrivateOverride1 | PrivateOverride1 |
+| private.rb:80:7:80:22 | PrivateOverride1 | PrivateOverride1 |
+| private.rb:84:1:84:16 | PrivateOverride2 | PrivateOverride2 |
+| private.rb:85:1:85:16 | PrivateOverride2 | PrivateOverride2 |
 resolveConstantWriteAccess
 | calls.rb:21:1:34:3 | M | M |
 | calls.rb:43:1:58:3 | C | C |
@@ -340,6 +350,8 @@ resolveConstantWriteAccess
 | modules_rec.rb:7:1:9:3 | A | A |
 | private.rb:1:1:29:3 | E | E |
 | private.rb:42:1:60:3 | F | F |
+| private.rb:62:1:74:3 | PrivateOverride1 | PrivateOverride1 |
+| private.rb:76:1:82:3 | PrivateOverride2 | PrivateOverride2 |
 enclosingModule
 | calls.rb:1:1:3:3 | foo | calls.rb:1:1:412:35 | calls.rb |
 | calls.rb:2:5:2:14 | call to puts | calls.rb:1:1:412:35 | calls.rb |
@@ -1153,7 +1165,7 @@ enclosingModule
 | modules_rec.rb:11:1:11:9 | call to prepend | modules_rec.rb:1:1:11:26 | modules_rec.rb |
 | modules_rec.rb:11:1:11:9 | self | modules_rec.rb:1:1:11:26 | modules_rec.rb |
 | modules_rec.rb:11:9:11:9 | A | modules_rec.rb:1:1:11:26 | modules_rec.rb |
-| private.rb:1:1:29:3 | E | private.rb:1:1:60:3 | private.rb |
+| private.rb:1:1:29:3 | E | private.rb:1:1:85:40 | private.rb |
 | private.rb:2:3:3:5 | call to private | private.rb:1:1:29:3 | E |
 | private.rb:2:3:3:5 | self | private.rb:1:1:29:3 | E |
 | private.rb:2:11:3:5 | private1 | private.rb:1:1:29:3 | E |
@@ -1179,25 +1191,25 @@ enclosingModule
 | private.rb:28:3:28:32 | self | private.rb:1:1:29:3 | E |
 | private.rb:28:24:28:32 | :private6 | private.rb:1:1:29:3 | E |
 | private.rb:28:24:28:32 | private6 | private.rb:1:1:29:3 | E |
-| private.rb:31:1:32:3 | private_on_main | private.rb:1:1:60:3 | private.rb |
-| private.rb:34:1:34:1 | E | private.rb:1:1:60:3 | private.rb |
-| private.rb:34:1:34:5 | call to new | private.rb:1:1:60:3 | private.rb |
-| private.rb:34:1:34:14 | call to private1 | private.rb:1:1:60:3 | private.rb |
-| private.rb:35:1:35:1 | E | private.rb:1:1:60:3 | private.rb |
-| private.rb:35:1:35:5 | call to new | private.rb:1:1:60:3 | private.rb |
-| private.rb:35:1:35:14 | call to private2 | private.rb:1:1:60:3 | private.rb |
-| private.rb:36:1:36:1 | E | private.rb:1:1:60:3 | private.rb |
-| private.rb:36:1:36:5 | call to new | private.rb:1:1:60:3 | private.rb |
-| private.rb:36:1:36:14 | call to private3 | private.rb:1:1:60:3 | private.rb |
-| private.rb:37:1:37:1 | E | private.rb:1:1:60:3 | private.rb |
-| private.rb:37:1:37:5 | call to new | private.rb:1:1:60:3 | private.rb |
-| private.rb:37:1:37:14 | call to private4 | private.rb:1:1:60:3 | private.rb |
-| private.rb:38:1:38:1 | E | private.rb:1:1:60:3 | private.rb |
-| private.rb:38:1:38:5 | call to new | private.rb:1:1:60:3 | private.rb |
-| private.rb:38:1:38:12 | call to public | private.rb:1:1:60:3 | private.rb |
-| private.rb:40:1:40:15 | call to private_on_main | private.rb:1:1:60:3 | private.rb |
-| private.rb:40:1:40:15 | self | private.rb:1:1:60:3 | private.rb |
-| private.rb:42:1:60:3 | F | private.rb:1:1:60:3 | private.rb |
+| private.rb:31:1:32:3 | private_on_main | private.rb:1:1:85:40 | private.rb |
+| private.rb:34:1:34:1 | E | private.rb:1:1:85:40 | private.rb |
+| private.rb:34:1:34:5 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:34:1:34:14 | call to private1 | private.rb:1:1:85:40 | private.rb |
+| private.rb:35:1:35:1 | E | private.rb:1:1:85:40 | private.rb |
+| private.rb:35:1:35:5 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:35:1:35:14 | call to private2 | private.rb:1:1:85:40 | private.rb |
+| private.rb:36:1:36:1 | E | private.rb:1:1:85:40 | private.rb |
+| private.rb:36:1:36:5 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:36:1:36:14 | call to private3 | private.rb:1:1:85:40 | private.rb |
+| private.rb:37:1:37:1 | E | private.rb:1:1:85:40 | private.rb |
+| private.rb:37:1:37:5 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:37:1:37:14 | call to private4 | private.rb:1:1:85:40 | private.rb |
+| private.rb:38:1:38:1 | E | private.rb:1:1:85:40 | private.rb |
+| private.rb:38:1:38:5 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:38:1:38:12 | call to public | private.rb:1:1:85:40 | private.rb |
+| private.rb:40:1:40:15 | call to private_on_main | private.rb:1:1:85:40 | private.rb |
+| private.rb:40:1:40:15 | self | private.rb:1:1:85:40 | private.rb |
+| private.rb:42:1:60:3 | F | private.rb:1:1:85:40 | private.rb |
 | private.rb:43:3:44:5 | call to private | private.rb:42:1:60:3 | F |
 | private.rb:43:3:44:5 | self | private.rb:42:1:60:3 | F |
 | private.rb:43:11:44:5 | private1 | private.rb:42:1:60:3 | F |
@@ -1211,3 +1223,41 @@ enclosingModule
 | private.rb:53:3:53:9 | self | private.rb:42:1:60:3 | F |
 | private.rb:55:3:56:5 | private3 | private.rb:42:1:60:3 | F |
 | private.rb:58:3:59:5 | private4 | private.rb:42:1:60:3 | F |
+| private.rb:62:1:74:3 | PrivateOverride1 | private.rb:1:1:85:40 | private.rb |
+| private.rb:63:3:65:5 | call to private | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:63:3:65:5 | self | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:63:11:65:5 | m1 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:64:7:64:32 | call to puts | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:64:7:64:32 | self | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:64:12:64:32 | "PrivateOverride1#m1" | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:64:13:64:31 | PrivateOverride1#m1 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:67:3:69:5 | call to private | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:67:3:69:5 | self | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:67:11:69:5 | m2 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:68:7:68:32 | call to puts | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:68:7:68:32 | self | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:68:12:68:32 | "PrivateOverride1#m2" | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:68:13:68:31 | PrivateOverride1#m2 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:71:3:73:5 | call_m1 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:72:7:72:8 | call to m1 | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:72:7:72:8 | self | private.rb:62:1:74:3 | PrivateOverride1 |
+| private.rb:76:1:82:3 | PrivateOverride2 | private.rb:1:1:85:40 | private.rb |
+| private.rb:76:26:76:41 | PrivateOverride1 | private.rb:1:1:85:40 | private.rb |
+| private.rb:77:3:81:5 | call to private | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:77:3:81:5 | self | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:77:11:81:5 | m1 | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:78:7:78:32 | call to puts | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:78:7:78:32 | self | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:78:12:78:32 | "PrivateOverride2#m1" | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:78:13:78:31 | PrivateOverride2#m1 | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:79:7:79:8 | call to m2 | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:79:7:79:8 | self | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:80:7:80:22 | PrivateOverride1 | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:80:7:80:26 | call to new | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:80:7:80:29 | call to m1 | private.rb:76:1:82:3 | PrivateOverride2 |
+| private.rb:84:1:84:16 | PrivateOverride2 | private.rb:1:1:85:40 | private.rb |
+| private.rb:84:1:84:20 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:84:1:84:28 | call to call_m1 | private.rb:1:1:85:40 | private.rb |
+| private.rb:85:1:85:16 | PrivateOverride2 | private.rb:1:1:85:40 | private.rb |
+| private.rb:85:1:85:20 | call to new | private.rb:1:1:85:40 | private.rb |
+| private.rb:85:1:85:23 | call to m1 | private.rb:1:1:85:40 | private.rb |

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

@@ -57,4 +57,29 @@ def private3
 
   def private4
   end
-end
+end
+
+class PrivateOverride1
+  private def m1
+      puts "PrivateOverride1#m1"
+  end
+
+  private def m2
+      puts "PrivateOverride1#m2"
+  end
+
+  def call_m1
+      m1
+  end
+end
+
+class PrivateOverride2 < PrivateOverride1
+  private def m1
+      puts "PrivateOverride2#m1"
+      m2
+      PrivateOverride1.new.m1 # NoMethodError
+  end
+end
+
+PrivateOverride2.new.call_m1
+PrivateOverride2.new.m1 # NoMethodError

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

@@ -179,3 +179,9 @@ private.rb:
 #-----|  -> Object
 
 #   42| F
+
+#   62| PrivateOverride1
+#-----|  -> Object
+
+#   76| PrivateOverride2
+#-----|  -> PrivateOverride1