Skip to content

Commit 6636e45

Browse files
andersfugmannandersfugmann
committed
Kotlin: Accept column location changes in tests
1 parent 01731eb commit 6636e45

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎java/ql/integration-tests/kotlin/all-platforms/java_modifiers/test.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
| extlib.jar/extlib/A.class:0:0:0:0 | m | protected |
2-
| test.kt:4:3:4:22 | m | override, protected |
2+
| test.kt:4:12:4:22 | m | override, protected |

‎java/ql/integration-tests/kotlin/all-platforms/jvmoverloads-external-class/test.expected‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
| test.kt:3:3:3:45 | f | test.kt:3:23:3:32 | x |
2-
| test.kt:3:3:3:45 | f | test.kt:3:35:3:40 | y |
3-
| test.kt:3:3:3:45 | f | test.kt:3:35:3:40 | y |
4-
| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p0 |
5-
| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p1 |
6-
| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p2 |
7-
| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p3 |
8-
| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p4 |
1+
| test.kt:3:17:3:45 | f | test.kt:3:23:3:32 | x |
2+
| test.kt:3:17:3:45 | f | test.kt:3:35:3:40 | y |
3+
| test.kt:3:17:3:45 | f | test.kt:3:35:3:40 | y |
4+
| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p0 |
5+
| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p1 |
6+
| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p2 |
7+
| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p3 |
8+
| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p4 |

‎java/ql/integration-tests/kotlin/all-platforms/kotlin_java_static_fields/test.expected‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
edges
2-
| hasFields.kt:5:5:5:34 | constField : String | ReadsFields.java:5:10:5:29 | HasFields.constField | provenance | |
3-
| hasFields.kt:5:28:5:34 | "taint" : String | hasFields.kt:5:5:5:34 | constField : String | provenance | |
4-
| hasFields.kt:7:5:7:38 | <set-?> : String | hasFields.kt:7:5:7:38 | <set-?> : String | provenance | |
5-
| hasFields.kt:7:5:7:38 | <set-?> : String | hasFields.kt:7:5:7:38 | lateinitField : String | provenance | |
6-
| hasFields.kt:7:5:7:38 | lateinitField : String | ReadsFields.java:6:10:6:32 | HasFields.lateinitField | provenance | |
7-
| hasFields.kt:9:5:9:50 | jvmFieldAnnotatedField : String | ReadsFields.java:7:10:7:41 | HasFields.jvmFieldAnnotatedField | provenance | |
8-
| hasFields.kt:9:44:9:50 | "taint" : String | hasFields.kt:9:5:9:50 | jvmFieldAnnotatedField : String | provenance | |
9-
| hasFields.kt:14:21:14:27 | "taint" : String | hasFields.kt:7:5:7:38 | <set-?> : String | provenance | |
2+
| hasFields.kt:5:11:5:34 | constField : String | ReadsFields.java:5:10:5:29 | HasFields.constField | provenance | |
3+
| hasFields.kt:5:28:5:34 | "taint" : String | hasFields.kt:5:11:5:34 | constField : String | provenance | |
4+
| hasFields.kt:7:14:7:38 | <set-?> : String | hasFields.kt:7:14:7:38 | <set-?> : String | provenance | |
5+
| hasFields.kt:7:14:7:38 | <set-?> : String | hasFields.kt:7:14:7:38 | lateinitField : String | provenance | |
6+
| hasFields.kt:7:14:7:38 | lateinitField : String | ReadsFields.java:6:10:6:32 | HasFields.lateinitField | provenance | |
7+
| hasFields.kt:9:15:9:50 | jvmFieldAnnotatedField : String | ReadsFields.java:7:10:7:41 | HasFields.jvmFieldAnnotatedField | provenance | |
8+
| hasFields.kt:9:44:9:50 | "taint" : String | hasFields.kt:9:15:9:50 | jvmFieldAnnotatedField : String | provenance | |
9+
| hasFields.kt:14:21:14:27 | "taint" : String | hasFields.kt:7:14:7:38 | <set-?> : String | provenance | |
1010
nodes
1111
| ReadsFields.java:5:10:5:29 | HasFields.constField | semmle.label | HasFields.constField |
1212
| ReadsFields.java:6:10:6:32 | HasFields.lateinitField | semmle.label | HasFields.lateinitField |
1313
| ReadsFields.java:7:10:7:41 | HasFields.jvmFieldAnnotatedField | semmle.label | HasFields.jvmFieldAnnotatedField |
14-
| hasFields.kt:5:5:5:34 | constField : String | semmle.label | constField : String |
14+
| hasFields.kt:5:11:5:34 | constField : String | semmle.label | constField : String |
1515
| hasFields.kt:5:28:5:34 | "taint" : String | semmle.label | "taint" : String |
16-
| hasFields.kt:7:5:7:38 | <set-?> : String | semmle.label | <set-?> : String |
17-
| hasFields.kt:7:5:7:38 | <set-?> : String | semmle.label | <set-?> : String |
18-
| hasFields.kt:7:5:7:38 | lateinitField : String | semmle.label | lateinitField : String |
19-
| hasFields.kt:9:5:9:50 | jvmFieldAnnotatedField : String | semmle.label | jvmFieldAnnotatedField : String |
16+
| hasFields.kt:7:14:7:38 | <set-?> : String | semmle.label | <set-?> : String |
17+
| hasFields.kt:7:14:7:38 | <set-?> : String | semmle.label | <set-?> : String |
18+
| hasFields.kt:7:14:7:38 | lateinitField : String | semmle.label | lateinitField : String |
19+
| hasFields.kt:9:15:9:50 | jvmFieldAnnotatedField : String | semmle.label | jvmFieldAnnotatedField : String |
2020
| hasFields.kt:9:44:9:50 | "taint" : String | semmle.label | "taint" : String |
2121
| hasFields.kt:14:21:14:27 | "taint" : String | semmle.label | "taint" : String |
2222
subpaths

‎java/ql/integration-tests/kotlin/all-platforms/nullability-annotations/test.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
| ktUser.kt:0:0:0:0 | nullableAnnotated | parameter | ktUser.kt:0:0:0:0 | Nullable |
2323
| ktUser.kt:0:0:0:0 | nullableAnnotated | return value | ktUser.kt:0:0:0:0 | A |
2424
| ktUser.kt:0:0:0:0 | nullableAnnotated | return value | ktUser.kt:0:0:0:0 | Nullable |
25-
| ktUser.kt:5:3:5:105 | f | parameter | ktUser.kt:0:0:0:0 | NotNull |
26-
| ktUser.kt:5:3:5:105 | f | parameter | ktUser.kt:5:12:5:13 | A |
27-
| ktUser.kt:5:3:5:105 | f | return value | ktUser.kt:0:0:0:0 | NotNull |
28-
| ktUser.kt:5:3:5:105 | f | return value | ktUser.kt:5:3:5:4 | A |
25+
| ktUser.kt:5:6:5:105 | f | parameter | ktUser.kt:0:0:0:0 | NotNull |
26+
| ktUser.kt:5:6:5:105 | f | parameter | ktUser.kt:5:12:5:13 | A |
27+
| ktUser.kt:5:6:5:105 | f | return value | ktUser.kt:0:0:0:0 | NotNull |
28+
| ktUser.kt:5:6:5:105 | f | return value | ktUser.kt:5:3:5:4 | A |

‎java/ql/integration-tests/kotlin/posix/module_mangled_names/test.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
| User.java:3:21:3:24 | test |
2-
| test1.kt:3:3:3:22 | f$main |
3-
| test2.kt:3:3:3:22 | f$mymodule |
4-
| test3.kt:3:3:3:22 | f$reservedchars___ |
2+
| test1.kt:3:12:3:22 | f$main |
3+
| test2.kt:3:12:3:22 | f$mymodule |
4+
| test3.kt:3:12:3:22 | f$reservedchars___ |

0 commit comments

Comments
 (0)