Skip to content

Commit 32847c1

Browse files
committed
Accept more test changes due to variable locations changing
There is also one non-location change: kotlin.Byte (and likely other primitives) now have real equals and toString overrides, which matches their native source and documentation; before they appeared to have fake overrides.
1 parent 8ec681e commit 32847c1

File tree

6 files changed

+39
-37
lines changed

6 files changed

+39
-37
lines changed

java/ql/test/kotlin/library-tests/comments/comments.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ commentOwners
2525
| comments.kt:19:5:22:7 | /**\n * Adds a [member] to this group.\n * @return the new size of the group.\n */ | comments.kt:23:5:26:5 | add |
2626
| comments.kt:35:5:35:34 | /** Medium is in the middle */ | comments.kt:36:5:36:14 | Medium |
2727
| comments.kt:37:5:37:23 | /** This is high */ | comments.kt:38:5:38:11 | High |
28-
| comments.kt:42:5:44:7 | /**\n * A variable.\n */ | comments.kt:45:5:45:13 | int a |
2928
| comments.kt:48:1:50:3 | /**\n * A type alias comment\n */ | comments.kt:51:1:51:24 | MyType |
3029
| comments.kt:54:5:56:7 | /**\n * An init block comment\n */ | comments.kt:53:1:58:1 | InitBlock |
3130
| comments.kt:61:5:63:7 | /**\n * A prop comment\n */ | comments.kt:64:5:68:17 | prop |
@@ -40,6 +39,7 @@ commentNoOwners
4039
| comments.kt:1:1:1:25 | /** Kdoc with no owner */ |
4140
| comments.kt:24:9:24:25 | // A line comment |
4241
| comments.kt:28:5:30:6 | /*\n A block comment\n */ |
42+
| comments.kt:42:5:44:7 | /**\n * A variable.\n */ |
4343
| comments.kt:95:1:95:163 | // Diagnostic Matches: % Couldn't get owner of KDoc. The comment is extracted without an owner. ...while extracting a file (comments.kt) at %comments.kt:1:1:96:0% |
4444
commentSections
4545
| comments.kt:1:1:1:25 | /** Kdoc with no owner */ | Kdoc with no owner |

java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
| Test.kt:2:43:79:2 | { ... } | Test.kt:3:9:3:18 | var ...; |
2-
| Test.kt:3:9:3:18 | var ...; | Test.kt:3:17:3:18 | px |
3-
| Test.kt:3:9:3:18 | x | Test.kt:4:9:4:18 | var ...; |
4-
| Test.kt:3:17:3:18 | px | Test.kt:3:9:3:18 | x |
5-
| Test.kt:4:9:4:18 | var ...; | Test.kt:4:17:4:18 | pw |
6-
| Test.kt:4:9:4:18 | w | Test.kt:5:9:5:18 | var ...; |
7-
| Test.kt:4:17:4:18 | pw | Test.kt:4:9:4:18 | w |
8-
| Test.kt:5:9:5:18 | var ...; | Test.kt:5:17:5:18 | pz |
9-
| Test.kt:5:9:5:18 | z | Test.kt:7:3:7:12 | var ...; |
10-
| Test.kt:5:17:5:18 | pz | Test.kt:5:9:5:18 | z |
11-
| Test.kt:7:3:7:12 | j | Test.kt:8:3:8:18 | var ...; |
12-
| Test.kt:7:3:7:12 | var ...; | Test.kt:7:3:7:12 | j |
13-
| Test.kt:8:3:8:18 | var ...; | Test.kt:8:17:8:18 | 50 |
14-
| Test.kt:8:3:8:18 | y | Test.kt:11:3:16:3 | <Expr>; |
15-
| Test.kt:8:17:8:18 | 50 | Test.kt:8:3:8:18 | y |
1+
| Test.kt:2:43:79:2 | { ... } | Test.kt:3:13:3:13 | var ...; |
2+
| Test.kt:3:13:3:13 | var ...; | Test.kt:3:17:3:18 | px |
3+
| Test.kt:3:13:3:13 | x | Test.kt:4:13:4:13 | var ...; |
4+
| Test.kt:3:17:3:18 | px | Test.kt:3:13:3:13 | x |
5+
| Test.kt:4:13:4:13 | var ...; | Test.kt:4:17:4:18 | pw |
6+
| Test.kt:4:13:4:13 | w | Test.kt:5:13:5:13 | var ...; |
7+
| Test.kt:4:17:4:18 | pw | Test.kt:4:13:4:13 | w |
8+
| Test.kt:5:13:5:13 | var ...; | Test.kt:5:17:5:18 | pz |
9+
| Test.kt:5:13:5:13 | z | Test.kt:7:7:7:7 | var ...; |
10+
| Test.kt:5:17:5:18 | pz | Test.kt:5:13:5:13 | z |
11+
| Test.kt:7:7:7:7 | j | Test.kt:8:7:8:7 | var ...; |
12+
| Test.kt:7:7:7:7 | var ...; | Test.kt:7:7:7:7 | j |
13+
| Test.kt:8:7:8:7 | var ...; | Test.kt:8:17:8:18 | 50 |
14+
| Test.kt:8:7:8:7 | y | Test.kt:11:3:16:3 | <Expr>; |
15+
| Test.kt:8:17:8:18 | 50 | Test.kt:8:7:8:7 | y |
1616
| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:3:16:3 | true |
1717
| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:7:11:7 | x |
1818
| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
@@ -111,11 +111,11 @@
111111
| Test.kt:77:3:77:8 | ...=... | Test.kt:78:10:78:10 | w |
112112
| Test.kt:77:7:77:8 | 40 | Test.kt:77:3:77:8 | ...=... |
113113
| Test.kt:78:10:78:10 | w | Test.kt:78:3:78:10 | return ... |
114-
| Test.kt:81:25:98:2 | { ... } | Test.kt:83:3:83:12 | var ...; |
115-
| Test.kt:83:3:83:12 | b | Test.kt:84:3:84:12 | var ...; |
116-
| Test.kt:83:3:83:12 | var ...; | Test.kt:83:3:83:12 | b |
117-
| Test.kt:84:3:84:12 | c | Test.kt:85:3:85:3 | <Expr>; |
118-
| Test.kt:84:3:84:12 | var ...; | Test.kt:84:3:84:12 | c |
114+
| Test.kt:81:25:98:2 | { ... } | Test.kt:83:7:83:7 | var ...; |
115+
| Test.kt:83:7:83:7 | b | Test.kt:84:7:84:7 | var ...; |
116+
| Test.kt:83:7:83:7 | var ...; | Test.kt:83:7:83:7 | b |
117+
| Test.kt:84:7:84:7 | c | Test.kt:85:3:85:3 | <Expr>; |
118+
| Test.kt:84:7:84:7 | var ...; | Test.kt:84:7:84:7 | c |
119119
| Test.kt:85:3:85:3 | <Expr>; | Test.kt:85:7:85:7 | 0 |
120120
| Test.kt:85:3:85:7 | ...=... | Test.kt:86:3:96:3 | while (...) |
121121
| Test.kt:85:7:85:7 | 0 | Test.kt:85:3:85:7 | ...=... |

java/ql/test/kotlin/library-tests/java-lang-number-conversions/test.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
| kotlin.Byte | describeConstable |
2929
| kotlin.Byte | div |
3030
| kotlin.Byte | doubleValue |
31+
| kotlin.Byte | equals |
3132
| kotlin.Byte | floatValue |
3233
| kotlin.Byte | inc |
3334
| kotlin.Byte | intValue |
@@ -39,6 +40,7 @@
3940
| kotlin.Byte | shortValue |
4041
| kotlin.Byte | times |
4142
| kotlin.Byte | toChar |
43+
| kotlin.Byte | toString |
4244
| kotlin.Byte | unaryMinus |
4345
| kotlin.Byte | unaryPlus |
4446
| kotlin.Number | byteValue |

0 commit comments

Comments
 (0)