Skip to content

Commit 547c78f

Browse files
andersfugmannandersfugmann
committed
Kotlin: refresh test expectations for 2.4
1 parent b9f2aff commit 547c78f

12 files changed

Lines changed: 76 additions & 15 deletions

File tree

‎java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/DB-CHECK.expected‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 44417 of field callee is not in type @callable. Appears in tuple (-16777158,44417)
2+
Relevant element: callee=44417
3+
Full ID for 44417: @"callable;(0).f((55))(55)". The ID may expand to @"callable;{@"class;Test"}.f({@"type;int"}){@"type;int"}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ exprs
22
| Test.java:5:19:5:25 | Integer | Integer |
33
| Test.java:5:38:5:44 | Integer | Integer |
44
| Test.java:5:58:5:58 | p | Integer |
5-
| user.kt:2:7:2:7 | x | int |
5+
| user.kt:2:3:2:16 | x | int |
66
| user.kt:2:11:2:11 | t | Test |
7-
| user.kt:2:11:2:16 | f(...) | Integer |
7+
| user.kt:2:11:2:16 | <Call to unknown method> | int |
88
| user.kt:2:13:2:16 | <implicit not null> | int |
99
| user.kt:2:13:2:16 | int | int |
1010
| user.kt:2:15:2:15 | 5 | int |

‎java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| user.kt:3:14:3:22 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF |
2-
| user.kt:3:26:3:28 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF |
1+
| user.kt:3:14:3:22 | getF(...) | file:///!unknown-binary-location/lib/TestKt.class:0:0:0:0 | getF |
2+
| user.kt:3:26:3:28 | getF(...) | file:///!unknown-binary-location/lib/TestKt.class:0:0:0:0 | getF |

‎java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/ExtractorInformation.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
| Percentage of calls with call target | 100 |
1010
| Total number of lines | 3 |
1111
| Total number of lines with extension kt | 3 |
12-
| Uses Kotlin 2: false | 1 |
12+
| Uses Kotlin 2: true | 1 |

‎java/ql/integration-tests/kotlin/all-platforms/file_classes/classes.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
| AKt.class:0:0:0:0 | AKt | true |
21
| B.kt:0:0:0:0 | BKt | true |
32
| C.kt:1:1:3:1 | C | false |

‎java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.expected‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
| equals | Test |
2-
| hashCode | Test |
3-
| toString | Test |
4-
| toString | java.lang.CharSequence |

‎java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/DB-CHECK.expected‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 43828 of field callee is not in type @callable. Appears in tuple (-16776213,43828)
2+
Relevant element: callee=43828
3+
Full ID for 43828: @"callable;(0).takesComparable((35),(35))(36)". The ID may expand to @"callable;{@"class;JavaDefns"}.takesComparable({@"class;java.lang.Comparable;{@"wildcard;super{@"class;java.lang.CharSequence"}"}"},{@"class;java.lang.Comparable;{@"wildcard;super{@"class;java.lang.CharSequence"}"}"}){@"type;void"}"
4+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 43832 of field callee is not in type @callable. Appears in tuple (-16776208,43832)
5+
Relevant element: callee=43832
6+
Full ID for 43832: @"callable;(0).takesArrayOfComparable((54),(54))(36)". The ID may expand to @"callable;{@"class;JavaDefns"}.takesArrayOfComparable({@"array;1;{@"class;java.lang.Comparable;{@"wildcard;super(19)"}"}"},{@"array;1;{@"class;java.lang.Comparable;{@"wildcard;super(19)"}"}"}){@"type;void"}"
7+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 43837 of field callee is not in type @callable. Appears in tuple (-16776201,43837)
8+
Relevant element: callee=43837
9+
Full ID for 43837: @"callable;(0).<init>((35),(35))(36)". The ID may expand to @"callable;{@"class;JavaDefns"}.<init>({@"class;java.lang.Comparable;{@"wildcard;super{@"class;java.lang.CharSequence"}"}"},{@"class;java.lang.Comparable;{@"wildcard;super{@"class;java.lang.CharSequence"}"}"}){@"type;void"}"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
| JavaDefns | takesComparable | invar | Comparable<CharSequence> |
99
| JavaDefns | takesNestedComparable | innerContravar | Comparable<Comparable<? super CharSequence>> |
1010
| JavaDefns | takesNestedComparable | outerContravar | Comparable<? super Comparable<CharSequence>> |
11-
| JavaDefns2 | JavaDefns2 | p0 | Comparable<CharSequence> |
11+
| JavaDefns2 | JavaDefns2 | p0 | Comparable<? super CharSequence> |
1212
| JavaDefns2 | JavaDefns2 | p1 | Comparable<? super CharSequence> |
1313
| JavaDefns2 | returnsInvariant | return | Comparable<CharSequence> |
1414
| JavaDefns2 | returnsWildcard | return | Comparable<? super CharSequence> |
15-
| JavaDefns2 | takesArrayOfComparable | p0 | Comparable<CharSequence>[] |
15+
| JavaDefns2 | takesArrayOfComparable | p0 | Comparable<? super CharSequence>[] |
1616
| JavaDefns2 | takesArrayOfComparable | p1 | Comparable<? super CharSequence>[] |
17-
| JavaDefns2 | takesComparable | p0 | Comparable<CharSequence> |
17+
| JavaDefns2 | takesComparable | p0 | Comparable<? super CharSequence> |
1818
| JavaDefns2 | takesComparable | p1 | Comparable<? super CharSequence> |
19-
| JavaDefns2 | takesNestedComparable | p0 | Comparable<Comparable<? super CharSequence>> |
20-
| JavaDefns2 | takesNestedComparable | p1 | Comparable<? super Comparable<CharSequence>> |
19+
| JavaDefns2 | takesNestedComparable | p0 | Comparable<? super Comparable<? super CharSequence>> |
20+
| JavaDefns2 | takesNestedComparable | p1 | Comparable<? super Comparable<? super CharSequence>> |
2121
| KotlinDefns | returnsContravar | return | Comparable<CharSequence> |
2222
| KotlinDefns | returnsContravarForced | return | Comparable<? super CharSequence> |
2323
| KotlinDefns | returnsCovar | return | List<CharSequence> |

‎java/ql/test/library-tests/pathsanitizer/DB-CHECK.expected‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 79083 of field callee is not in type @callable. Appears in tuple (-16776495,79083)
2+
Relevant element: callee=79083
3+
Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}"
4+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 79083 of field callee is not in type @callable. Appears in tuple (-16776429,79083)
5+
Relevant element: callee=79083
6+
Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}"
7+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 79083 of field callee is not in type @callable. Appears in tuple (-16776357,79083)
8+
Relevant element: callee=79083
9+
Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}"
10+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 79083 of field callee is not in type @callable. Appears in tuple (-16776266,79083)
11+
Relevant element: callee=79083
12+
Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}"
13+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 79083 of field callee is not in type @callable. Appears in tuple (-16776200,79083)
14+
Relevant element: callee=79083
15+
Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}"
16+
[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): More errors, not displayed. There are 16 values of field callee that are not in type @callable for a relation of size 1821

‎java/ql/test/library-tests/pathsanitizer/test.expected‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
| Test.java:137:22:137:27 | source | Unexpected result: hasTaintFlow |
2+
| Test.java:141:35:141:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
3+
| Test.java:148:22:148:27 | source | Unexpected result: hasTaintFlow |
4+
| Test.java:152:35:152:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
5+
| Test.java:159:22:159:27 | source | Unexpected result: hasTaintFlow |
6+
| Test.java:163:35:163:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
7+
| Test.java:178:35:178:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
8+
| Test.java:181:35:181:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
9+
| Test.java:189:35:189:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
10+
| Test.java:192:35:192:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
11+
| Test.java:200:35:200:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
12+
| Test.java:203:35:203:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
13+
| Test.java:362:22:362:27 | source | Unexpected result: hasTaintFlow |
14+
| Test.java:366:35:366:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
15+
| Test.java:373:22:373:27 | source | Unexpected result: hasTaintFlow |
16+
| Test.java:377:35:377:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
17+
| Test.java:384:22:384:27 | source | Unexpected result: hasTaintFlow |
18+
| Test.java:388:35:388:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
19+
| Test.java:402:22:402:27 | source | Unexpected result: hasTaintFlow |
20+
| Test.java:406:35:406:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
21+
| Test.java:413:22:413:27 | source | Unexpected result: hasTaintFlow |
22+
| Test.java:417:35:417:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
23+
| Test.java:424:22:424:27 | source | Unexpected result: hasTaintFlow |
24+
| Test.java:428:35:428:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
25+
| Test.java:436:22:436:27 | source | Unexpected result: hasTaintFlow |
26+
| Test.java:440:35:440:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
27+
| Test.java:447:22:447:27 | source | Unexpected result: hasTaintFlow |
28+
| Test.java:451:35:451:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
29+
| Test.java:458:22:458:27 | source | Unexpected result: hasTaintFlow |
30+
| Test.java:462:35:462:51 | // $ hasTaintFlow | Missing result: hasTaintFlow |
31+
| Test.java:604:31:604:47 | // $ hasTaintFlow | Missing result: hasTaintFlow |

0 commit comments

Comments
 (0)