Skip to content

Commit 5cdaae7

Browse files
hmachmac
committed
Update tests
1 parent 4df7fd2 commit 5cdaae7

File tree

4 files changed

+211
-195
lines changed

4 files changed

+211
-195
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ private.rb:
191191
# 1| E
192192
#-----| super -> Object
193193

194-
# 58| F
194+
# 62| F
195195

196-
# 78| PrivateOverride1
196+
# 82| PrivateOverride1
197197
#-----| super -> Object
198198

199-
# 92| PrivateOverride2
199+
# 96| PrivateOverride2
200200
#-----| super -> PrivateOverride1

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

Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ getMethod
2222
| calls.rb:112:1:115:3 | Object | optional_arg | calls.rb:76:1:79:3 | optional_arg |
2323
| calls.rb:112:1:115:3 | Object | pattern_dispatch | calls.rb:340:1:356:3 | pattern_dispatch |
2424
| calls.rb:112:1:115:3 | Object | private_on_main | calls.rb:182:1:183:3 | private_on_main |
25-
| calls.rb:112:1:115:3 | Object | private_on_main | private.rb:47:1:48:3 | private_on_main |
25+
| calls.rb:112:1:115:3 | Object | private_on_main | private.rb:51:1:52:3 | private_on_main |
2626
| calls.rb:117:1:120:3 | Hash | [] | calls.rb:119:5:119:31 | [] |
2727
| calls.rb:122:1:135:3 | Array | [] | calls.rb:124:3:124:29 | [] |
2828
| calls.rb:122:1:135:3 | Array | foreach | calls.rb:128:3:134:5 | foreach |
@@ -49,23 +49,24 @@ getMethod
4949
| modules.rb:5:3:14:5 | Foo::Bar | method_in_foo_bar | modules.rb:9:5:10:7 | method_in_foo_bar |
5050
| modules.rb:37:1:46:3 | Bar | method_a | modules.rb:38:3:39:5 | method_a |
5151
| modules.rb:37:1:46:3 | Bar | method_b | modules.rb:41:3:42:5 | method_b |
52-
| private.rb:1:1:45:3 | E | private1 | private.rb:2:11:3:5 | private1 |
53-
| private.rb:1:1:45:3 | E | private2 | private.rb:8:3:9:5 | private2 |
54-
| private.rb:1:1:45:3 | E | private3 | private.rb:14:3:15:5 | private3 |
55-
| private.rb:1:1:45:3 | E | private4 | private.rb:17:3:18:5 | private4 |
56-
| private.rb:1:1:45:3 | E | private7 | private.rb:43:3:44:5 | private7 |
57-
| private.rb:1:1:45:3 | E | protected1 | private.rb:32:3:33:5 | protected1 |
58-
| private.rb:1:1:45:3 | E | protected2 | private.rb:35:3:36:5 | protected2 |
59-
| private.rb:1:1:45:3 | E | public | private.rb:5:3:6:5 | public |
60-
| private.rb:58:1:76:3 | F | private1 | private.rb:59:11:60:5 | private1 |
61-
| private.rb:58:1:76:3 | F | private2 | private.rb:65:3:66:5 | private2 |
62-
| private.rb:58:1:76:3 | F | private3 | private.rb:71:3:72:5 | private3 |
63-
| private.rb:58:1:76:3 | F | private4 | private.rb:74:3:75:5 | private4 |
64-
| private.rb:58:1:76:3 | F | public | private.rb:62:3:63:5 | public |
65-
| private.rb:78:1:90:3 | PrivateOverride1 | call_m1 | private.rb:87:3:89:5 | call_m1 |
66-
| private.rb:78:1:90:3 | PrivateOverride1 | m1 | private.rb:79:11:81:5 | m1 |
67-
| private.rb:78:1:90:3 | PrivateOverride1 | m2 | private.rb:83:11:85:5 | m2 |
68-
| private.rb:92:1:98:3 | PrivateOverride2 | m1 | private.rb:93:11:97:5 | m1 |
52+
| private.rb:1:1:49:3 | E | private1 | private.rb:2:11:3:5 | private1 |
53+
| private.rb:1:1:49:3 | E | private2 | private.rb:8:3:9:5 | private2 |
54+
| private.rb:1:1:49:3 | E | private3 | private.rb:14:3:15:5 | private3 |
55+
| private.rb:1:1:49:3 | E | private4 | private.rb:17:3:18:5 | private4 |
56+
| private.rb:1:1:49:3 | E | private7 | private.rb:41:3:42:5 | private7 |
57+
| private.rb:1:1:49:3 | E | private8 | private.rb:47:3:48:5 | private8 |
58+
| private.rb:1:1:49:3 | E | protected1 | private.rb:32:3:33:5 | protected1 |
59+
| private.rb:1:1:49:3 | E | protected2 | private.rb:35:3:36:5 | protected2 |
60+
| private.rb:1:1:49:3 | E | public | private.rb:5:3:6:5 | public |
61+
| private.rb:62:1:80:3 | F | private1 | private.rb:63:11:64:5 | private1 |
62+
| private.rb:62:1:80:3 | F | private2 | private.rb:69:3:70:5 | private2 |
63+
| private.rb:62:1:80:3 | F | private3 | private.rb:75:3:76:5 | private3 |
64+
| private.rb:62:1:80:3 | F | private4 | private.rb:78:3:79:5 | private4 |
65+
| private.rb:62:1:80:3 | F | public | private.rb:66:3:67:5 | public |
66+
| private.rb:82:1:94:3 | PrivateOverride1 | call_m1 | private.rb:91:3:93:5 | call_m1 |
67+
| private.rb:82:1:94:3 | PrivateOverride1 | m1 | private.rb:83:11:85:5 | m1 |
68+
| private.rb:82:1:94:3 | PrivateOverride1 | m2 | private.rb:87:11:89:5 | m2 |
69+
| private.rb:96:1:102:3 | PrivateOverride2 | m1 | private.rb:97:11:101:5 | m1 |
6970
lookupMethod
7071
| calls.rb:21:1:34:3 | M | instance_m | calls.rb:22:5:24:7 | instance_m |
7172
| calls.rb:43:1:58:3 | C | add_singleton | calls.rb:364:1:368:3 | add_singleton |
@@ -151,7 +152,7 @@ lookupMethod
151152
| calls.rb:112:1:115:3 | Object | optional_arg | calls.rb:76:1:79:3 | optional_arg |
152153
| calls.rb:112:1:115:3 | Object | pattern_dispatch | calls.rb:340:1:356:3 | pattern_dispatch |
153154
| calls.rb:112:1:115:3 | Object | private_on_main | calls.rb:182:1:183:3 | private_on_main |
154-
| calls.rb:112:1:115:3 | Object | private_on_main | private.rb:47:1:48:3 | private_on_main |
155+
| calls.rb:112:1:115:3 | Object | private_on_main | private.rb:51:1:52:3 | private_on_main |
155156
| calls.rb:112:1:115:3 | Object | puts | calls.rb:102:5:102:30 | puts |
156157
| calls.rb:112:1:115:3 | Object | to_s | calls.rb:169:5:170:7 | to_s |
157158
| calls.rb:117:1:120:3 | Hash | [] | calls.rb:119:5:119:31 | [] |
@@ -433,37 +434,38 @@ lookupMethod
433434
| modules_rec.rb:4:1:5:3 | A::B | new | calls.rb:114:5:114:16 | new |
434435
| modules_rec.rb:4:1:5:3 | A::B | puts | calls.rb:102:5:102:30 | puts |
435436
| modules_rec.rb:4:1:5:3 | A::B | to_s | calls.rb:169:5:170:7 | to_s |
436-
| private.rb:1:1:45:3 | E | new | calls.rb:114:5:114:16 | new |
437-
| private.rb:1:1:45:3 | E | private1 | private.rb:2:11:3:5 | private1 |
438-
| private.rb:1:1:45:3 | E | private2 | private.rb:8:3:9:5 | private2 |
439-
| private.rb:1:1:45:3 | E | private3 | private.rb:14:3:15:5 | private3 |
440-
| private.rb:1:1:45:3 | E | private4 | private.rb:17:3:18:5 | private4 |
441-
| private.rb:1:1:45:3 | E | private7 | private.rb:43:3:44:5 | private7 |
442-
| private.rb:1:1:45:3 | E | private_on_main | private.rb:47:1:48:3 | private_on_main |
443-
| private.rb:1:1:45:3 | E | protected1 | private.rb:32:3:33:5 | protected1 |
444-
| private.rb:1:1:45:3 | E | protected2 | private.rb:35:3:36:5 | protected2 |
445-
| private.rb:1:1:45:3 | E | public | private.rb:5:3:6:5 | public |
446-
| private.rb:1:1:45:3 | E | puts | calls.rb:102:5:102:30 | puts |
447-
| private.rb:1:1:45:3 | E | to_s | calls.rb:169:5:170:7 | to_s |
448-
| private.rb:58:1:76:3 | F | private1 | private.rb:59:11:60:5 | private1 |
449-
| private.rb:58:1:76:3 | F | private2 | private.rb:65:3:66:5 | private2 |
450-
| private.rb:58:1:76:3 | F | private3 | private.rb:71:3:72:5 | private3 |
451-
| private.rb:58:1:76:3 | F | private4 | private.rb:74:3:75:5 | private4 |
452-
| private.rb:58:1:76:3 | F | public | private.rb:62:3:63:5 | public |
453-
| private.rb:78:1:90:3 | PrivateOverride1 | call_m1 | private.rb:87:3:89:5 | call_m1 |
454-
| private.rb:78:1:90:3 | PrivateOverride1 | m1 | private.rb:79:11:81:5 | m1 |
455-
| private.rb:78:1:90:3 | PrivateOverride1 | m2 | private.rb:83:11:85:5 | m2 |
456-
| private.rb:78:1:90:3 | PrivateOverride1 | new | calls.rb:114:5:114:16 | new |
457-
| private.rb:78:1:90:3 | PrivateOverride1 | private_on_main | private.rb:47:1:48:3 | private_on_main |
458-
| private.rb:78:1:90:3 | PrivateOverride1 | puts | calls.rb:102:5:102:30 | puts |
459-
| private.rb:78:1:90:3 | PrivateOverride1 | to_s | calls.rb:169:5:170:7 | to_s |
460-
| private.rb:92:1:98:3 | PrivateOverride2 | call_m1 | private.rb:87:3:89:5 | call_m1 |
461-
| private.rb:92:1:98:3 | PrivateOverride2 | m1 | private.rb:93:11:97:5 | m1 |
462-
| private.rb:92:1:98:3 | PrivateOverride2 | m2 | private.rb:83:11:85:5 | m2 |
463-
| private.rb:92:1:98:3 | PrivateOverride2 | new | calls.rb:114:5:114:16 | new |
464-
| private.rb:92:1:98:3 | PrivateOverride2 | private_on_main | private.rb:47:1:48:3 | private_on_main |
465-
| private.rb:92:1:98:3 | PrivateOverride2 | puts | calls.rb:102:5:102:30 | puts |
466-
| private.rb:92:1:98:3 | PrivateOverride2 | to_s | calls.rb:169:5:170:7 | to_s |
437+
| private.rb:1:1:49:3 | E | new | calls.rb:114:5:114:16 | new |
438+
| private.rb:1:1:49:3 | E | private1 | private.rb:2:11:3:5 | private1 |
439+
| private.rb:1:1:49:3 | E | private2 | private.rb:8:3:9:5 | private2 |
440+
| private.rb:1:1:49:3 | E | private3 | private.rb:14:3:15:5 | private3 |
441+
| private.rb:1:1:49:3 | E | private4 | private.rb:17:3:18:5 | private4 |
442+
| private.rb:1:1:49:3 | E | private7 | private.rb:41:3:42:5 | private7 |
443+
| private.rb:1:1:49:3 | E | private8 | private.rb:47:3:48:5 | private8 |
444+
| private.rb:1:1:49:3 | E | private_on_main | private.rb:51:1:52:3 | private_on_main |
445+
| private.rb:1:1:49:3 | E | protected1 | private.rb:32:3:33:5 | protected1 |
446+
| private.rb:1:1:49:3 | E | protected2 | private.rb:35:3:36:5 | protected2 |
447+
| private.rb:1:1:49:3 | E | public | private.rb:5:3:6:5 | public |
448+
| private.rb:1:1:49:3 | E | puts | calls.rb:102:5:102:30 | puts |
449+
| private.rb:1:1:49:3 | E | to_s | calls.rb:169:5:170:7 | to_s |
450+
| private.rb:62:1:80:3 | F | private1 | private.rb:63:11:64:5 | private1 |
451+
| private.rb:62:1:80:3 | F | private2 | private.rb:69:3:70:5 | private2 |
452+
| private.rb:62:1:80:3 | F | private3 | private.rb:75:3:76:5 | private3 |
453+
| private.rb:62:1:80:3 | F | private4 | private.rb:78:3:79:5 | private4 |
454+
| private.rb:62:1:80:3 | F | public | private.rb:66:3:67:5 | public |
455+
| private.rb:82:1:94:3 | PrivateOverride1 | call_m1 | private.rb:91:3:93:5 | call_m1 |
456+
| private.rb:82:1:94:3 | PrivateOverride1 | m1 | private.rb:83:11:85:5 | m1 |
457+
| private.rb:82:1:94:3 | PrivateOverride1 | m2 | private.rb:87:11:89:5 | m2 |
458+
| private.rb:82:1:94:3 | PrivateOverride1 | new | calls.rb:114:5:114:16 | new |
459+
| private.rb:82:1:94:3 | PrivateOverride1 | private_on_main | private.rb:51:1:52:3 | private_on_main |
460+
| private.rb:82:1:94:3 | PrivateOverride1 | puts | calls.rb:102:5:102:30 | puts |
461+
| private.rb:82:1:94:3 | PrivateOverride1 | to_s | calls.rb:169:5:170:7 | to_s |
462+
| private.rb:96:1:102:3 | PrivateOverride2 | call_m1 | private.rb:91:3:93:5 | call_m1 |
463+
| private.rb:96:1:102:3 | PrivateOverride2 | m1 | private.rb:97:11:101:5 | m1 |
464+
| private.rb:96:1:102:3 | PrivateOverride2 | m2 | private.rb:87:11:89:5 | m2 |
465+
| private.rb:96:1:102:3 | PrivateOverride2 | new | calls.rb:114:5:114:16 | new |
466+
| private.rb:96:1:102:3 | PrivateOverride2 | private_on_main | private.rb:51:1:52:3 | private_on_main |
467+
| private.rb:96:1:102:3 | PrivateOverride2 | puts | calls.rb:102:5:102:30 | puts |
468+
| private.rb:96:1:102:3 | PrivateOverride2 | to_s | calls.rb:169:5:170:7 | to_s |
467469
enclosingMethod
468470
| calls.rb:2:5:2:14 | call to puts | calls.rb:1:1:3:3 | foo |
469471
| calls.rb:2:5:2:14 | self | calls.rb:1:1:3:3 | foo |
@@ -787,22 +789,22 @@ enclosingMethod
787789
| hello.rb:20:30:20:34 | self | hello.rb:19:5:21:7 | message |
788790
| hello.rb:20:38:20:40 | "!" | hello.rb:19:5:21:7 | message |
789791
| hello.rb:20:39:20:39 | ! | hello.rb:19:5:21:7 | message |
790-
| private.rb:80:7:80:32 | call to puts | private.rb:79:11:81:5 | m1 |
791-
| private.rb:80:7:80:32 | self | private.rb:79:11:81:5 | m1 |
792-
| private.rb:80:12:80:32 | "PrivateOverride1#m1" | private.rb:79:11:81:5 | m1 |
793-
| private.rb:80:13:80:31 | PrivateOverride1#m1 | private.rb:79:11:81:5 | m1 |
794-
| private.rb:84:7:84:32 | call to puts | private.rb:83:11:85:5 | m2 |
795-
| private.rb:84:7:84:32 | self | private.rb:83:11:85:5 | m2 |
796-
| private.rb:84:12:84:32 | "PrivateOverride1#m2" | private.rb:83:11:85:5 | m2 |
797-
| private.rb:84:13:84:31 | PrivateOverride1#m2 | private.rb:83:11:85:5 | m2 |
798-
| private.rb:88:7:88:8 | call to m1 | private.rb:87:3:89:5 | call_m1 |
799-
| private.rb:88:7:88:8 | self | private.rb:87:3:89:5 | call_m1 |
800-
| private.rb:94:7:94:32 | call to puts | private.rb:93:11:97:5 | m1 |
801-
| private.rb:94:7:94:32 | self | private.rb:93:11:97:5 | m1 |
802-
| private.rb:94:12:94:32 | "PrivateOverride2#m1" | private.rb:93:11:97:5 | m1 |
803-
| private.rb:94:13:94:31 | PrivateOverride2#m1 | private.rb:93:11:97:5 | m1 |
804-
| private.rb:95:7:95:8 | call to m2 | private.rb:93:11:97:5 | m1 |
805-
| private.rb:95:7:95:8 | self | private.rb:93:11:97:5 | m1 |
806-
| private.rb:96:7:96:22 | PrivateOverride1 | private.rb:93:11:97:5 | m1 |
807-
| private.rb:96:7:96:26 | call to new | private.rb:93:11:97:5 | m1 |
808-
| private.rb:96:7:96:29 | call to m1 | private.rb:93:11:97:5 | m1 |
792+
| private.rb:84:7:84:32 | call to puts | private.rb:83:11:85:5 | m1 |
793+
| private.rb:84:7:84:32 | self | private.rb:83:11:85:5 | m1 |
794+
| private.rb:84:12:84:32 | "PrivateOverride1#m1" | private.rb:83:11:85:5 | m1 |
795+
| private.rb:84:13:84:31 | PrivateOverride1#m1 | private.rb:83:11:85:5 | m1 |
796+
| private.rb:88:7:88:32 | call to puts | private.rb:87:11:89:5 | m2 |
797+
| private.rb:88:7:88:32 | self | private.rb:87:11:89:5 | m2 |
798+
| private.rb:88:12:88:32 | "PrivateOverride1#m2" | private.rb:87:11:89:5 | m2 |
799+
| private.rb:88:13:88:31 | PrivateOverride1#m2 | private.rb:87:11:89:5 | m2 |
800+
| private.rb:92:7:92:8 | call to m1 | private.rb:91:3:93:5 | call_m1 |
801+
| private.rb:92:7:92:8 | self | private.rb:91:3:93:5 | call_m1 |
802+
| private.rb:98:7:98:32 | call to puts | private.rb:97:11:101:5 | m1 |
803+
| private.rb:98:7:98:32 | self | private.rb:97:11:101:5 | m1 |
804+
| private.rb:98:12:98:32 | "PrivateOverride2#m1" | private.rb:97:11:101:5 | m1 |
805+
| private.rb:98:13:98:31 | PrivateOverride2#m1 | private.rb:97:11:101:5 | m1 |
806+
| private.rb:99:7:99:8 | call to m2 | private.rb:97:11:101:5 | m1 |
807+
| private.rb:99:7:99:8 | self | private.rb:97:11:101:5 | m1 |
808+
| private.rb:100:7:100:22 | PrivateOverride1 | private.rb:97:11:101:5 | m1 |
809+
| private.rb:100:7:100:26 | call to new | private.rb:97:11:101:5 | m1 |
810+
| private.rb:100:7:100:29 | call to m1 | private.rb:97:11:101:5 | m1 |

0 commit comments

Comments
 (0)