diff --git a/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/DB-CHECK.expected b/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/DB-CHECK.expected deleted file mode 100644 index 88945cbfe9c..00000000000 --- a/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/DB-CHECK.expected +++ /dev/null @@ -1,3 +0,0 @@ -[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) - Relevant element: callee=44417 - Full ID for 44417: @"callable;(0).f((55))(55)". The ID may expand to @"callable;{@"class;Test"}.f({@"type;int"}){@"type;int"}" diff --git a/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.expected b/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.expected index cc0eefe745b..e78d827c621 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.expected @@ -2,9 +2,9 @@ exprs | Test.java:5:19:5:25 | Integer | Integer | | Test.java:5:38:5:44 | Integer | Integer | | Test.java:5:58:5:58 | p | Integer | -| user.kt:2:3:2:16 | x | int | +| user.kt:2:7:2:7 | x | int | | user.kt:2:11:2:11 | t | Test | -| user.kt:2:11:2:16 | | int | +| user.kt:2:11:2:16 | f(...) | Integer | | user.kt:2:13:2:16 | | int | | user.kt:2:13:2:16 | int | int | | user.kt:2:15:2:15 | 5 | int | diff --git a/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.expected b/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.expected index f6f038c3a54..c7e4cd1a99b 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.expected @@ -1,2 +1,2 @@ -| user.kt:3:14:3:22 | getF(...) | file:///!unknown-binary-location/lib/TestKt.class:0:0:0:0 | getF | -| user.kt:3:26:3:28 | getF(...) | file:///!unknown-binary-location/lib/TestKt.class:0:0:0:0 | getF | +| user.kt:3:14:3:22 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF | +| user.kt:3:26:3:28 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF | diff --git a/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/ExtractorInformation.expected b/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/ExtractorInformation.expected index d00ef5f0ec6..5e32cd7786e 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/ExtractorInformation.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/ExtractorInformation.expected @@ -9,4 +9,4 @@ | Percentage of calls with call target | 100 | | Total number of lines | 3 | | Total number of lines with extension kt | 3 | -| Uses Kotlin 2: true | 1 | +| Uses Kotlin 2: false | 1 | diff --git a/java/ql/integration-tests/kotlin/all-platforms/file_classes/classes.expected b/java/ql/integration-tests/kotlin/all-platforms/file_classes/classes.expected index 0a6713e54fa..ee1e95c031c 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/file_classes/classes.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/file_classes/classes.expected @@ -1,2 +1,3 @@ +| AKt.class:0:0:0:0 | AKt | true | | B.kt:0:0:0:0 | BKt | true | | C.kt:1:1:3:1 | C | false | diff --git a/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.expected b/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.expected index e69de29bb2d..618b3f29aa2 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.expected @@ -0,0 +1,4 @@ +| equals | Test | +| hashCode | Test | +| toString | Test | +| toString | java.lang.CharSequence | diff --git a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/DB-CHECK.expected b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/DB-CHECK.expected deleted file mode 100644 index e7233efeb8e..00000000000 --- a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/DB-CHECK.expected +++ /dev/null @@ -1,9 +0,0 @@ -[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) - Relevant element: callee=43828 - 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"}" -[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) - Relevant element: callee=43832 - 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"}" -[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) - Relevant element: callee=43837 - Full ID for 43837: @"callable;(0).((35),(35))(36)". The ID may expand to @"callable;{@"class;JavaDefns"}.({@"class;java.lang.Comparable;{@"wildcard;super{@"class;java.lang.CharSequence"}"}"},{@"class;java.lang.Comparable;{@"wildcard;super{@"class;java.lang.CharSequence"}"}"}){@"type;void"}" diff --git a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.expected b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.expected index 8d2508f5f57..cef0cf30632 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.expected @@ -8,16 +8,16 @@ | JavaDefns | takesComparable | invar | Comparable | | JavaDefns | takesNestedComparable | innerContravar | Comparable> | | JavaDefns | takesNestedComparable | outerContravar | Comparable> | -| JavaDefns2 | JavaDefns2 | p0 | Comparable | +| JavaDefns2 | JavaDefns2 | p0 | Comparable | | JavaDefns2 | JavaDefns2 | p1 | Comparable | | JavaDefns2 | returnsInvariant | return | Comparable | | JavaDefns2 | returnsWildcard | return | Comparable | -| JavaDefns2 | takesArrayOfComparable | p0 | Comparable[] | +| JavaDefns2 | takesArrayOfComparable | p0 | Comparable[] | | JavaDefns2 | takesArrayOfComparable | p1 | Comparable[] | -| JavaDefns2 | takesComparable | p0 | Comparable | +| JavaDefns2 | takesComparable | p0 | Comparable | | JavaDefns2 | takesComparable | p1 | Comparable | -| JavaDefns2 | takesNestedComparable | p0 | Comparable> | -| JavaDefns2 | takesNestedComparable | p1 | Comparable> | +| JavaDefns2 | takesNestedComparable | p0 | Comparable> | +| JavaDefns2 | takesNestedComparable | p1 | Comparable> | | KotlinDefns | returnsContravar | return | Comparable | | KotlinDefns | returnsContravarForced | return | Comparable | | KotlinDefns | returnsCovar | return | List | diff --git a/java/ql/test/library-tests/pathsanitizer/DB-CHECK.expected b/java/ql/test/library-tests/pathsanitizer/DB-CHECK.expected deleted file mode 100644 index 1dc731cf5e4..00000000000 --- a/java/ql/test/library-tests/pathsanitizer/DB-CHECK.expected +++ /dev/null @@ -1,16 +0,0 @@ -[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) - Relevant element: callee=79083 - Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}" -[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) - Relevant element: callee=79083 - Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}" -[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) - Relevant element: callee=79083 - Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}" -[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) - Relevant element: callee=79083 - Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}" -[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) - Relevant element: callee=79083 - Full ID for 79083: @"callable;(21913).toString()(64)". The ID may expand to @"callable;{@"class;java.nio.file.Path"}.toString(){@"class;java.lang.String"}" -[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 diff --git a/java/ql/test/library-tests/pathsanitizer/test.expected b/java/ql/test/library-tests/pathsanitizer/test.expected index f932152f4c1..e69de29bb2d 100644 --- a/java/ql/test/library-tests/pathsanitizer/test.expected +++ b/java/ql/test/library-tests/pathsanitizer/test.expected @@ -1,31 +0,0 @@ -| Test.java:137:22:137:27 | source | Unexpected result: hasTaintFlow | -| Test.java:141:35:141:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:148:22:148:27 | source | Unexpected result: hasTaintFlow | -| Test.java:152:35:152:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:159:22:159:27 | source | Unexpected result: hasTaintFlow | -| Test.java:163:35:163:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:178:35:178:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:181:35:181:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:189:35:189:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:192:35:192:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:200:35:200:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:203:35:203:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:362:22:362:27 | source | Unexpected result: hasTaintFlow | -| Test.java:366:35:366:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:373:22:373:27 | source | Unexpected result: hasTaintFlow | -| Test.java:377:35:377:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:384:22:384:27 | source | Unexpected result: hasTaintFlow | -| Test.java:388:35:388:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:402:22:402:27 | source | Unexpected result: hasTaintFlow | -| Test.java:406:35:406:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:413:22:413:27 | source | Unexpected result: hasTaintFlow | -| Test.java:417:35:417:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:424:22:424:27 | source | Unexpected result: hasTaintFlow | -| Test.java:428:35:428:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:436:22:436:27 | source | Unexpected result: hasTaintFlow | -| Test.java:440:35:440:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:447:22:447:27 | source | Unexpected result: hasTaintFlow | -| Test.java:451:35:451:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:458:22:458:27 | source | Unexpected result: hasTaintFlow | -| Test.java:462:35:462:51 | // $ hasTaintFlow | Missing result: hasTaintFlow | -| Test.java:604:31:604:47 | // $ hasTaintFlow | Missing result: hasTaintFlow | diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected index 828f2cfd4ae..e69de29bb2d 100644 --- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected +++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected @@ -1 +0,0 @@ -| CleartextStorageSharedPrefsTest.java:110:84:110:118 | // $ hasCleartextStorageSharedPrefs | Missing result: hasCleartextStorageSharedPrefs | diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/DB-CHECK.expected b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/DB-CHECK.expected deleted file mode 100644 index acfcf23f21b..00000000000 --- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/DB-CHECK.expected +++ /dev/null @@ -1,6 +0,0 @@ -[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 80453 of field callee is not in type @callable. Appears in tuple (-16773210,80453) - Relevant element: callee=80453 - Full ID for 80453: @"callable;(846).toString()(21)". The ID may expand to @"callable;{@"class;java.lang.CharSequence"}.toString(){@"class;java.lang.String"}" -[VALUE_NOT_IN_TYPE] predicate callableBinding(@caller callerid, @callable callee): Value 80453 of field callee is not in type @callable. Appears in tuple (-16773194,80453) - Relevant element: callee=80453 - Full ID for 80453: @"callable;(846).toString()(21)". The ID may expand to @"callable;{@"class;java.lang.CharSequence"}.toString(){@"class;java.lang.String"}"