Skip to content

Commit 087be2c

Browse files
smowtonsmowton
committed
Adjust test expectations
1 parent a11c5c7 commit 087be2c

File tree

4 files changed

+63
-63
lines changed

4 files changed

+63
-63
lines changed

‎java/ql/test/library-tests/dependency/PrintAst.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dependency/A.java:
6262
# 30| 1: [ReturnStmt] return ...
6363
# 31| 1: [SwitchStmt] switch (...)
6464
# 31| -1: [VarAccess] o
65-
# 32| 0: [PatternCase] case T t ...
65+
# 32| 0: [PatternCase] case <Pattern>
6666
#-----| 0: (Single Local Variable Declaration)
6767
# 32| 0: [TypeAccess] Used2
6868
# 32| 1: [LocalVariableDeclExpr] u2
@@ -73,7 +73,7 @@ dependency/A.java:
7373
# 35| 1: [LocalVariableDeclExpr] x
7474
# 35| 0: [SwitchExpr] switch (...)
7575
# 35| -1: [VarAccess] o
76-
# 36| 0: [PatternCase] case T t ...
76+
# 36| 0: [PatternCase] case <Pattern>
7777
#-----| 0: (Single Local Variable Declaration)
7878
# 36| 0: [TypeAccess] Used3
7979
# 36| 1: [LocalVariableDeclExpr] u3

‎java/ql/test/library-tests/guards12/PrintAst.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Test.java:
4545
# 15| -1: [VarAccess] s
4646
# 16| 3: [SwitchStmt] switch (...)
4747
# 16| -1: [VarAccess] s
48-
# 17| 0: [PatternCase] case T t ...
48+
# 17| 0: [PatternCase] case <Pattern>
4949
# 17| -3: [EQExpr] ... == ...
5050
# 17| 0: [VarAccess] len
5151
# 17| 1: [IntegerLiteral] 4

‎java/ql/test/library-tests/pattern-switch/cfg/test.expected

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
| Test.java:1:14:1:17 | { ... } | Test.java:1:14:1:17 | super(...) |
33
| Test.java:3:41:101:3 | { ... } | Test.java:5:6:5:19 | switch (...) |
44
| Test.java:5:6:5:19 | switch (...) | Test.java:5:14:5:18 | thing |
5-
| Test.java:5:14:5:18 | thing | Test.java:6:8:6:23 | case T t ... |
6-
| Test.java:6:8:6:23 | case T t ... | Test.java:6:20:6:20 | s |
7-
| Test.java:6:8:6:23 | case T t ... | Test.java:7:8:7:24 | case T t ... |
5+
| Test.java:5:14:5:18 | thing | Test.java:6:8:6:23 | case <Pattern> |
6+
| Test.java:6:8:6:23 | case <Pattern> | Test.java:6:20:6:20 | s |
7+
| Test.java:6:8:6:23 | case <Pattern> | Test.java:7:8:7:24 | case <Pattern> |
88
| Test.java:6:20:6:20 | s | Test.java:6:25:6:34 | System.out |
99
| Test.java:6:25:6:34 | System.out | Test.java:6:44:6:44 | s |
1010
| Test.java:6:25:6:45 | println(...) | Test.java:11:6:11:19 | switch (...) |
1111
| Test.java:6:25:6:46 | <Expr>; | Test.java:6:25:6:34 | System.out |
1212
| Test.java:6:44:6:44 | s | Test.java:6:25:6:45 | println(...) |
13-
| Test.java:7:8:7:24 | case T t ... | Test.java:7:21:7:21 | i |
14-
| Test.java:7:8:7:24 | case T t ... | Test.java:8:8:8:17 | default |
13+
| Test.java:7:8:7:24 | case <Pattern> | Test.java:7:21:7:21 | i |
14+
| Test.java:7:8:7:24 | case <Pattern> | Test.java:8:8:8:17 | default |
1515
| Test.java:7:21:7:21 | i | Test.java:7:26:7:35 | System.out |
1616
| Test.java:7:26:7:35 | System.out | Test.java:7:45:7:58 | "An integer: " |
1717
| Test.java:7:26:7:63 | println(...) | Test.java:11:6:11:19 | switch (...) |
@@ -22,17 +22,17 @@
2222
| Test.java:8:8:8:17 | default | Test.java:8:19:8:21 | { ... } |
2323
| Test.java:8:19:8:21 | { ... } | Test.java:11:6:11:19 | switch (...) |
2424
| Test.java:11:6:11:19 | switch (...) | Test.java:11:14:11:18 | thing |
25-
| Test.java:11:14:11:18 | thing | Test.java:12:8:12:21 | case T t ... |
26-
| Test.java:12:8:12:21 | case T t ... | Test.java:12:20:12:20 | s |
27-
| Test.java:12:8:12:21 | case T t ... | Test.java:15:8:15:22 | case T t ... |
25+
| Test.java:11:14:11:18 | thing | Test.java:12:8:12:21 | case <Pattern> |
26+
| Test.java:12:8:12:21 | case <Pattern> | Test.java:12:20:12:20 | s |
27+
| Test.java:12:8:12:21 | case <Pattern> | Test.java:15:8:15:22 | case <Pattern> |
2828
| Test.java:12:20:12:20 | s | Test.java:13:10:13:31 | <Expr>; |
2929
| Test.java:13:10:13:19 | System.out | Test.java:13:29:13:29 | s |
3030
| Test.java:13:10:13:30 | println(...) | Test.java:14:10:14:15 | break |
3131
| Test.java:13:10:13:31 | <Expr>; | Test.java:13:10:13:19 | System.out |
3232
| Test.java:13:29:13:29 | s | Test.java:13:10:13:30 | println(...) |
3333
| Test.java:14:10:14:15 | break | Test.java:22:6:26:7 | var ...; |
34-
| Test.java:15:8:15:22 | case T t ... | Test.java:15:21:15:21 | i |
35-
| Test.java:15:8:15:22 | case T t ... | Test.java:18:8:18:15 | default |
34+
| Test.java:15:8:15:22 | case <Pattern> | Test.java:15:21:15:21 | i |
35+
| Test.java:15:8:15:22 | case <Pattern> | Test.java:18:8:18:15 | default |
3636
| Test.java:15:21:15:21 | i | Test.java:16:10:16:47 | <Expr>; |
3737
| Test.java:16:10:16:19 | System.out | Test.java:16:29:16:41 | "An integer:" |
3838
| Test.java:16:10:16:46 | println(...) | Test.java:17:10:17:15 | break |
@@ -46,13 +46,13 @@
4646
| Test.java:22:6:26:7 | var ...; | Test.java:22:26:22:38 | switch (...) |
4747
| Test.java:22:10:22:38 | thingAsString | Test.java:28:6:35:7 | var ...; |
4848
| Test.java:22:26:22:38 | switch (...) | Test.java:22:33:22:37 | thing |
49-
| Test.java:22:33:22:37 | thing | Test.java:23:8:23:23 | case T t ... |
50-
| Test.java:23:8:23:23 | case T t ... | Test.java:23:20:23:20 | s |
51-
| Test.java:23:8:23:23 | case T t ... | Test.java:24:8:24:24 | case T t ... |
49+
| Test.java:22:33:22:37 | thing | Test.java:23:8:23:23 | case <Pattern> |
50+
| Test.java:23:8:23:23 | case <Pattern> | Test.java:23:20:23:20 | s |
51+
| Test.java:23:8:23:23 | case <Pattern> | Test.java:24:8:24:24 | case <Pattern> |
5252
| Test.java:23:20:23:20 | s | Test.java:23:25:23:25 | s |
5353
| Test.java:23:25:23:25 | s | Test.java:22:10:22:38 | thingAsString |
54-
| Test.java:24:8:24:24 | case T t ... | Test.java:24:21:24:21 | i |
55-
| Test.java:24:8:24:24 | case T t ... | Test.java:25:8:25:17 | default |
54+
| Test.java:24:8:24:24 | case <Pattern> | Test.java:24:21:24:21 | i |
55+
| Test.java:24:8:24:24 | case <Pattern> | Test.java:25:8:25:17 | default |
5656
| Test.java:24:21:24:21 | i | Test.java:24:26:24:39 | "An integer: " |
5757
| Test.java:24:26:24:39 | "An integer: " | Test.java:24:43:24:43 | i |
5858
| Test.java:24:26:24:43 | ... + ... | Test.java:22:10:22:38 | thingAsString |
@@ -62,14 +62,14 @@
6262
| Test.java:28:6:35:7 | var ...; | Test.java:28:27:28:39 | switch (...) |
6363
| Test.java:28:10:28:39 | thingAsString2 | Test.java:37:6:37:18 | switch (...) |
6464
| Test.java:28:27:28:39 | switch (...) | Test.java:28:34:28:38 | thing |
65-
| Test.java:28:34:28:38 | thing | Test.java:29:8:29:21 | case T t ... |
66-
| Test.java:29:8:29:21 | case T t ... | Test.java:29:20:29:20 | s |
67-
| Test.java:29:8:29:21 | case T t ... | Test.java:31:8:31:22 | case T t ... |
65+
| Test.java:28:34:28:38 | thing | Test.java:29:8:29:21 | case <Pattern> |
66+
| Test.java:29:8:29:21 | case <Pattern> | Test.java:29:20:29:20 | s |
67+
| Test.java:29:8:29:21 | case <Pattern> | Test.java:31:8:31:22 | case <Pattern> |
6868
| Test.java:29:20:29:20 | s | Test.java:30:10:30:17 | yield ... |
6969
| Test.java:30:10:30:17 | yield ... | Test.java:30:16:30:16 | s |
7070
| Test.java:30:16:30:16 | s | Test.java:28:10:28:39 | thingAsString2 |
71-
| Test.java:31:8:31:22 | case T t ... | Test.java:31:21:31:21 | i |
72-
| Test.java:31:8:31:22 | case T t ... | Test.java:33:8:33:15 | default |
71+
| Test.java:31:8:31:22 | case <Pattern> | Test.java:31:21:31:21 | i |
72+
| Test.java:31:8:31:22 | case <Pattern> | Test.java:33:8:33:15 | default |
7373
| Test.java:31:21:31:21 | i | Test.java:32:10:32:34 | yield ... |
7474
| Test.java:32:10:32:34 | yield ... | Test.java:32:16:32:29 | "An integer: " |
7575
| Test.java:32:16:32:29 | "An integer: " | Test.java:32:33:32:33 | i |
@@ -79,22 +79,22 @@
7979
| Test.java:34:10:34:32 | yield ... | Test.java:34:16:34:31 | "Something else" |
8080
| Test.java:34:16:34:31 | "Something else" | Test.java:28:10:28:39 | thingAsString2 |
8181
| Test.java:37:6:37:18 | switch (...) | Test.java:37:13:37:17 | thing |
82-
| Test.java:37:13:37:17 | thing | Test.java:38:8:38:42 | case T t ... |
83-
| Test.java:38:8:38:42 | case T t ... | Test.java:38:20:38:20 | s |
84-
| Test.java:38:8:38:42 | case T t ... | Test.java:41:8:41:42 | case T t ... |
82+
| Test.java:37:13:37:17 | thing | Test.java:38:8:38:42 | case <Pattern> |
83+
| Test.java:38:8:38:42 | case <Pattern> | Test.java:38:20:38:20 | s |
84+
| Test.java:38:8:38:42 | case <Pattern> | Test.java:41:8:41:42 | case <Pattern> |
8585
| Test.java:38:20:38:20 | s | Test.java:38:27:38:27 | s |
8686
| Test.java:38:27:38:27 | s | Test.java:38:27:38:36 | length(...) |
8787
| Test.java:38:27:38:36 | length(...) | Test.java:38:41:38:41 | 3 |
8888
| Test.java:38:27:38:41 | ... == ... | Test.java:39:10:39:40 | <Expr>; |
89-
| Test.java:38:27:38:41 | ... == ... | Test.java:41:8:41:42 | case T t ... |
89+
| Test.java:38:27:38:41 | ... == ... | Test.java:41:8:41:42 | case <Pattern> |
9090
| Test.java:38:41:38:41 | 3 | Test.java:38:27:38:41 | ... == ... |
9191
| Test.java:39:10:39:19 | System.out | Test.java:39:29:39:38 | "Length 3" |
9292
| Test.java:39:10:39:39 | println(...) | Test.java:40:10:40:15 | break |
9393
| Test.java:39:10:39:40 | <Expr>; | Test.java:39:10:39:19 | System.out |
9494
| Test.java:39:29:39:38 | "Length 3" | Test.java:39:10:39:39 | println(...) |
9595
| Test.java:40:10:40:15 | break | Test.java:49:6:49:18 | switch (...) |
96-
| Test.java:41:8:41:42 | case T t ... | Test.java:41:20:41:20 | s |
97-
| Test.java:41:8:41:42 | case T t ... | Test.java:44:8:44:15 | default |
96+
| Test.java:41:8:41:42 | case <Pattern> | Test.java:41:20:41:20 | s |
97+
| Test.java:41:8:41:42 | case <Pattern> | Test.java:44:8:44:15 | default |
9898
| Test.java:41:20:41:20 | s | Test.java:41:27:41:27 | s |
9999
| Test.java:41:27:41:27 | s | Test.java:41:27:41:36 | length(...) |
100100
| Test.java:41:27:41:36 | length(...) | Test.java:41:41:41:41 | 5 |
@@ -113,21 +113,21 @@
113113
| Test.java:45:29:45:43 | "Anything else" | Test.java:45:10:45:44 | println(...) |
114114
| Test.java:46:10:46:15 | break | Test.java:49:6:49:18 | switch (...) |
115115
| Test.java:49:6:49:18 | switch (...) | Test.java:49:13:49:17 | thing |
116-
| Test.java:49:13:49:17 | thing | Test.java:50:8:50:44 | case T t ... |
117-
| Test.java:50:8:50:44 | case T t ... | Test.java:50:20:50:20 | s |
118-
| Test.java:50:8:50:44 | case T t ... | Test.java:51:8:51:44 | case T t ... |
116+
| Test.java:49:13:49:17 | thing | Test.java:50:8:50:44 | case <Pattern> |
117+
| Test.java:50:8:50:44 | case <Pattern> | Test.java:50:20:50:20 | s |
118+
| Test.java:50:8:50:44 | case <Pattern> | Test.java:51:8:51:44 | case <Pattern> |
119119
| Test.java:50:20:50:20 | s | Test.java:50:27:50:27 | s |
120120
| Test.java:50:27:50:27 | s | Test.java:50:27:50:36 | length(...) |
121121
| Test.java:50:27:50:36 | length(...) | Test.java:50:41:50:41 | 3 |
122122
| Test.java:50:27:50:41 | ... == ... | Test.java:50:46:50:55 | System.out |
123-
| Test.java:50:27:50:41 | ... == ... | Test.java:51:8:51:44 | case T t ... |
123+
| Test.java:50:27:50:41 | ... == ... | Test.java:51:8:51:44 | case <Pattern> |
124124
| Test.java:50:41:50:41 | 3 | Test.java:50:27:50:41 | ... == ... |
125125
| Test.java:50:46:50:55 | System.out | Test.java:50:65:50:74 | "Length 3" |
126126
| Test.java:50:46:50:75 | println(...) | Test.java:55:6:55:26 | switch (...) |
127127
| Test.java:50:46:50:76 | <Expr>; | Test.java:50:46:50:55 | System.out |
128128
| Test.java:50:65:50:74 | "Length 3" | Test.java:50:46:50:75 | println(...) |
129-
| Test.java:51:8:51:44 | case T t ... | Test.java:51:20:51:20 | s |
130-
| Test.java:51:8:51:44 | case T t ... | Test.java:52:8:52:17 | default |
129+
| Test.java:51:8:51:44 | case <Pattern> | Test.java:51:20:51:20 | s |
130+
| Test.java:51:8:51:44 | case <Pattern> | Test.java:52:8:52:17 | default |
131131
| Test.java:51:20:51:20 | s | Test.java:51:27:51:27 | s |
132132
| Test.java:51:27:51:27 | s | Test.java:51:27:51:36 | length(...) |
133133
| Test.java:51:27:51:36 | length(...) | Test.java:51:41:51:41 | 5 |
@@ -143,7 +143,7 @@
143143
| Test.java:55:6:55:26 | switch (...) | Test.java:55:21:55:25 | thing |
144144
| Test.java:55:13:55:25 | (...)... | Test.java:56:8:56:21 | case ... |
145145
| Test.java:55:13:55:25 | (...)... | Test.java:58:8:58:21 | case ... |
146-
| Test.java:55:13:55:25 | (...)... | Test.java:61:8:61:42 | case T t ... |
146+
| Test.java:55:13:55:25 | (...)... | Test.java:61:8:61:42 | case <Pattern> |
147147
| Test.java:55:13:55:25 | (...)... | Test.java:69:8:69:26 | case null, default |
148148
| Test.java:55:21:55:25 | thing | Test.java:55:13:55:25 | (...)... |
149149
| Test.java:56:8:56:21 | case ... | Test.java:57:10:57:44 | <Expr>; |
@@ -157,10 +157,10 @@
157157
| Test.java:59:10:59:54 | <Expr>; | Test.java:59:10:59:19 | System.out |
158158
| Test.java:59:29:59:52 | "It's Const1 or Const2!" | Test.java:59:10:59:53 | println(...) |
159159
| Test.java:60:10:60:15 | break | Test.java:73:6:73:18 | switch (...) |
160-
| Test.java:61:8:61:42 | case T t ... | Test.java:61:20:61:20 | s |
161-
| Test.java:61:8:61:42 | case T t ... | Test.java:63:8:63:21 | case ... |
162-
| Test.java:61:8:61:42 | case T t ... | Test.java:66:8:66:22 | case ... |
163-
| Test.java:61:8:61:42 | case T t ... | Test.java:69:8:69:26 | case null, default |
160+
| Test.java:61:8:61:42 | case <Pattern> | Test.java:61:20:61:20 | s |
161+
| Test.java:61:8:61:42 | case <Pattern> | Test.java:63:8:63:21 | case ... |
162+
| Test.java:61:8:61:42 | case <Pattern> | Test.java:66:8:66:22 | case ... |
163+
| Test.java:61:8:61:42 | case <Pattern> | Test.java:69:8:69:26 | case null, default |
164164
| Test.java:61:20:61:20 | s | Test.java:61:27:61:27 | s |
165165
| Test.java:61:27:61:27 | s | Test.java:61:27:61:36 | length(...) |
166166
| Test.java:61:27:61:36 | length(...) | Test.java:61:41:61:41 | 6 |
@@ -191,10 +191,10 @@
191191
| Test.java:70:10:70:60 | <Expr>; | Test.java:70:10:70:19 | System.out |
192192
| Test.java:70:29:70:58 | "It's null, or something else" | Test.java:70:10:70:59 | println(...) |
193193
| Test.java:73:6:73:18 | switch (...) | Test.java:73:13:73:17 | thing |
194-
| Test.java:73:13:73:17 | thing | Test.java:74:8:74:21 | case T t ... |
194+
| Test.java:73:13:73:17 | thing | Test.java:74:8:74:21 | case <Pattern> |
195195
| Test.java:73:13:73:17 | thing | Test.java:77:8:77:17 | case ... |
196-
| Test.java:74:8:74:21 | case T t ... | Test.java:74:20:74:20 | s |
197-
| Test.java:74:8:74:21 | case T t ... | Test.java:80:8:80:22 | case T t ... |
196+
| Test.java:74:8:74:21 | case <Pattern> | Test.java:74:20:74:20 | s |
197+
| Test.java:74:8:74:21 | case <Pattern> | Test.java:80:8:80:22 | case <Pattern> |
198198
| Test.java:74:20:74:20 | s | Test.java:75:10:75:31 | <Expr>; |
199199
| Test.java:75:10:75:19 | System.out | Test.java:75:29:75:29 | s |
200200
| Test.java:75:10:75:30 | println(...) | Test.java:76:10:76:15 | break |
@@ -207,8 +207,8 @@
207207
| Test.java:78:10:78:41 | <Expr>; | Test.java:78:10:78:19 | System.out |
208208
| Test.java:78:29:78:39 | "It's null" | Test.java:78:10:78:40 | println(...) |
209209
| Test.java:79:10:79:15 | break | Test.java:87:6:87:18 | switch (...) |
210-
| Test.java:80:8:80:22 | case T t ... | Test.java:80:21:80:21 | i |
211-
| Test.java:80:8:80:22 | case T t ... | Test.java:83:8:83:15 | default |
210+
| Test.java:80:8:80:22 | case <Pattern> | Test.java:80:21:80:21 | i |
211+
| Test.java:80:8:80:22 | case <Pattern> | Test.java:83:8:83:15 | default |
212212
| Test.java:80:21:80:21 | i | Test.java:81:10:81:47 | <Expr>; |
213213
| Test.java:81:10:81:19 | System.out | Test.java:81:29:81:41 | "An integer:" |
214214
| Test.java:81:10:81:46 | println(...) | Test.java:82:10:82:15 | break |
@@ -220,9 +220,9 @@
220220
| Test.java:83:8:83:15 | default | Test.java:84:10:84:15 | break |
221221
| Test.java:84:10:84:15 | break | Test.java:87:6:87:18 | switch (...) |
222222
| Test.java:87:6:87:18 | switch (...) | Test.java:87:13:87:17 | thing |
223-
| Test.java:87:13:87:17 | thing | Test.java:88:8:88:43 | case T t ... |
224-
| Test.java:88:8:88:43 | case T t ... | Test.java:88:21:88:21 | x |
225-
| Test.java:88:8:88:43 | case T t ... | Test.java:90:8:90:15 | default |
223+
| Test.java:87:13:87:17 | thing | Test.java:88:8:88:43 | case <Pattern> |
224+
| Test.java:88:8:88:43 | case <Pattern> | Test.java:88:21:88:21 | x |
225+
| Test.java:88:8:88:43 | case <Pattern> | Test.java:90:8:90:15 | default |
226226
| Test.java:88:13:88:42 | A(...) | Test.java:89:10:89:15 | break |
227227
| Test.java:88:15:88:32 | B(...) | Test.java:88:41:88:41 | z |
228228
| Test.java:88:21:88:21 | x | Test.java:88:31:88:31 | y |
@@ -232,9 +232,9 @@
232232
| Test.java:90:8:90:15 | default | Test.java:91:10:91:15 | break |
233233
| Test.java:91:10:91:15 | break | Test.java:94:6:94:18 | switch (...) |
234234
| Test.java:94:6:94:18 | switch (...) | Test.java:94:13:94:17 | thing |
235-
| Test.java:94:13:94:17 | thing | Test.java:95:8:95:38 | case T t ... |
236-
| Test.java:95:8:95:38 | case T t ... | Test.java:95:21:95:21 | x |
237-
| Test.java:95:8:95:38 | case T t ... | Test.java:97:8:97:15 | default |
235+
| Test.java:94:13:94:17 | thing | Test.java:95:8:95:38 | case <Pattern> |
236+
| Test.java:95:8:95:38 | case <Pattern> | Test.java:95:21:95:21 | x |
237+
| Test.java:95:8:95:38 | case <Pattern> | Test.java:97:8:97:15 | default |
238238
| Test.java:95:13:95:37 | A(...) | Test.java:96:10:96:15 | break |
239239
| Test.java:95:15:95:29 | B(...) | Test.java:95:36:95:36 | z |
240240
| Test.java:95:21:95:21 | x | Test.java:95:28:95:28 | y |

0 commit comments

Comments
 (0)