Skip to content

Commit 2ade392

Browse files
aschackmullaschackmull
committed
Java: Accept test changes.
1 parent 7619984 commit 2ade392

File tree

7 files changed

+2
-37
lines changed

7 files changed

+2
-37
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
| A.java:14:14:14:16 | "A" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [p] |
21
| A.java:14:14:14:16 | "A" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [p] |
32
| A.java:14:14:14:16 | "A" : String | A.java:15:16:15:16 | a : new A(...) { ... } [p] |
43
| A.java:14:14:14:16 | "A" : String | A.java:15:16:15:22 | get(...) : String |
54
| A.java:14:14:14:16 | "A" : String | A.java:18:8:18:15 | p : String |
6-
| A.java:14:14:14:16 | "A" : String | A.java:18:25:40:3 | SSA def(p) : String |
7-
| A.java:14:14:14:16 | "A" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [p] |
85
| A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [p] |
96
| A.java:14:14:14:16 | "A" : String | A.java:28:11:38:5 | p : String |
107
| A.java:14:14:14:16 | "A" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [p] |
@@ -16,16 +13,12 @@
1613
| A.java:14:14:14:16 | "A" : String | A.java:35:26:35:27 | this : new A(...) { ... } [p] |
1714
| A.java:14:14:14:16 | "A" : String | A.java:39:12:39:12 | a : new A(...) { ... } [p] |
1815
| A.java:14:14:14:16 | "A" : String | A.java:39:12:39:12 | p : String |
19-
| A.java:21:11:21:13 | "B" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [String s] |
2016
| A.java:21:11:21:13 | "B" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
2117
| A.java:21:11:21:13 | "B" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
2218
| A.java:21:11:21:13 | "B" : String | A.java:15:16:15:22 | get(...) : String |
2319
| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | ...=... : String |
24-
| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | SSA def(s) : String |
25-
| A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | [input] SSA phi(s) : String |
2620
| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | SSA phi(s) : String |
2721
| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | phi(String s) : String |
28-
| A.java:21:11:21:13 | "B" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [String s] |
2922
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | String s : String |
3023
| A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
3124
| A.java:21:11:21:13 | "B" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -37,16 +30,12 @@
3730
| A.java:21:11:21:13 | "B" : String | A.java:35:26:35:27 | this : new A(...) { ... } [String s] |
3831
| A.java:21:11:21:13 | "B" : String | A.java:39:12:39:12 | String s : String |
3932
| A.java:21:11:21:13 | "B" : String | A.java:39:12:39:12 | a : new A(...) { ... } [String s] |
40-
| A.java:23:11:23:13 | "C" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [String s] |
4133
| A.java:23:11:23:13 | "C" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
4234
| A.java:23:11:23:13 | "C" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
4335
| A.java:23:11:23:13 | "C" : String | A.java:15:16:15:22 | get(...) : String |
4436
| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | ...=... : String |
45-
| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | SSA def(s) : String |
46-
| A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | [input] SSA phi(s) : String |
4737
| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | SSA phi(s) : String |
4838
| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | phi(String s) : String |
49-
| A.java:23:11:23:13 | "C" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [String s] |
5039
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | String s : String |
5140
| A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
5241
| A.java:23:11:23:13 | "C" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -60,20 +49,16 @@
6049
| A.java:23:11:23:13 | "C" : String | A.java:39:12:39:12 | a : new A(...) { ... } [String s] |
6150
| A.java:25:22:25:24 | "D" : String | A.java:4:5:4:7 | parameter this [Return] : Box [elem] |
6251
| A.java:25:22:25:24 | "D" : String | A.java:4:9:4:16 | e : String |
63-
| A.java:25:22:25:24 | "D" : String | A.java:4:19:4:31 | SSA def(e) : String |
6452
| A.java:25:22:25:24 | "D" : String | A.java:4:21:4:24 | this <.field> [post update] : Box [elem] |
6553
| A.java:25:22:25:24 | "D" : String | A.java:4:21:4:28 | ...=... : String |
6654
| A.java:25:22:25:24 | "D" : String | A.java:4:28:4:28 | e : String |
6755
| A.java:25:22:25:24 | "D" : String | A.java:6:12:6:18 | parameter this : Box [elem] |
6856
| A.java:25:22:25:24 | "D" : String | A.java:6:31:6:34 | elem : String |
6957
| A.java:25:22:25:24 | "D" : String | A.java:6:31:6:34 | this <.field> : Box [elem] |
70-
| A.java:25:22:25:24 | "D" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [Box b1, ... (2)] |
7158
| A.java:25:22:25:24 | "D" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [Box b1, ... (2)] |
7259
| A.java:25:22:25:24 | "D" : String | A.java:15:16:15:16 | a : new A(...) { ... } [Box b1, ... (2)] |
7360
| A.java:25:22:25:24 | "D" : String | A.java:15:16:15:22 | get(...) : String |
74-
| A.java:25:22:25:24 | "D" : String | A.java:25:9:25:25 | SSA def(b1) : Box [elem] |
7561
| A.java:25:22:25:24 | "D" : String | A.java:25:14:25:25 | new Box(...) : Box [elem] |
76-
| A.java:25:22:25:24 | "D" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [Box b1, ... (2)] |
7762
| A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | Box b1 : Box [elem] |
7863
| A.java:25:22:25:24 | "D" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [Box b1, ... (2)] |
7964
| A.java:25:22:25:24 | "D" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [Box b1, ... (2)] |
@@ -88,19 +73,16 @@
8873
| A.java:25:22:25:24 | "D" : String | A.java:39:12:39:12 | a : new A(...) { ... } [Box b1, ... (2)] |
8974
| A.java:27:16:27:18 | "E" : String | A.java:5:10:5:16 | parameter this [Return] : Box [elem] |
9075
| A.java:27:16:27:18 | "E" : String | A.java:5:18:5:25 | e : String |
91-
| A.java:27:16:27:18 | "E" : String | A.java:5:28:5:40 | SSA def(e) : String |
9276
| A.java:27:16:27:18 | "E" : String | A.java:5:30:5:33 | this <.field> [post update] : Box [elem] |
9377
| A.java:27:16:27:18 | "E" : String | A.java:5:30:5:37 | ...=... : String |
9478
| A.java:27:16:27:18 | "E" : String | A.java:5:37:5:37 | e : String |
9579
| A.java:27:16:27:18 | "E" : String | A.java:6:12:6:18 | parameter this : Box [elem] |
9680
| A.java:27:16:27:18 | "E" : String | A.java:6:31:6:34 | elem : String |
9781
| A.java:27:16:27:18 | "E" : String | A.java:6:31:6:34 | this <.field> : Box [elem] |
98-
| A.java:27:16:27:18 | "E" : String | A.java:14:7:14:20 | SSA def(a) : new A(...) { ... } [Box b2, ... (2)] |
9982
| A.java:27:16:27:18 | "E" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [Box b2, ... (2)] |
10083
| A.java:27:16:27:18 | "E" : String | A.java:15:16:15:16 | a : new A(...) { ... } [Box b2, ... (2)] |
10184
| A.java:27:16:27:18 | "E" : String | A.java:15:16:15:22 | get(...) : String |
10285
| A.java:27:16:27:18 | "E" : String | A.java:27:5:27:6 | b2 [post update] : Box [elem] |
103-
| A.java:27:16:27:18 | "E" : String | A.java:28:7:38:5 | SSA def(a) : new A(...) { ... } [Box b2, ... (2)] |
10486
| A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | Box b2 : Box [elem] |
10587
| A.java:27:16:27:18 | "E" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [Box b2, ... (2)] |
10688
| A.java:27:16:27:18 | "E" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [Box b2, ... (2)] |

‎java/ql/test/library-tests/dataflow/null/testnullflow.expected‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
| A.java:5:18:5:21 | null | A.java:2:13:2:20 | o |
2-
| A.java:5:18:5:21 | null | A.java:5:12:5:21 | SSA def(src) |
32
| A.java:5:18:5:21 | null | A.java:5:18:5:21 | null |
4-
| A.java:5:18:5:21 | null | A.java:6:12:6:18 | SSA def(x) |
53
| A.java:5:18:5:21 | null | A.java:6:16:6:18 | src |
64
| A.java:5:18:5:21 | null | A.java:7:10:7:10 | x |

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ edges
33
| A.java:12:14:12:18 | src(...) : Object | A.java:12:5:12:5 | b [post update] : Box [elem] |
44
| A.java:12:14:12:18 | src(...) : Object | A.java:12:5:12:18 | ...=... : Object |
55
| A.java:13:12:13:12 | b : Box [elem] | A.java:17:13:17:16 | f1(...) : Box [elem] |
6-
| A.java:17:9:17:16 | SSA def(b) : Box [elem] | A.java:18:8:18:8 | b : Box [elem] |
7-
| A.java:17:13:17:16 | f1(...) : Box [elem] | A.java:17:9:17:16 | SSA def(b) : Box [elem] |
6+
| A.java:17:13:17:16 | f1(...) : Box [elem] | A.java:18:8:18:8 | b : Box [elem] |
87
| A.java:18:8:18:8 | b : Box [elem] | A.java:21:11:21:15 | b : Box [elem] |
98
#select
109
| 0 | A.java:12:5:12:5 | b [post update] : Box [elem] |
1110
| 0 | A.java:12:5:12:18 | ...=... : Object |
1211
| 0 | A.java:13:12:13:12 | b : Box [elem] |
13-
| 1 | A.java:17:9:17:16 | SSA def(b) : Box [elem] |
1412
| 1 | A.java:17:13:17:16 | f1(...) : Box [elem] |
1513
| 1 | A.java:18:8:18:8 | b : Box [elem] |
1614
| 2 | A.java:21:11:21:15 | b : Box [elem] |

‎java/ql/test/library-tests/dataflow/partial/testRev.expected‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ edges
22
| A.java:4:16:4:18 | parameter this [Return] [elem] | A.java:22:17:22:25 | new Box(...) [elem] |
33
| A.java:4:16:4:18 | this <constr(this)> [post update] [elem] | A.java:4:16:4:18 | parameter this [Return] [elem] |
44
| A.java:5:19:5:22 | elem | A.java:24:10:24:19 | other.elem |
5-
| A.java:22:9:22:25 | SSA def(other) [elem] | A.java:23:13:23:17 | other [elem] |
6-
| A.java:22:17:22:25 | new Box(...) [elem] | A.java:22:9:22:25 | SSA def(other) [elem] |
5+
| A.java:22:17:22:25 | new Box(...) [elem] | A.java:23:13:23:17 | other [elem] |
76
| A.java:23:13:23:17 | other [elem] | A.java:24:10:24:14 | other [elem] |
87
| A.java:23:13:23:17 | other [post update] [elem] | A.java:24:10:24:14 | other [elem] |
98
| A.java:24:10:24:14 | other [elem] | A.java:24:10:24:19 | other.elem |
109
| A.java:27:16:27:20 | b [Return] [elem] | A.java:23:13:23:17 | other [post update] [elem] |
1110
| A.java:28:5:28:5 | b [post update] [elem] | A.java:27:16:27:20 | b [Return] [elem] |
1211
| A.java:28:14:28:25 | new Object(...) | A.java:28:5:28:5 | b [post update] [elem] |
1312
#select
14-
| 0 | A.java:22:9:22:25 | SSA def(other) [elem] |
1513
| 0 | A.java:22:17:22:25 | new Box(...) [elem] |
1614
| 0 | A.java:23:13:23:17 | other [elem] |
1715
| 0 | A.java:23:13:23:17 | other [post update] [elem] |

‎java/ql/test/library-tests/dataflow/switchexpr/switchexprflow.expected‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
| TestSwitchExpr.java:4:15:4:22 | o |
2-
| TestSwitchExpr.java:7:16:7:28 | SSA def(x1) |
32
| TestSwitchExpr.java:7:21:7:28 | source(...) |
4-
| TestSwitchExpr.java:8:16:8:30 | SSA def(x2) |
53
| TestSwitchExpr.java:8:21:8:30 | switch (...) |
64
| TestSwitchExpr.java:10:24:10:25 | x1 |
7-
| TestSwitchExpr.java:12:16:12:30 | SSA def(x3) |
85
| TestSwitchExpr.java:12:21:12:30 | switch (...) |
96
| TestSwitchExpr.java:13:38:13:39 | x2 |
10-
| TestSwitchExpr.java:16:16:16:30 | SSA def(x4) |
117
| TestSwitchExpr.java:16:21:16:30 | switch (...) |
128
| TestSwitchExpr.java:19:23:19:24 | x3 |
139
| TestSwitchExpr.java:23:14:23:15 | x4 |

‎java/ql/test/library-tests/dataflow/taint-ioutils/dataFlow.expected‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
| Test.java:12:15:12:47 | SSA def(inp) |
21
| Test.java:12:21:12:47 | new FileInputStream(...) |
32
| Test.java:14:21:14:39 | buffer(...) |
43
| Test.java:14:36:14:38 | inp |
5-
| Test.java:15:16:15:54 | SSA def(lines) |
64
| Test.java:15:24:15:54 | readLines(...) |
75
| Test.java:15:42:15:44 | inp |
86
| Test.java:16:18:16:45 | readFully(...) |
97
| Test.java:16:36:16:38 | inp |
108
| Test.java:17:22:17:55 | toBufferedInputStream(...) |
119
| Test.java:17:52:17:54 | inp |
12-
| Test.java:18:10:18:71 | SSA def(bufread) |
1310
| Test.java:18:20:18:71 | toBufferedReader(...) |
1411
| Test.java:18:45:18:70 | new InputStreamReader(...) |
1512
| Test.java:18:67:18:69 | inp |
1613
| Test.java:19:19:19:48 | toByteArray(...) |
1714
| Test.java:19:39:19:41 | inp |
18-
| Test.java:20:10:20:50 | SSA def(chars) |
1915
| Test.java:20:18:20:50 | toCharArray(...) |
2016
| Test.java:20:38:20:40 | inp |
21-
| Test.java:21:10:21:43 | SSA def(s) |
2217
| Test.java:21:14:21:43 | toString(...) |
2318
| Test.java:21:31:21:33 | inp |
2419
| Test.java:22:20:22:52 | toInputStream(...) |

‎java/ql/test/library-tests/dataflow/this-flow/this-flow.expected‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
| A.java:20:16:20:16 | this <.field> |
1111
| A.java:21:12:21:20 | getThis(...) |
1212
| A.java:21:12:21:20 | this <.method> |
13-
| A.java:25:7:25:17 | SSA def(a) |
1413
| A.java:25:11:25:17 | new A(...) |
1514
| A.java:25:11:25:17 | new A(...) [pre constructor] |
1615
| A.java:26:12:26:12 | a |
1716
| A.java:26:12:26:22 | getThis(...) |
1817
| A.java:26:12:26:36 | getThisWrap(...) |
19-
| A.java:27:7:27:17 | SSA def(c) |
2018
| A.java:27:11:27:17 | new C(...) |
2119
| A.java:27:11:27:17 | new C(...) [pre constructor] |
2220
| A.java:28:5:28:5 | c |

0 commit comments

Comments
 (0)