From aa0ddeb29ad8b85f78744cb6dcba6842ded36558 Mon Sep 17 00:00:00 2001 From: Tamas Vajk Date: Wed, 22 Dec 2021 11:29:41 +0100 Subject: [PATCH] Fix external type locations in tests --- java/ql/test/kotlin/library-tests/classes/paramTypes.ql | 2 +- .../test/kotlin/library-tests/classes/superTypes.expected | 6 +++--- java/ql/test/kotlin/library-tests/classes/superTypes.ql | 2 +- java/ql/test/kotlin/library-tests/extensions/methods.ql | 2 +- .../kotlin/library-tests/multiple_files/method_accesses.ql | 2 +- .../library-tests/type_equivalences/type_equivalences.ql | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/ql/test/kotlin/library-tests/classes/paramTypes.ql b/java/ql/test/kotlin/library-tests/classes/paramTypes.ql index 1ab641c4ef4..334843ca576 100644 --- a/java/ql/test/kotlin/library-tests/classes/paramTypes.ql +++ b/java/ql/test/kotlin/library-tests/classes/paramTypes.ql @@ -1,7 +1,7 @@ import java // Stop external filepaths from appearing in the results -class ClassLocation extends Class { +class ClassOrInterfaceLocation extends ClassOrInterface { override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) { exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) | diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.expected b/java/ql/test/kotlin/library-tests/classes/superTypes.expected index 48ada4efa6b..b2ba5229c17 100644 --- a/java/ql/test/kotlin/library-tests/classes/superTypes.expected +++ b/java/ql/test/kotlin/library-tests/classes/superTypes.expected @@ -45,11 +45,11 @@ | local_anonymous.kt:3:1:28:1 | Class1 | file:///Object.class:0:0:0:0 | Object | | local_anonymous.kt:5:16:7:9 | new Object(...) { ... } | file:///Object.class:0:0:0:0 | Object | | local_anonymous.kt:11:9:11:24 | new Object(...) { ... } | file:///Object.class:0:0:0:0 | Object | -| local_anonymous.kt:16:23:16:49 | new Function2(...) { ... } | file:///usr/local/Cellar/kotlin/1.5.21/libexec/lib/kotlin-stdlib.jar/kotlin/jvm/functions/Function2.class:0:0:0:0 | Function2 | +| local_anonymous.kt:16:23:16:49 | new Function2(...) { ... } | file:///Function2.class:0:0:0:0 | Function2 | | local_anonymous.kt:16:23:16:49 | new Function2(...) { ... } | file:///Object.class:0:0:0:0 | Object | -| local_anonymous.kt:17:23:17:49 | new Function2(...) { ... } | file:///usr/local/Cellar/kotlin/1.5.21/libexec/lib/kotlin-stdlib.jar/kotlin/jvm/functions/Function2.class:0:0:0:0 | Function2 | +| local_anonymous.kt:17:23:17:49 | new Function2(...) { ... } | file:///Function2.class:0:0:0:0 | Function2 | | local_anonymous.kt:17:23:17:49 | new Function2(...) { ... } | file:///Object.class:0:0:0:0 | Object | -| local_anonymous.kt:21:21:21:31 | new Function1(...) { ... } | file:///usr/local/Cellar/kotlin/1.5.21/libexec/lib/kotlin-stdlib.jar/kotlin/jvm/functions/Function1.class:0:0:0:0 | Function1 | +| local_anonymous.kt:21:21:21:31 | new Function1(...) { ... } | file:///Function1.class:0:0:0:0 | Function1 | | local_anonymous.kt:21:21:21:31 | new Function1(...) { ... } | file:///Object.class:0:0:0:0 | Object | | local_anonymous.kt:25:9:25:27 | LocalClass | file:///Object.class:0:0:0:0 | Object | | superChain.kt:1:1:1:33 | SuperChain1 | file:///Object.class:0:0:0:0 | Object | diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.ql b/java/ql/test/kotlin/library-tests/classes/superTypes.ql index 782677e8b50..2277deba79c 100644 --- a/java/ql/test/kotlin/library-tests/classes/superTypes.ql +++ b/java/ql/test/kotlin/library-tests/classes/superTypes.ql @@ -1,7 +1,7 @@ import java // Stop external filepaths from appearing in the results -class ClassLocation extends Class { +class ClassOrInterfaceLocation extends ClassOrInterface { override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) { exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) | diff --git a/java/ql/test/kotlin/library-tests/extensions/methods.ql b/java/ql/test/kotlin/library-tests/extensions/methods.ql index 8a7415f8437..2edb2d41a8d 100644 --- a/java/ql/test/kotlin/library-tests/extensions/methods.ql +++ b/java/ql/test/kotlin/library-tests/extensions/methods.ql @@ -1,7 +1,7 @@ import java // Stop external filepaths from appearing in the results -class ClassLocation extends Class { +class ClassOrInterfaceLocation extends ClassOrInterface { override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) { exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) | diff --git a/java/ql/test/kotlin/library-tests/multiple_files/method_accesses.ql b/java/ql/test/kotlin/library-tests/multiple_files/method_accesses.ql index ce9c032bb0c..2788b72275b 100644 --- a/java/ql/test/kotlin/library-tests/multiple_files/method_accesses.ql +++ b/java/ql/test/kotlin/library-tests/multiple_files/method_accesses.ql @@ -1,7 +1,7 @@ import java // Stop external filepaths from appearing in the results -class ClassLocation extends Class { +class ClassOrInterfaceLocation extends ClassOrInterface { override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) { exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) | diff --git a/java/ql/test/kotlin/library-tests/type_equivalences/type_equivalences.ql b/java/ql/test/kotlin/library-tests/type_equivalences/type_equivalences.ql index 0f66cacd012..c6160638516 100644 --- a/java/ql/test/kotlin/library-tests/type_equivalences/type_equivalences.ql +++ b/java/ql/test/kotlin/library-tests/type_equivalences/type_equivalences.ql @@ -1,7 +1,7 @@ import java // Stop external filepaths from appearing in the results -class ClassLocation extends Class { +class ClassOrInterfaceLocation extends ClassOrInterface { override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) { exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) |