Update control-flow test expectations

smowton · igfoo · commit dbb7b0bbf079 · 2022-05-10T19:51:19.000+01:00
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/bbStmts.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/bbStmts.expected
@@ -4,6 +4,7 @@
 | Test.kt:3:1:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
 | Test.kt:3:1:80:1 | { ... } | 2 | Test.kt:3:1:80:1 | <Expr>; |
 | Test.kt:3:1:80:1 | { ... } | 3 | Test.kt:3:1:80:1 | <obinit>(...) |
+| Test.kt:4:2:79:2 | test | 0 | Test.kt:4:2:79:2 | test |
 | Test.kt:4:13:79:2 | { ... } | 0 | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | 1 | Test.kt:5:3:5:16 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | 2 | Test.kt:5:16:5:16 | 0 |
@@ -103,7 +104,6 @@
 | Test.kt:43:3:43:3 | <Expr>; | 8 | Test.kt:77:3:77:3 | ...=... |
 | Test.kt:43:3:43:3 | <Expr>; | 9 | Test.kt:78:3:78:8 | INSTANCE |
 | Test.kt:43:3:43:3 | <Expr>; | 10 | Test.kt:78:3:78:8 | return ... |
-| Test.kt:43:3:43:3 | <Expr>; | 11 | Test.kt:4:2:79:2 | test |
 | Test.kt:82:1:89:1 | t1 | 0 | Test.kt:82:1:89:1 | t1 |
 | Test.kt:82:21:89:1 | { ... } | 0 | Test.kt:82:21:89:1 | { ... } |
 | Test.kt:82:21:89:1 | { ... } | 1 | Test.kt:83:2:88:2 | try ... |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -1,19 +1,24 @@
+| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | test |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:9:38:9 | x |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:2:79:2 | test |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:9:38:9 | x |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:4:2:79:2 | test |
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:38:9:38:9 | x | Test.kt:4:2:79:2 | test |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:4:2:79:2 | test |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | t1 |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/bbSuccessor.expected
@@ -2,11 +2,13 @@
 | Test.kt:11:3:16:3 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:4:2:79:2 | test |
 | Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:38:9:38:9 | x |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:4:2:79:2 | test |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:84:3:84:18 | x | Test.kt:82:1:89:1 | t1 |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
@@ -64,7 +64,7 @@
 | Test.kt:22:4:22:4 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:22:8:22:9 | 40 | LongLiteral | Test.kt:22:4:22:4 | ...=... | AssignExpr |
 | Test.kt:24:4:24:9 | INSTANCE | VarAccess | Test.kt:24:4:24:9 | return ... | ReturnStmt |
-| Test.kt:24:4:24:9 | return ... | ReturnStmt | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:24:4:24:9 | return ... | ReturnStmt | Test.kt:4:2:79:2 | test | Method |
 | Test.kt:27:3:27:3 | ...=... | AssignExpr | Test.kt:30:3:33:3 | <Expr>; | ExprStmt |
 | Test.kt:27:3:27:3 | <Expr>; | ExprStmt | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
 | Test.kt:27:3:27:3 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected b/java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected
@@ -131,14 +131,15 @@
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
 | Test.kt:92:4:93:9 | when ... | Test.kt:92:4:93:9 | ... -> ... |
 | Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
+| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | test2 |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
 | Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
+| Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
 | Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
 | Test.kt:94:4:95:12 | when ... | Test.kt:94:4:95:12 | ... -> ... |
 | Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
 | Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
 | Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
 | Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
-| Test.kt:97:3:97:10 | return ... | Test.kt:81:2:98:2 | test2 |
 | Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
