Skip to content

Commit dc333bd

Browse files
hvitvedhvitved
committed
Java: Update expected test output
1 parent ebe56fe commit dc333bd

File tree

7 files changed

+1161
-20
lines changed

7 files changed

+1161
-20
lines changed

‎java/ql/test/library-tests/dataflow/capture/inlinetest.expected

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,16 @@ edges
3333
| B.java:39:5:39:7 | inp : HashMap [<map.key>] : String | B.java:39:18:39:20 | key : String | provenance | MaD:4 |
3434
| B.java:39:5:39:7 | inp : HashMap [<map.value>] : String | B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | provenance | MaD:5 |
3535
| B.java:39:5:39:7 | inp : HashMap [<map.value>] : String | B.java:39:23:39:27 | value : String | provenance | MaD:5 |
36+
| B.java:39:17:39:56 | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | B.java:39:17:39:56 | out [Reverse] : Map [<map.key>] : String | provenance | |
37+
| B.java:39:17:39:56 | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | B.java:39:17:39:56 | out [Reverse] : Map [<map.value>] : String | provenance | |
38+
| B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | B.java:39:17:39:56 | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | provenance | |
3639
| B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | B.java:39:17:39:56 | out : Map [<map.key>] : String | provenance | |
40+
| B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | B.java:39:17:39:56 | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | provenance | |
3741
| B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | B.java:39:17:39:56 | out : Map [<map.value>] : String | provenance | |
3842
| B.java:39:17:39:56 | out : Map [<map.key>] : String | B.java:38:48:38:70 | out [Reverse] : Map [<map.key>] : String | provenance | |
3943
| B.java:39:17:39:56 | out : Map [<map.value>] : String | B.java:38:48:38:70 | out [Reverse] : Map [<map.value>] : String | provenance | |
44+
| B.java:39:17:39:56 | out [Reverse] : Map [<map.key>] : String | B.java:38:48:38:70 | out [Reverse] : Map [<map.key>] : String | provenance | |
45+
| B.java:39:17:39:56 | out [Reverse] : Map [<map.value>] : String | B.java:38:48:38:70 | out [Reverse] : Map [<map.value>] : String | provenance | |
4046
| B.java:39:18:39:20 | key : String | B.java:39:43:39:45 | key : String | provenance | |
4147
| B.java:39:23:39:27 | value : String | B.java:39:48:39:52 | value : String | provenance | |
4248
| B.java:39:35:39:37 | out [post update] : HashMap [<map.key>] : String | B.java:39:35:39:37 | this : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | provenance | |
@@ -68,12 +74,19 @@ edges
6874
| B.java:71:19:71:23 | other [post update] : B [elem] : String | B.java:74:10:74:14 | other : B [elem] : String | provenance | |
6975
| B.java:74:10:74:14 | other : B [elem] : String | B.java:74:10:74:19 | other.elem | provenance | |
7076
| B.java:77:22:77:28 | param [Reverse] : B [elem] : String | B.java:71:19:71:23 | other [post update] : B [elem] : String | provenance | |
77+
| B.java:78:18:81:5 | ...->... [Reverse] : new Runnable(...) { ... } [param, elem] : String | B.java:78:18:81:5 | param [Reverse] : B [elem] : String | provenance | |
78+
| B.java:78:18:81:5 | param [Reverse] : B [elem] : String | B.java:77:22:77:28 | param [Reverse] : B [elem] : String | provenance | |
7179
| B.java:78:18:81:5 | parameter this [Reverse] : new Runnable(...) { ... } [param, elem] : String | B.java:82:5:82:5 | r [post update] : new Runnable(...) { ... } [param, elem] : String | provenance | |
7280
| B.java:80:7:80:11 | param [post update] : B [elem] : String | B.java:80:7:80:11 | this : new Runnable(...) { ... } [param, elem] : String | provenance | |
7381
| B.java:80:7:80:11 | this : new Runnable(...) { ... } [param, elem] : String | B.java:78:18:81:5 | parameter this [Reverse] : new Runnable(...) { ... } [param, elem] : String | provenance | |
7482
| B.java:80:20:80:39 | source(...) : String | B.java:80:7:80:11 | param [post update] : B [elem] : String | provenance | |
7583
| B.java:82:5:82:5 | param : B [elem] : String | B.java:77:22:77:28 | param [Reverse] : B [elem] : String | provenance | |
84+
| B.java:82:5:82:5 | param [Reverse] : B [elem] : String | B.java:77:22:77:28 | param [Reverse] : B [elem] : String | provenance | |
85+
| B.java:82:5:82:5 | r [Reverse] : new Runnable(...) { ... } [param, elem] : String | B.java:78:18:81:5 | ...->... [Reverse] : new Runnable(...) { ... } [param, elem] : String | provenance | |
86+
| B.java:82:5:82:5 | r [Reverse] : new Runnable(...) { ... } [param, elem] : String | B.java:82:5:82:5 | param [Reverse] : B [elem] : String | provenance | |
87+
| B.java:82:5:82:5 | r [post update] : new Runnable(...) { ... } [param, elem] : String | B.java:78:18:81:5 | ...->... [Reverse] : new Runnable(...) { ... } [param, elem] : String | provenance | |
7688
| B.java:82:5:82:5 | r [post update] : new Runnable(...) { ... } [param, elem] : String | B.java:82:5:82:5 | param : B [elem] : String | provenance | |
89+
| B.java:82:5:82:5 | r [post update] : new Runnable(...) { ... } [param, elem] : String | B.java:82:5:82:5 | r [Reverse] : new Runnable(...) { ... } [param, elem] : String | provenance | |
7790
| B.java:88:22:88:44 | parameter this : new Runnable(...) { ... } [B b, elem] : String | B.java:88:35:88:35 | this : new Runnable(...) { ... } [B b, elem] : String | provenance | |
7891
| B.java:88:35:88:35 | b : B [elem] : String | B.java:88:35:88:40 | b.elem | provenance | |
7992
| B.java:88:35:88:35 | this : new Runnable(...) { ... } [B b, elem] : String | B.java:88:35:88:35 | b : B [elem] : String | provenance | |
@@ -325,10 +338,14 @@ nodes
325338
| B.java:38:48:38:70 | out [Reverse] : Map [<map.value>] : String | semmle.label | out [Reverse] : Map [<map.value>] : String |
326339
| B.java:39:5:39:7 | inp : HashMap [<map.key>] : String | semmle.label | inp : HashMap [<map.key>] : String |
327340
| B.java:39:5:39:7 | inp : HashMap [<map.value>] : String | semmle.label | inp : HashMap [<map.value>] : String |
341+
| B.java:39:17:39:56 | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | semmle.label | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String |
342+
| B.java:39:17:39:56 | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | semmle.label | ...->... [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String |
328343
| B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | semmle.label | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String |
329344
| B.java:39:17:39:56 | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | semmle.label | ...->... [post update] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String |
330345
| B.java:39:17:39:56 | out : Map [<map.key>] : String | semmle.label | out : Map [<map.key>] : String |
331346
| B.java:39:17:39:56 | out : Map [<map.value>] : String | semmle.label | out : Map [<map.value>] : String |
347+
| B.java:39:17:39:56 | out [Reverse] : Map [<map.key>] : String | semmle.label | out [Reverse] : Map [<map.key>] : String |
348+
| B.java:39:17:39:56 | out [Reverse] : Map [<map.value>] : String | semmle.label | out [Reverse] : Map [<map.value>] : String |
332349
| B.java:39:17:39:56 | parameter this [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String | semmle.label | parameter this [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.key>] : String |
333350
| B.java:39:17:39:56 | parameter this [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String | semmle.label | parameter this [Reverse] : new BiConsumer<String,String>(...) { ... } [out, <map.value>] : String |
334351
| B.java:39:18:39:20 | key : String | semmle.label | key : String |
@@ -364,11 +381,15 @@ nodes
364381
| B.java:74:10:74:14 | other : B [elem] : String | semmle.label | other : B [elem] : String |
365382
| B.java:74:10:74:19 | other.elem | semmle.label | other.elem |
366383
| B.java:77:22:77:28 | param [Reverse] : B [elem] : String | semmle.label | param [Reverse] : B [elem] : String |
384+
| B.java:78:18:81:5 | ...->... [Reverse] : new Runnable(...) { ... } [param, elem] : String | semmle.label | ...->... [Reverse] : new Runnable(...) { ... } [param, elem] : String |
385+
| B.java:78:18:81:5 | param [Reverse] : B [elem] : String | semmle.label | param [Reverse] : B [elem] : String |
367386
| B.java:78:18:81:5 | parameter this [Reverse] : new Runnable(...) { ... } [param, elem] : String | semmle.label | parameter this [Reverse] : new Runnable(...) { ... } [param, elem] : String |
368387
| B.java:80:7:80:11 | param [post update] : B [elem] : String | semmle.label | param [post update] : B [elem] : String |
369388
| B.java:80:7:80:11 | this : new Runnable(...) { ... } [param, elem] : String | semmle.label | this : new Runnable(...) { ... } [param, elem] : String |
370389
| B.java:80:20:80:39 | source(...) : String | semmle.label | source(...) : String |
371390
| B.java:82:5:82:5 | param : B [elem] : String | semmle.label | param : B [elem] : String |
391+
| B.java:82:5:82:5 | param [Reverse] : B [elem] : String | semmle.label | param [Reverse] : B [elem] : String |
392+
| B.java:82:5:82:5 | r [Reverse] : new Runnable(...) { ... } [param, elem] : String | semmle.label | r [Reverse] : new Runnable(...) { ... } [param, elem] : String |
372393
| B.java:82:5:82:5 | r [post update] : new Runnable(...) { ... } [param, elem] : String | semmle.label | r [post update] : new Runnable(...) { ... } [param, elem] : String |
373394
| B.java:88:22:88:44 | parameter this : new Runnable(...) { ... } [B b, elem] : String | semmle.label | parameter this : new Runnable(...) { ... } [B b, elem] : String |
374395
| B.java:88:35:88:35 | b : B [elem] : String | semmle.label | b : B [elem] : String |

‎java/ql/test/library-tests/dataflow/capture/test.expected

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
| A.java:14:14:14:16 | "A" : String | A.java:15:16:15:22 | get(...) : String |
44
| A.java:14:14:14:16 | "A" : String | A.java:18:8:18:15 | p : String |
55
| A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [p] |
6+
| A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | new (...) [pre constructor] [Reverse] : new A(...) { ... } [p] |
67
| A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | p : String |
78
| A.java:14:14:14:16 | "A" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [p] |
89
| A.java:14:14:14:16 | "A" : String | A.java:31:17:31:17 | this : new A(...) { ... } [p] |
@@ -20,6 +21,7 @@
2021
| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | phi(String s) : String |
2122
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | String s : String |
2223
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
24+
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) [pre constructor] [Reverse] : new A(...) { ... } [String s] |
2325
| A.java:21:11:21:13 | "B" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
2426
| A.java:21:11:21:13 | "B" : String | A.java:31:17:31:17 | this : new A(...) { ... } [String s] |
2527
| A.java:21:11:21:13 | "B" : String | A.java:32:26:32:26 | this : new A(...) { ... } [String s] |
@@ -36,6 +38,7 @@
3638
| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | phi(String s) : String |
3739
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | String s : String |
3840
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
41+
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) [pre constructor] [Reverse] : new A(...) { ... } [String s] |
3942
| A.java:23:11:23:13 | "C" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
4043
| A.java:23:11:23:13 | "C" : String | A.java:31:17:31:17 | this : new A(...) { ... } [String s] |
4144
| A.java:23:11:23:13 | "C" : String | A.java:32:26:32:26 | this : new A(...) { ... } [String s] |
@@ -46,7 +49,9 @@
4649
| A.java:23:11:23:13 | "C" : String | A.java:39:12:39:12 | String s : String |
4750
| A.java:23:11:23:13 | "C" : String | A.java:39:12:39:12 | a : new A(...) { ... } [String s] |
4851
| A.java:25:22:25:24 | "D" : String | A.java:4:5:4:7 | parameter this [Reverse] : Box [elem] |
52+
| A.java:25:22:25:24 | "D" : String | A.java:4:5:4:7 | this <constr(this)> [Reverse] : Box [elem] |
4953
| A.java:25:22:25:24 | "D" : String | A.java:4:9:4:16 | e : String |
54+
| A.java:25:22:25:24 | "D" : String | A.java:4:21:4:24 | this <.field> [Reverse] : Box [elem] |
5055
| A.java:25:22:25:24 | "D" : String | A.java:4:21:4:24 | this <.field> [post update] : Box [elem] |
5156
| A.java:25:22:25:24 | "D" : String | A.java:4:21:4:28 | ...=... : String |
5257
| A.java:25:22:25:24 | "D" : String | A.java:4:28:4:28 | e : String |
@@ -57,8 +62,10 @@
5762
| A.java:25:22:25:24 | "D" : String | A.java:15:16:15:16 | a : new A(...) { ... } [Box b1, ... (2)] |
5863
| A.java:25:22:25:24 | "D" : String | A.java:15:16:15:22 | get(...) : String |
5964
| A.java:25:22:25:24 | "D" : String | A.java:25:14:25:25 | new Box(...) : Box [elem] |
65+
| A.java:25:22:25:24 | "D" : String | A.java:25:14:25:25 | new Box(...) [pre constructor] [Reverse] : Box [elem] |
6066
| A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | Box b1 : Box [elem] |
6167
| A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [Box b1, ... (2)] |
68+
| A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | new (...) [pre constructor] [Reverse] : new A(...) { ... } [Box b1, ... (2)] |
6269
| A.java:25:22:25:24 | "D" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [Box b1, ... (2)] |
6370
| A.java:25:22:25:24 | "D" : String | A.java:31:17:31:17 | this : new A(...) { ... } [Box b1, ... (2)] |
6471
| A.java:25:22:25:24 | "D" : String | A.java:32:26:32:26 | this : new A(...) { ... } [Box b1, ... (2)] |
@@ -71,6 +78,7 @@
7178
| A.java:25:22:25:24 | "D" : String | A.java:39:12:39:12 | a : new A(...) { ... } [Box b1, ... (2)] |
7279
| A.java:27:16:27:18 | "E" : String | A.java:5:10:5:16 | parameter this [Reverse] : Box [elem] |
7380
| A.java:27:16:27:18 | "E" : String | A.java:5:18:5:25 | e : String |
81+
| A.java:27:16:27:18 | "E" : String | A.java:5:30:5:33 | this <.field> [Reverse] : Box [elem] |
7482
| A.java:27:16:27:18 | "E" : String | A.java:5:30:5:33 | this <.field> [post update] : Box [elem] |
7583
| A.java:27:16:27:18 | "E" : String | A.java:5:30:5:37 | ...=... : String |
7684
| A.java:27:16:27:18 | "E" : String | A.java:5:37:5:37 | e : String |
@@ -80,9 +88,11 @@
8088
| A.java:27:16:27:18 | "E" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [Box b2, ... (2)] |
8189
| A.java:27:16:27:18 | "E" : String | A.java:15:16:15:16 | a : new A(...) { ... } [Box b2, ... (2)] |
8290
| A.java:27:16:27:18 | "E" : String | A.java:15:16:15:22 | get(...) : String |
91+
| A.java:27:16:27:18 | "E" : String | A.java:27:5:27:6 | b2 [Reverse] : Box [elem] |
8392
| A.java:27:16:27:18 | "E" : String | A.java:27:5:27:6 | b2 [post update] : Box [elem] |
8493
| A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | Box b2 : Box [elem] |
8594
| A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [Box b2, ... (2)] |
95+
| A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | new (...) [pre constructor] [Reverse] : new A(...) { ... } [Box b2, ... (2)] |
8696
| A.java:27:16:27:18 | "E" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [Box b2, ... (2)] |
8797
| A.java:27:16:27:18 | "E" : String | A.java:31:17:31:17 | this : new A(...) { ... } [Box b2, ... (2)] |
8898
| A.java:27:16:27:18 | "E" : String | A.java:32:26:32:26 | this : new A(...) { ... } [Box b2, ... (2)] |

0 commit comments

Comments
 (0)