Skip to content

Commit bcc6523

Browse files
owen-mcowen-mc
committed
Accept trivial test changes
1 parent ae3be0f commit bcc6523

File tree

35 files changed

+98
-98
lines changed

35 files changed

+98
-98
lines changed

‎java/ql/test/library-tests/controlflow/basic/bbStmts.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| Test.java:3:14:3:17 | { ... } | 0 | Test.java:3:14:3:17 | { ... } |
22
| Test.java:3:14:3:17 | { ... } | 1 | Test.java:3:14:3:17 | super(...) |
3-
| Test.java:3:14:3:17 | { ... } | 2 | Test.java:3:14:3:17 | Test |
4-
| Test.java:4:14:4:17 | test | 0 | Test.java:4:14:4:17 | test |
3+
| Test.java:3:14:3:17 | { ... } | 2 | Test.java:3:14:3:17 | Exit |
4+
| Test.java:4:14:4:17 | Exit | 0 | Test.java:4:14:4:17 | Exit |
55
| Test.java:4:21:76:2 | { ... } | 0 | Test.java:4:21:76:2 | { ... } |
66
| Test.java:4:21:76:2 | { ... } | 1 | Test.java:5:3:5:12 | var ...; |
77
| Test.java:4:21:76:2 | { ... } | 2 | Test.java:5:11:5:11 | 0 |

‎java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.expected‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| MultiCatch.java:6:14:6:23 | super(...) | MultiCatch.java:6:14:6:23 | MultiCatch |
1+
| MultiCatch.java:6:14:6:23 | super(...) | MultiCatch.java:6:14:6:23 | Exit |
22
| MultiCatch.java:6:14:6:23 | { ... } | MultiCatch.java:6:14:6:23 | super(...) |
33
| MultiCatch.java:8:2:20:2 | { ... } | MultiCatch.java:9:3:19:3 | try ... |
44
| MultiCatch.java:9:3:19:3 | try ... | MultiCatch.java:10:3:15:3 | { ... } |
@@ -16,7 +16,7 @@
1616
| MultiCatch.java:17:4:17:4 | e | MultiCatch.java:17:4:17:22 | printStackTrace(...) |
1717
| MultiCatch.java:17:4:17:22 | printStackTrace(...) | MultiCatch.java:18:10:18:10 | e |
1818
| MultiCatch.java:17:4:17:23 | <Expr>; | MultiCatch.java:17:4:17:4 | e |
19-
| MultiCatch.java:18:4:18:11 | throw ... | MultiCatch.java:7:14:7:23 | multiCatch |
19+
| MultiCatch.java:18:4:18:11 | throw ... | MultiCatch.java:7:14:7:23 | Exit |
2020
| MultiCatch.java:18:10:18:10 | e | MultiCatch.java:18:4:18:11 | throw ... |
2121
| MultiCatch.java:23:2:33:2 | { ... } | MultiCatch.java:24:3:32:4 | try ... |
2222
| MultiCatch.java:24:3:32:4 | try ... | MultiCatch.java:25:3:31:3 | { ... } |
@@ -31,12 +31,12 @@
3131
| MultiCatch.java:28:12:28:12 | c | MultiCatch.java:30:10:30:24 | new Exception(...) |
3232
| MultiCatch.java:29:5:29:29 | throw ... | MultiCatch.java:31:5:31:37 | catch (...) |
3333
| MultiCatch.java:29:11:29:28 | new SQLException(...) | MultiCatch.java:29:5:29:29 | throw ... |
34-
| MultiCatch.java:30:4:30:25 | throw ... | MultiCatch.java:22:14:22:24 | multiCatch2 |
34+
| MultiCatch.java:30:4:30:25 | throw ... | MultiCatch.java:22:14:22:24 | Exit |
3535
| MultiCatch.java:30:4:30:25 | throw ... | MultiCatch.java:31:5:31:37 | catch (...) |
3636
| MultiCatch.java:30:10:30:24 | new Exception(...) | MultiCatch.java:30:4:30:25 | throw ... |
3737
| MultiCatch.java:31:5:31:37 | catch (...) | MultiCatch.java:31:36:31:36 | e |
3838
| MultiCatch.java:31:36:31:36 | e | MultiCatch.java:32:3:32:4 | { ... } |
39-
| MultiCatch.java:32:3:32:4 | { ... } | MultiCatch.java:22:14:22:24 | multiCatch2 |
39+
| MultiCatch.java:32:3:32:4 | { ... } | MultiCatch.java:22:14:22:24 | Exit |
4040
| MultiCatch.java:36:2:42:2 | { ... } | MultiCatch.java:37:3:41:4 | try ... |
4141
| MultiCatch.java:37:3:41:4 | try ... | MultiCatch.java:38:3:40:3 | { ... } |
4242
| MultiCatch.java:38:3:40:3 | { ... } | MultiCatch.java:39:10:39:26 | new IOException(...) |
@@ -45,4 +45,4 @@
4545
| MultiCatch.java:39:10:39:26 | new IOException(...) | MultiCatch.java:40:5:40:22 | catch (...) |
4646
| MultiCatch.java:40:5:40:22 | catch (...) | MultiCatch.java:40:21:40:21 | e |
4747
| MultiCatch.java:40:21:40:21 | e | MultiCatch.java:41:3:41:4 | { ... } |
48-
| MultiCatch.java:41:3:41:4 | { ... } | MultiCatch.java:35:14:35:26 | ordinaryCatch |
48+
| MultiCatch.java:41:3:41:4 | { ... } | MultiCatch.java:35:14:35:26 | Exit |

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| Test.java:1:14:1:17 | super(...) | Test.java:1:14:1:17 | Test |
1+
| Test.java:1:14:1:17 | super(...) | Test.java:1:14:1:17 | Exit |
22
| Test.java:1:14:1:17 | { ... } | Test.java:1:14:1:17 | super(...) |
33
| Test.java:3:40:20:3 | { ... } | Test.java:5:5:5:34 | var ...; |
44
| Test.java:5:5:5:34 | var ...; | Test.java:5:26:5:33 | source(...) |
@@ -29,7 +29,7 @@
2929
| Test.java:11:12:11:12 | s | Test.java:11:7:11:13 | sink(...) |
3030
| Test.java:14:5:14:92 | if (...) | Test.java:14:9:14:9 | o |
3131
| Test.java:14:9:14:9 | o | Test.java:14:9:14:91 | ...instanceof... |
32-
| Test.java:14:9:14:91 | ...instanceof... | Test.java:3:22:3:25 | test |
32+
| Test.java:14:9:14:91 | ...instanceof... | Test.java:3:22:3:25 | Exit |
3333
| Test.java:14:9:14:91 | ...instanceof... | Test.java:14:41:14:47 | tainted |
3434
| Test.java:14:22:14:91 | Outer(...) | Test.java:14:94:18:5 | { ... } |
3535
| Test.java:14:28:14:67 | Inner(...) | Test.java:14:77:14:90 | alsoNotTainted |
@@ -43,15 +43,15 @@
4343
| Test.java:16:7:16:22 | sink(...) | Test.java:17:7:17:27 | <Expr>; |
4444
| Test.java:16:7:16:23 | <Expr>; | Test.java:16:12:16:21 | notTainted |
4545
| Test.java:16:12:16:21 | notTainted | Test.java:16:7:16:22 | sink(...) |
46-
| Test.java:17:7:17:26 | sink(...) | Test.java:3:22:3:25 | test |
46+
| Test.java:17:7:17:26 | sink(...) | Test.java:3:22:3:25 | Exit |
4747
| Test.java:17:7:17:27 | <Expr>; | Test.java:17:12:17:25 | alsoNotTainted |
4848
| Test.java:17:12:17:25 | alsoNotTainted | Test.java:17:7:17:26 | sink(...) |
4949
| Test.java:22:33:22:53 | { ... } | Test.java:22:42:22:50 | "tainted" |
50-
| Test.java:22:35:22:51 | return ... | Test.java:22:24:22:29 | source |
50+
| Test.java:22:35:22:51 | return ... | Test.java:22:24:22:29 | Exit |
5151
| Test.java:22:42:22:50 | "tainted" | Test.java:22:35:22:51 | return ... |
52-
| Test.java:23:40:23:42 | { ... } | Test.java:23:22:23:25 | sink |
52+
| Test.java:23:40:23:42 | { ... } | Test.java:23:22:23:25 | Exit |
5353
| Test.java:27:8:27:12 | ...=... | Test.java:27:8:27:12 | <Expr>; |
54-
| Test.java:27:8:27:12 | ...=... | Test.java:27:8:27:12 | Outer |
54+
| Test.java:27:8:27:12 | ...=... | Test.java:27:8:27:12 | Exit |
5555
| Test.java:27:8:27:12 | <Expr>; | Test.java:27:8:27:12 | this |
5656
| Test.java:27:8:27:12 | <Expr>; | Test.java:27:8:27:12 | this |
5757
| Test.java:27:8:27:12 | i | Test.java:27:8:27:12 | ...=... |
@@ -61,7 +61,7 @@
6161
| Test.java:27:8:27:12 | this | Test.java:27:8:27:12 | otherField |
6262
| Test.java:27:8:27:12 | { ... } | Test.java:27:8:27:12 | super(...) |
6363
| Test.java:28:8:28:12 | ...=... | Test.java:28:8:28:12 | <Expr>; |
64-
| Test.java:28:8:28:12 | ...=... | Test.java:28:8:28:12 | Inner |
64+
| Test.java:28:8:28:12 | ...=... | Test.java:28:8:28:12 | Exit |
6565
| Test.java:28:8:28:12 | <Expr>; | Test.java:28:8:28:12 | this |
6666
| Test.java:28:8:28:12 | <Expr>; | Test.java:28:8:28:12 | this |
6767
| Test.java:28:8:28:12 | nonTaintedField | Test.java:28:8:28:12 | ...=... |

‎java/ql/test/library-tests/pattern-instanceof/cfg.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import java
22

33
from ControlFlowNode cn
4-
where cn.getFile().getBaseName() = "Test.java"
4+
where cn.getLocation().getFile().getBaseName() = "Test.java"
55
select cn, cn.getASuccessor()

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
| Exhaustive.java:1:14:1:23 | super(...) | Exhaustive.java:1:14:1:23 | Exhaustive |
1+
| Exhaustive.java:1:14:1:23 | super(...) | Exhaustive.java:1:14:1:23 | Exit |
22
| Exhaustive.java:1:14:1:23 | { ... } | Exhaustive.java:1:14:1:23 | super(...) |
3-
| Exhaustive.java:3:8:3:8 | super(...) | Exhaustive.java:3:8:3:8 | E |
3+
| Exhaustive.java:3:8:3:8 | super(...) | Exhaustive.java:3:8:3:8 | Exit |
44
| Exhaustive.java:3:8:3:8 | { ... } | Exhaustive.java:3:8:3:8 | super(...) |
55
| Exhaustive.java:3:8:3:8 | { ... } | Exhaustive.java:3:12:3:12 | <Expr>; |
66
| Exhaustive.java:3:12:3:12 | ...=... | Exhaustive.java:3:15:3:15 | <Expr>; |
@@ -9,12 +9,12 @@
99
| Exhaustive.java:3:15:3:15 | ...=... | Exhaustive.java:3:18:3:18 | <Expr>; |
1010
| Exhaustive.java:3:15:3:15 | <Expr>; | Exhaustive.java:3:15:3:15 | new E(...) |
1111
| Exhaustive.java:3:15:3:15 | new E(...) | Exhaustive.java:3:15:3:15 | ...=... |
12-
| Exhaustive.java:3:18:3:18 | ...=... | Exhaustive.java:3:8:3:8 | <clinit> |
12+
| Exhaustive.java:3:18:3:18 | ...=... | Exhaustive.java:3:8:3:8 | Exit |
1313
| Exhaustive.java:3:18:3:18 | <Expr>; | Exhaustive.java:3:18:3:18 | new E(...) |
1414
| Exhaustive.java:3:18:3:18 | new E(...) | Exhaustive.java:3:18:3:18 | ...=... |
15-
| Exhaustive.java:5:15:5:15 | super(...) | Exhaustive.java:5:15:5:15 | X |
15+
| Exhaustive.java:5:15:5:15 | super(...) | Exhaustive.java:5:15:5:15 | Exit |
1616
| Exhaustive.java:5:15:5:15 | { ... } | Exhaustive.java:5:15:5:15 | super(...) |
17-
| Exhaustive.java:6:15:6:15 | super(...) | Exhaustive.java:6:15:6:15 | Y |
17+
| Exhaustive.java:6:15:6:15 | super(...) | Exhaustive.java:6:15:6:15 | Exit |
1818
| Exhaustive.java:6:15:6:15 | { ... } | Exhaustive.java:6:15:6:15 | super(...) |
1919
| Exhaustive.java:8:47:35:3 | { ... } | Exhaustive.java:11:5:11:14 | switch (...) |
2020
| Exhaustive.java:11:5:11:14 | switch (...) | Exhaustive.java:11:13:11:13 | o |
@@ -50,10 +50,10 @@
5050
| Exhaustive.java:30:13:30:13 | i | Exhaustive.java:31:7:31:15 | case <Pattern> |
5151
| Exhaustive.java:31:7:31:15 | case <Pattern> | Exhaustive.java:31:14:31:14 | <anonymous local variable> |
5252
| Exhaustive.java:31:7:31:15 | case <Pattern> | Exhaustive.java:32:7:32:15 | case <Pattern> |
53-
| Exhaustive.java:31:14:31:14 | <anonymous local variable> | Exhaustive.java:8:22:8:25 | test |
53+
| Exhaustive.java:31:14:31:14 | <anonymous local variable> | Exhaustive.java:8:22:8:25 | Exit |
5454
| Exhaustive.java:32:7:32:15 | case <Pattern> | Exhaustive.java:32:14:32:14 | <anonymous local variable> |
55-
| Exhaustive.java:32:14:32:14 | <anonymous local variable> | Exhaustive.java:8:22:8:25 | test |
56-
| Test.java:1:14:1:17 | super(...) | Test.java:1:14:1:17 | Test |
55+
| Exhaustive.java:32:14:32:14 | <anonymous local variable> | Exhaustive.java:8:22:8:25 | Exit |
56+
| Test.java:1:14:1:17 | super(...) | Test.java:1:14:1:17 | Exit |
5757
| Test.java:1:14:1:17 | { ... } | Test.java:1:14:1:17 | super(...) |
5858
| Test.java:3:41:134:3 | { ... } | Test.java:5:6:5:19 | switch (...) |
5959
| Test.java:5:6:5:19 | switch (...) | Test.java:5:14:5:18 | thing |
@@ -380,9 +380,9 @@
380380
| Test.java:130:8:130:21 | case <Pattern> | Test.java:130:20:130:20 | <anonymous local variable> |
381381
| Test.java:130:8:130:21 | case <Pattern> | Test.java:131:8:131:15 | default |
382382
| Test.java:130:20:130:20 | <anonymous local variable> | Test.java:131:8:131:15 | default |
383-
| Test.java:131:8:131:15 | default | Test.java:3:22:3:25 | test |
383+
| Test.java:131:8:131:15 | default | Test.java:3:22:3:25 | Exit |
384384
| Test.java:138:8:138:8 | ...=... | Test.java:138:8:138:8 | <Expr>; |
385-
| Test.java:138:8:138:8 | ...=... | Test.java:138:8:138:8 | A |
385+
| Test.java:138:8:138:8 | ...=... | Test.java:138:8:138:8 | Exit |
386386
| Test.java:138:8:138:8 | <Expr>; | Test.java:138:8:138:8 | this |
387387
| Test.java:138:8:138:8 | <Expr>; | Test.java:138:8:138:8 | this |
388388
| Test.java:138:8:138:8 | b | Test.java:138:8:138:8 | ...=... |
@@ -392,7 +392,7 @@
392392
| Test.java:138:8:138:8 | this | Test.java:138:8:138:8 | field3 |
393393
| Test.java:138:8:138:8 | { ... } | Test.java:138:8:138:8 | super(...) |
394394
| Test.java:139:8:139:8 | ...=... | Test.java:139:8:139:8 | <Expr>; |
395-
| Test.java:139:8:139:8 | ...=... | Test.java:139:8:139:8 | B |
395+
| Test.java:139:8:139:8 | ...=... | Test.java:139:8:139:8 | Exit |
396396
| Test.java:139:8:139:8 | <Expr>; | Test.java:139:8:139:8 | this |
397397
| Test.java:139:8:139:8 | <Expr>; | Test.java:139:8:139:8 | this |
398398
| Test.java:139:8:139:8 | field1 | Test.java:139:8:139:8 | ...=... |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import java
22

33
from ControlFlowNode cn
4-
where cn.getFile().getBaseName() = ["Test.java", "Exhaustive.java"]
4+
where cn.getLocation().getFile().getBaseName() = ["Test.java", "Exhaustive.java"]
55
select cn, cn.getASuccessor()

‎java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| CloseReaderTest.java:8:14:8:28 | super(...) | CloseReaderTest.java:8:14:8:28 | CloseReaderTest |
1+
| CloseReaderTest.java:8:14:8:28 | super(...) | CloseReaderTest.java:8:14:8:28 | Exit |
22
| CloseReaderTest.java:8:14:8:28 | { ... } | CloseReaderTest.java:8:14:8:28 | super(...) |
33
| CloseReaderTest.java:10:2:24:2 | { ... } | CloseReaderTest.java:12:3:13:42 | <Expr>; |
44
| CloseReaderTest.java:12:3:12:12 | System.out | CloseReaderTest.java:12:20:12:40 | "Enter password for " |
@@ -19,12 +19,12 @@
1919
| CloseReaderTest.java:16:5:16:13 | System.in | CloseReaderTest.java:15:45:16:14 | new InputStreamReader(...) |
2020
| CloseReaderTest.java:17:3:23:3 | try ... | CloseReaderTest.java:18:3:20:3 | { ... } |
2121
| CloseReaderTest.java:18:3:20:3 | { ... } | CloseReaderTest.java:19:11:19:15 | stdin |
22-
| CloseReaderTest.java:19:4:19:27 | return ... | CloseReaderTest.java:9:23:9:34 | readPassword |
22+
| CloseReaderTest.java:19:4:19:27 | return ... | CloseReaderTest.java:9:23:9:34 | Exit |
2323
| CloseReaderTest.java:19:11:19:15 | stdin | CloseReaderTest.java:19:11:19:26 | readLine(...) |
2424
| CloseReaderTest.java:19:11:19:26 | readLine(...) | CloseReaderTest.java:19:4:19:27 | return ... |
2525
| CloseReaderTest.java:19:11:19:26 | readLine(...) | CloseReaderTest.java:20:5:20:26 | catch (...) |
2626
| CloseReaderTest.java:20:5:20:26 | catch (...) | CloseReaderTest.java:20:24:20:25 | ex |
2727
| CloseReaderTest.java:20:24:20:25 | ex | CloseReaderTest.java:21:3:23:3 | { ... } |
2828
| CloseReaderTest.java:21:3:23:3 | { ... } | CloseReaderTest.java:22:11:22:14 | null |
29-
| CloseReaderTest.java:22:4:22:15 | return ... | CloseReaderTest.java:9:23:9:34 | readPassword |
29+
| CloseReaderTest.java:22:4:22:15 | return ... | CloseReaderTest.java:9:23:9:34 | Exit |
3030
| CloseReaderTest.java:22:11:22:14 | null | CloseReaderTest.java:22:4:22:15 | return ... |

‎java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ from ControlFlowNode n, ControlFlowNode succ
44
where
55
succ = n.getASuccessor() and
66
n.getLocation().getFile().getExtension() = "java" and
7-
not n.getFile().getStem() = "PopulateRuntimeException"
7+
not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
88
select n, succ

‎java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| LoopVarReadTest.java:3:14:3:28 | super(...) | LoopVarReadTest.java:3:14:3:28 | LoopVarReadTest |
1+
| LoopVarReadTest.java:3:14:3:28 | super(...) | LoopVarReadTest.java:3:14:3:28 | Exit |
22
| LoopVarReadTest.java:3:14:3:28 | { ... } | LoopVarReadTest.java:3:14:3:28 | super(...) |
33
| LoopVarReadTest.java:5:2:15:2 | { ... } | LoopVarReadTest.java:6:3:6:12 | var ...; |
44
| LoopVarReadTest.java:6:3:6:12 | var ...; | LoopVarReadTest.java:6:11:6:11 | 2 |
@@ -23,6 +23,6 @@
2323
| LoopVarReadTest.java:12:7:12:12 | q | LoopVarReadTest.java:14:3:14:28 | <Expr>; |
2424
| LoopVarReadTest.java:12:11:12:12 | 10 | LoopVarReadTest.java:12:7:12:12 | q |
2525
| LoopVarReadTest.java:14:3:14:12 | System.out | LoopVarReadTest.java:14:22:14:26 | "foo" |
26-
| LoopVarReadTest.java:14:3:14:27 | println(...) | LoopVarReadTest.java:4:21:4:28 | testLoop |
26+
| LoopVarReadTest.java:14:3:14:27 | println(...) | LoopVarReadTest.java:4:21:4:28 | Exit |
2727
| LoopVarReadTest.java:14:3:14:28 | <Expr>; | LoopVarReadTest.java:14:3:14:12 | System.out |
2828
| LoopVarReadTest.java:14:22:14:26 | "foo" | LoopVarReadTest.java:14:3:14:27 | println(...) |

‎java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ from ControlFlowNode n, ControlFlowNode succ
44
where
55
succ = n.getASuccessor() and
66
n.getLocation().getFile().getExtension() = "java" and
7-
not n.getFile().getStem() = "PopulateRuntimeException"
7+
not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
88
select n, succ

0 commit comments

Comments
 (0)