Update test fixtures

At the same time, rename some classes in `private.rb` so they don't
interact with identically-named modules in `calls.rb`.

Author: hmac

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

@@ -49,12 +49,10 @@ calls.rb:
 
 #   15| M
 
-private.rb:
-#    1| C
+#   29| C
 #-----| super -> Object
 #-----| include -> M
 
-calls.rb:
 #   51| D
 #-----| super -> C
 
@@ -110,6 +108,13 @@ modules.rb:
 
 #  115| XX
 
+private.rb:
+#    1| E
+#-----| super -> Object
+
+#   42| F
+
+modules.rb:
 #    5| Foo::Bar
 
 #   19| Foo::ClassInFoo

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

@@ -1,5 +1,6 @@
 getMethod
 | calls.rb:15:1:24:3 | M | instance_m | calls.rb:16:5:16:23 | instance_m |
+| calls.rb:29:1:44:3 | C | baz | calls.rb:37:5:43:7 | baz |
 | calls.rb:51:1:55:3 | D | baz | calls.rb:52:5:54:7 | baz |
 | calls.rb:77:1:80:3 | Integer | abs | calls.rb:79:5:79:16 | abs |
 | calls.rb:77:1:80:3 | Integer | bit_length | calls.rb:78:5:78:23 | bit_length |
@@ -17,7 +18,7 @@ getMethod
 | calls.rb:97:1:100:3 | Object | new | calls.rb:99:5:99:16 | new |
 | calls.rb:97:1:100:3 | Object | optional_arg | calls.rb:62:1:65:3 | optional_arg |
 | calls.rb:97:1:100:3 | Object | private_on_main | calls.rb:164:1:165:3 | private_on_main |
-| calls.rb:97:1:100:3 | Object | private_on_main | private.rb:21:1:22:3 | private_on_main |
+| calls.rb:97:1:100:3 | Object | private_on_main | private.rb:31:1:32:3 | private_on_main |
 | calls.rb:102:1:104:3 | Hash | [] | calls.rb:103:5:103:15 | [] |
 | calls.rb:106:1:117:3 | Array | [] | calls.rb:107:3:107:13 | [] |
 | calls.rb:106:1:117:3 | Array | foreach | calls.rb:110:3:116:5 | foreach |
@@ -35,13 +36,27 @@ getMethod
 | modules.rb:5:3:14:5 | Foo::Bar | method_in_foo_bar | modules.rb:9:5:10:7 | method_in_foo_bar |
 | modules.rb:37:1:46:3 | Bar | method_a | modules.rb:38:3:39:5 | method_a |
 | modules.rb:37:1:46:3 | Bar | method_b | modules.rb:41:3:42:5 | method_b |
-| private.rb:1:1:19:3 | C | baz | calls.rb:37:5:43:7 | baz |
-| private.rb:1:1:19:3 | C | private2 | private.rb:8:3:9:5 | private2 |
-| private.rb:1:1:19:3 | C | private3 | private.rb:14:3:15:5 | private3 |
-| private.rb:1:1:19:3 | C | private4 | private.rb:17:3:18:5 | private4 |
-| private.rb:1:1:19:3 | C | public | private.rb:5:3:6:5 | public |
+| private.rb:1:1:29:3 | E | private2 | private.rb:8:3:9:5 | private2 |
+| private.rb:1:1:29:3 | E | private3 | private.rb:14:3:15:5 | private3 |
+| private.rb:1:1:29:3 | E | private4 | private.rb:17:3:18:5 | private4 |
+| private.rb:1:1:29:3 | E | public | private.rb:5:3:6:5 | public |
+| private.rb:42:1:60:3 | F | private2 | private.rb:49:3:50:5 | private2 |
+| 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 |
 lookupMethod
 | calls.rb:15:1:24:3 | M | instance_m | calls.rb:16:5:16:23 | instance_m |
+| calls.rb:29:1:44:3 | C | baz | calls.rb:37:5:43:7 | baz |
+| calls.rb:29:1:44:3 | C | call_block | calls.rb:67:1:69:3 | call_block |
+| calls.rb:29:1:44:3 | C | foo | calls.rb:1:1:3:3 | foo |
+| calls.rb:29:1:44:3 | C | foo | calls.rb:71:1:75:3 | foo |
+| calls.rb:29:1:44:3 | C | funny | calls.rb:119:1:121:3 | funny |
+| calls.rb:29:1:44:3 | C | indirect | calls.rb:137:1:139:3 | indirect |
+| calls.rb:29:1:44:3 | C | instance_m | calls.rb:16:5:16:23 | instance_m |
+| calls.rb:29:1:44:3 | C | new | calls.rb:99:5:99:16 | new |
+| calls.rb:29:1:44:3 | C | optional_arg | calls.rb:62:1:65:3 | optional_arg |
+| calls.rb:29:1:44:3 | C | private_on_main | calls.rb:164:1:165:3 | private_on_main |
+| calls.rb:29:1:44:3 | C | puts | calls.rb:87:5:87:17 | puts |
 | calls.rb:51:1:55:3 | D | baz | calls.rb:52:5:54:7 | baz |
 | calls.rb:51:1:55:3 | D | call_block | calls.rb:67:1:69:3 | call_block |
 | calls.rb:51:1:55:3 | D | foo | calls.rb:1:1:3:3 | foo |
@@ -51,11 +66,7 @@ lookupMethod
 | calls.rb:51:1:55:3 | D | instance_m | calls.rb:16:5:16:23 | instance_m |
 | calls.rb:51:1:55:3 | D | new | calls.rb:99:5:99:16 | new |
 | calls.rb:51:1:55:3 | D | optional_arg | calls.rb:62:1:65:3 | optional_arg |
-| calls.rb:51:1:55:3 | D | private2 | private.rb:8:3:9:5 | private2 |
-| calls.rb:51:1:55:3 | D | private3 | private.rb:14:3:15:5 | private3 |
-| calls.rb:51:1:55:3 | D | private4 | private.rb:17:3:18:5 | private4 |
 | calls.rb:51:1:55:3 | D | private_on_main | calls.rb:164:1:165:3 | private_on_main |
-| calls.rb:51:1:55:3 | D | public | private.rb:5:3:6:5 | public |
 | calls.rb:51:1:55:3 | D | puts | calls.rb:87:5:87:17 | puts |
 | calls.rb:77:1:80:3 | Integer | abs | calls.rb:79:5:79:16 | abs |
 | calls.rb:77:1:80:3 | Integer | bit_length | calls.rb:78:5:78:23 | bit_length |
@@ -93,7 +104,7 @@ lookupMethod
 | calls.rb:97:1:100:3 | Object | new | calls.rb:99:5:99:16 | new |
 | calls.rb:97:1:100:3 | Object | optional_arg | calls.rb:62:1:65:3 | optional_arg |
 | calls.rb:97:1:100:3 | Object | private_on_main | calls.rb:164:1:165:3 | private_on_main |
-| calls.rb:97:1:100:3 | Object | private_on_main | private.rb:21:1:22:3 | private_on_main |
+| calls.rb:97:1:100:3 | Object | private_on_main | private.rb:31:1:32:3 | private_on_main |
 | calls.rb:97:1:100:3 | Object | puts | calls.rb:87:5:87:17 | puts |
 | calls.rb:102:1:104:3 | Hash | [] | calls.rb:103:5:103:15 | [] |
 | calls.rb:102:1:104:3 | Hash | call_block | calls.rb:67:1:69:3 | call_block |
@@ -205,19 +216,14 @@ lookupMethod
 | modules.rb:112:1:113:3 | YY | puts | calls.rb:87:5:87:17 | puts |
 | modules.rb:116:7:117:9 | XX::YY | new | calls.rb:99:5:99:16 | new |
 | modules.rb:116:7:117:9 | XX::YY | puts | calls.rb:87:5:87:17 | puts |
-| private.rb:1:1:19:3 | C | baz | calls.rb:37:5:43:7 | baz |
-| private.rb:1:1:19:3 | C | call_block | calls.rb:67:1:69:3 | call_block |
-| private.rb:1:1:19:3 | C | foo | calls.rb:1:1:3:3 | foo |
-| private.rb:1:1:19:3 | C | foo | calls.rb:71:1:75:3 | foo |
-| private.rb:1:1:19:3 | C | funny | calls.rb:119:1:121:3 | funny |
-| private.rb:1:1:19:3 | C | indirect | calls.rb:137:1:139:3 | indirect |
-| private.rb:1:1:19:3 | C | instance_m | calls.rb:16:5:16:23 | instance_m |
-| private.rb:1:1:19:3 | C | new | calls.rb:99:5:99:16 | new |
-| private.rb:1:1:19:3 | C | optional_arg | calls.rb:62:1:65:3 | optional_arg |
-| private.rb:1:1:19:3 | C | private2 | private.rb:8:3:9:5 | private2 |
-| private.rb:1:1:19:3 | C | private3 | private.rb:14:3:15:5 | private3 |
-| private.rb:1:1:19:3 | C | private4 | private.rb:17:3:18:5 | private4 |
-| private.rb:1:1:19:3 | C | private_on_main | calls.rb:164:1:165:3 | private_on_main |
-| private.rb:1:1:19:3 | C | private_on_main | private.rb:21:1:22:3 | private_on_main |
-| private.rb:1:1:19:3 | C | public | private.rb:5:3:6:5 | public |
-| private.rb:1:1:19:3 | C | puts | calls.rb:87:5:87:17 | puts |
+| private.rb:1:1:29:3 | E | new | calls.rb:99:5:99:16 | new |
+| private.rb:1:1:29:3 | E | private2 | private.rb:8:3:9:5 | private2 |
+| private.rb:1:1:29:3 | E | private3 | private.rb:14:3:15:5 | private3 |
+| private.rb:1:1:29:3 | E | private4 | private.rb:17:3:18:5 | private4 |
+| private.rb:1:1:29:3 | E | private_on_main | private.rb:31:1:32:3 | private_on_main |
+| private.rb:1:1:29:3 | E | public | private.rb:5:3:6:5 | public |
+| private.rb:1:1:29:3 | E | puts | calls.rb:87:5:87:17 | puts |
+| private.rb:42:1:60:3 | F | private2 | private.rb:49:3:50:5 | private2 |
+| 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 |

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

@@ -1,5 +1,6 @@
 getModule
 | calls.rb:15:1:24:3 | M |
+| calls.rb:29:1:44:3 | C |
 | calls.rb:51:1:55:3 | D |
 | calls.rb:77:1:80:3 | Integer |
 | calls.rb:82:1:84:3 | String |
@@ -55,9 +56,11 @@ getModule
 | modules.rb:115:1:118:3 | XX |
 | modules.rb:116:7:117:9 | XX::YY |
 | modules.rb:120:1:121:3 | Test::Foo1::Bar::Baz |
-| private.rb:1:1:19:3 | C |
+| private.rb:1:1:29:3 | E |
+| private.rb:42:1:60:3 | F |
 getADeclaration
 | calls.rb:15:1:24:3 | M | calls.rb:15:1:24:3 | M |
+| calls.rb:29:1:44:3 | C | calls.rb:29:1:44:3 | C |
 | calls.rb:51:1:55:3 | D | calls.rb:51:1:55:3 | D |
 | calls.rb:77:1:80:3 | Integer | calls.rb:77:1:80:3 | Integer |
 | calls.rb:82:1:84:3 | String | calls.rb:82:1:84:3 | String |
@@ -67,7 +70,7 @@ getADeclaration
 | calls.rb:97:1:100:3 | Object | calls.rb:97:1:100:3 | Object |
 | calls.rb:97:1:100:3 | Object | hello.rb:1:1:22:3 | hello.rb |
 | calls.rb:97:1:100:3 | Object | modules.rb:1:1:122:1 | modules.rb |
-| calls.rb:97:1:100:3 | Object | private.rb:1:1:30:15 | private.rb |
+| calls.rb:97:1:100:3 | Object | private.rb:1:1:60:3 | private.rb |
 | calls.rb:102:1:104:3 | Hash | calls.rb:102:1:104:3 | Hash |
 | calls.rb:106:1:117:3 | Array | calls.rb:106:1:117:3 | Array |
 | calls.rb:144:1:148:3 | S | calls.rb:144:1:148:3 | S |
@@ -109,10 +112,11 @@ getADeclaration
 | modules.rb:115:1:118:3 | XX | modules.rb:115:1:118:3 | XX |
 | modules.rb:116:7:117:9 | XX::YY | modules.rb:116:7:117:9 | YY |
 | modules.rb:120:1:121:3 | Test::Foo1::Bar::Baz | modules.rb:120:1:121:3 | Baz |
-| private.rb:1:1:19:3 | C | calls.rb:29:1:44:3 | C |
-| private.rb:1:1:19:3 | C | private.rb:1:1:19:3 | C |
+| 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 |
 getSuperClass
-| calls.rb:51:1:55:3 | D | private.rb:1:1:19:3 | C |
+| calls.rb:29:1:44:3 | C | calls.rb:97:1:100:3 | Object |
+| calls.rb:51:1:55:3 | D | calls.rb:29:1:44:3 | C |
 | calls.rb:77:1:80:3 | Integer | file://:0:0:0:0 | Numeric |
 | calls.rb:82:1:84:3 | String | calls.rb:97:1:100:3 | Object |
 | calls.rb:90:1:95:3 | Module | calls.rb:97:1:100:3 | Object |
@@ -141,12 +145,12 @@ getSuperClass
 | modules.rb:72:5:73:7 | Test::Foo2::Foo2::Bar | calls.rb:97:1:100:3 | Object |
 | modules.rb:112:1:113:3 | YY | calls.rb:97:1:100:3 | Object |
 | modules.rb:116:7:117:9 | XX::YY | modules.rb:112:1:113:3 | YY |
-| private.rb:1:1:19:3 | C | calls.rb:97:1:100:3 | Object |
+| private.rb:1:1:29:3 | E | calls.rb:97:1:100:3 | Object |
 getAPrependedModule
 | modules.rb:101:1:105:3 | PrependTest | modules.rb:63:1:81:3 | Test |
 getAnIncludedModule
+| calls.rb:29:1:44:3 | C | calls.rb:15:1:24:3 | M |
 | calls.rb:97:1:100:3 | Object | calls.rb:86:1:88:3 | Kernel |
 | hello.rb:11:1:16:3 | Greeting | hello.rb:1:1:8:3 | EnglishWords |
 | modules.rb:88:1:93:3 | IncludeTest | modules.rb:63:1:81:3 | Test |
 | modules.rb:95:1:99:3 | IncludeTest2 | modules.rb:63:1:81:3 | Test |
-| private.rb:1:1:19:3 | C | calls.rb:15:1:24:3 | M |

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

@@ -1,4 +1,4 @@
-class C
+class E
   private def private1
   end
 
@@ -31,15 +31,15 @@ def self.private6
 def private_on_main
 end
 
-C.new.private1
-C.new.private2
-C.new.private3
-C.new.private4
-C.new.public
+E.new.private1
+E.new.private2
+E.new.private3
+E.new.private4
+E.new.public
 
 private_on_main
 
-module D
+module F
   private def private1
   end
 

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

@@ -48,11 +48,9 @@ calls.rb:
 
 #   15| M
 
-private.rb:
-#    1| C
+#   29| C
 #-----|  -> Object
 
-calls.rb:
 #   51| D
 #-----|  -> C
 
@@ -104,6 +102,13 @@ modules.rb:
 
 #  115| XX
 
+private.rb:
+#    1| E
+#-----|  -> Object
+
+#   42| F
+
+modules.rb:
 #    5| Foo::Bar
 
 #   19| Foo::ClassInFoo