unify Kotlin test suites: rename test-kotlin2 to test-kotlin

Rename java/ql/test-kotlin2 to java/ql/test-kotlin (codeql/java-kotlin-tests) and delete java/ql/test-kotlin1. The unified suite is the K2 test suite (test-kotlin2) with expected files already updated by the preceding extractor commits to converge K1 and K2 output. The suite runs in both language modes via the test runner: * K1 mode — CODEQL_KOTLIN_LEGACY_TEST_EXTRACTION_KOTLIN2 unset → -language-version 1.9 * K2 mode — CODEQL_KOTLIN_LEGACY_TEST_EXTRACTION_KOTLIN2=true → -language-version 2.0 Update CODEOWNERS and labeler.yml to reference test-kotlin. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-07-09 21:45:33 +02:00 · 2026-07-08 12:04:09 +02:00
parent 55b3a5264c
commit f458cd60ca
1277 changed files with 2 additions and 33403 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -20,7 +20,7 @@ JS:

 Kotlin:
  - java/kotlin-extractor/**/*
-  - java/ql/test-kotlin*/**/*
+  - java/ql/test-kotlin/**/*

 Python:
  - python/**/*
--- a/3
+++ b/3
@@ -28,8 +28,7 @@
 /swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
 /misc/codegen/ @github/codeql-swift
 /java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
-/java/ql/test-kotlin1/ @github/codeql-kotlin
-/java/ql/test-kotlin2/ @github/codeql-kotlin
+/java/ql/test-kotlin/ @github/codeql-kotlin

 # Experimental CodeQL cryptography
 **/experimental/**/quantum/ @github/ps-codeql
--- a/java/ql/test-kotlin1/TestUtilities/InlineExpectationsTest.qll
+++ b/java/ql/test-kotlin1/TestUtilities/InlineExpectationsTest.qll
--- a/java/ql/test-kotlin1/TestUtilities/InlineFlowTest.qll
+++ b/java/ql/test-kotlin1/TestUtilities/InlineFlowTest.qll
--- a/java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll
+++ b/java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll
--- a/java/ql/test-kotlin1/library-tests/.gitignore
+++ b/java/ql/test-kotlin1/library-tests/.gitignore
--- a/java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.expected
+++ b/java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.expected
--- a/java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.kt
+++ b/java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.kt
--- a/java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.ql
+++ b/java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.ql
--- a/java/ql/test-kotlin1/library-tests/GeneratedFiles/NonGenerated.kt
+++ b/java/ql/test-kotlin1/library-tests/GeneratedFiles/NonGenerated.kt
--- a/java/ql/test-kotlin1/library-tests/android_function_return_types/returnTypes.expected
+++ b/java/ql/test-kotlin1/library-tests/android_function_return_types/returnTypes.expected
--- a/java/ql/test-kotlin1/library-tests/android_function_return_types/returnTypes.ql
+++ b/java/ql/test-kotlin1/library-tests/android_function_return_types/returnTypes.ql
--- a/java/ql/test-kotlin1/library-tests/android_function_return_types/test.kt
+++ b/java/ql/test-kotlin1/library-tests/android_function_return_types/test.kt
--- a/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/PrintAst.expected
+++ b/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/PrintAst.expected
--- a/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/PrintAst.qlref
+++ b/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/PrintAst.qlref
--- a/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/test.expected
+++ b/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/test.expected
--- a/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/test.kt
+++ b/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/test.kt
--- a/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/test.ql
+++ b/java/ql/test-kotlin1/library-tests/annotation-accessor-result-type/test.ql
--- a/java/ql/test-kotlin1/library-tests/annotation_classes/Annot0j.java
+++ b/java/ql/test-kotlin1/library-tests/annotation_classes/Annot0j.java
--- a/java/ql/test-kotlin1/library-tests/annotation_classes/Annot1j.java
+++ b/java/ql/test-kotlin1/library-tests/annotation_classes/Annot1j.java
--- a/java/ql/test-kotlin2/library-tests/annotation_classes/PrintAst.expected
+++ b/java/ql/test-kotlin2/library-tests/annotation_classes/PrintAst.expected
--- a/java/ql/test-kotlin1/library-tests/annotation_classes/PrintAst.qlref
+++ b/java/ql/test-kotlin1/library-tests/annotation_classes/PrintAst.qlref
--- a/java/ql/test-kotlin2/library-tests/annotation_classes/classes.expected
+++ b/java/ql/test-kotlin2/library-tests/annotation_classes/classes.expected
--- a/java/ql/test-kotlin1/library-tests/annotation_classes/classes.ql
+++ b/java/ql/test-kotlin1/library-tests/annotation_classes/classes.ql
--- a/java/ql/test-kotlin1/library-tests/annotation_classes/def.kt
+++ b/java/ql/test-kotlin1/library-tests/annotation_classes/def.kt
--- a/java/ql/test-kotlin1/library-tests/annotation_classes/use.java
+++ b/java/ql/test-kotlin1/library-tests/annotation_classes/use.java
--- a/java/ql/test-kotlin1/library-tests/annotations/jvmName/Test.java
+++ b/java/ql/test-kotlin1/library-tests/annotations/jvmName/Test.java
--- a/java/ql/test-kotlin2/library-tests/annotations/jvmName/test.expected
+++ b/java/ql/test-kotlin2/library-tests/annotations/jvmName/test.expected
--- a/java/ql/test-kotlin1/library-tests/annotations/jvmName/test.kt
+++ b/java/ql/test-kotlin1/library-tests/annotations/jvmName/test.kt
--- a/java/ql/test-kotlin1/library-tests/annotations/jvmName/test.ql
+++ b/java/ql/test-kotlin1/library-tests/annotations/jvmName/test.ql
--- a/java/ql/test-kotlin1/library-tests/arrays-with-variances/User.java
+++ b/java/ql/test-kotlin1/library-tests/arrays-with-variances/User.java
--- a/java/ql/test-kotlin1/library-tests/arrays-with-variances/takesArrayList.kt
+++ b/java/ql/test-kotlin1/library-tests/arrays-with-variances/takesArrayList.kt
--- a/java/ql/test-kotlin1/library-tests/arrays-with-variances/test.expected
+++ b/java/ql/test-kotlin1/library-tests/arrays-with-variances/test.expected
--- a/java/ql/test-kotlin1/library-tests/arrays-with-variances/test.ql
+++ b/java/ql/test-kotlin1/library-tests/arrays-with-variances/test.ql
--- a/java/ql/test-kotlin2/library-tests/arrays/arrayAccesses.expected
+++ b/java/ql/test-kotlin2/library-tests/arrays/arrayAccesses.expected
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayAccesses.ql
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayAccesses.ql
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayCreations.expected
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayCreations.expected
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayCreations.kt
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayCreations.kt
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayCreations.ql
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayCreations.ql
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayGetsSets.kt
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayGetsSets.kt
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayIterators.expected
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayIterators.expected
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayIterators.kt
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayIterators.kt
--- a/java/ql/test-kotlin1/library-tests/arrays/arrayIterators.ql
+++ b/java/ql/test-kotlin1/library-tests/arrays/arrayIterators.ql
--- a/java/ql/test-kotlin2/library-tests/arrays/assignExprs.expected
+++ b/java/ql/test-kotlin2/library-tests/arrays/assignExprs.expected
--- a/java/ql/test-kotlin1/library-tests/arrays/assignExprs.ql
+++ b/java/ql/test-kotlin1/library-tests/arrays/assignExprs.ql
--- a/java/ql/test-kotlin1/library-tests/arrays/primitiveArrays.kt
+++ b/java/ql/test-kotlin1/library-tests/arrays/primitiveArrays.kt
--- a/java/ql/test-kotlin1/library-tests/arrays/test.expected
+++ b/java/ql/test-kotlin1/library-tests/arrays/test.expected
--- a/java/ql/test-kotlin1/library-tests/arrays/test.ql
+++ b/java/ql/test-kotlin1/library-tests/arrays/test.ql
--- a/java/ql/test-kotlin1/library-tests/call-int-to-char/test.expected
+++ b/java/ql/test-kotlin1/library-tests/call-int-to-char/test.expected
--- a/java/ql/test-kotlin1/library-tests/call-int-to-char/test.kt
+++ b/java/ql/test-kotlin1/library-tests/call-int-to-char/test.kt
--- a/java/ql/test-kotlin1/library-tests/call-int-to-char/test.ql
+++ b/java/ql/test-kotlin1/library-tests/call-int-to-char/test.ql
--- a/java/ql/test-kotlin1/library-tests/clashing-extension-fields/test.expected
+++ b/java/ql/test-kotlin1/library-tests/clashing-extension-fields/test.expected
--- a/java/ql/test-kotlin1/library-tests/clashing-extension-fields/test.kt
+++ b/java/ql/test-kotlin1/library-tests/clashing-extension-fields/test.kt
--- a/java/ql/test-kotlin1/library-tests/clashing-extension-fields/test.ql
+++ b/java/ql/test-kotlin1/library-tests/clashing-extension-fields/test.ql
--- a/java/ql/test-kotlin2/library-tests/classes/PrintAst.expected
+++ b/java/ql/test-kotlin2/library-tests/classes/PrintAst.expected
--- a/java/ql/test-kotlin1/library-tests/classes/PrintAst.qlref
+++ b/java/ql/test-kotlin1/library-tests/classes/PrintAst.qlref
--- a/java/ql/test-kotlin1/library-tests/classes/anonymousClasses.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/anonymousClasses.expected
--- a/java/ql/test-kotlin1/library-tests/classes/anonymousClasses.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/anonymousClasses.ql
--- a/java/ql/test-kotlin1/library-tests/classes/classes.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/classes.expected
--- a/java/ql/test-kotlin1/library-tests/classes/classes.kt
+++ b/java/ql/test-kotlin1/library-tests/classes/classes.kt
--- a/java/ql/test-kotlin1/library-tests/classes/classes.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/classes.ql
--- a/java/ql/test-kotlin2/library-tests/classes/ctorCalls.expected
+++ b/java/ql/test-kotlin2/library-tests/classes/ctorCalls.expected
--- a/java/ql/test-kotlin1/library-tests/classes/ctorCalls.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/ctorCalls.ql
--- a/java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected
+++ b/java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected
--- a/java/ql/test-kotlin1/library-tests/classes/genericExprTypes.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/genericExprTypes.ql
--- a/java/ql/test-kotlin1/library-tests/classes/generic_anonymous.kt
+++ b/java/ql/test-kotlin1/library-tests/classes/generic_anonymous.kt
--- a/java/ql/test-kotlin1/library-tests/classes/interfaces.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/interfaces.expected
--- a/java/ql/test-kotlin1/library-tests/classes/interfaces.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/interfaces.ql
--- a/java/ql/test-kotlin1/library-tests/classes/localClass.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/localClass.expected
--- a/java/ql/test-kotlin1/library-tests/classes/localClass.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/localClass.ql
--- a/java/ql/test-kotlin1/library-tests/classes/localClassField.kt
+++ b/java/ql/test-kotlin1/library-tests/classes/localClassField.kt
--- a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.expected
--- a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.kt
+++ b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.kt
--- a/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/local_anonymous.ql
--- a/java/ql/test-kotlin1/library-tests/classes/paramTypes.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/paramTypes.expected
--- a/java/ql/test-kotlin1/library-tests/classes/paramTypes.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/paramTypes.ql
--- a/java/ql/test-kotlin1/library-tests/classes/superChain.kt
+++ b/java/ql/test-kotlin1/library-tests/classes/superChain.kt
--- a/java/ql/test-kotlin1/library-tests/classes/superTypes.expected
+++ b/java/ql/test-kotlin1/library-tests/classes/superTypes.expected
--- a/java/ql/test-kotlin1/library-tests/classes/superTypes.ql
+++ b/java/ql/test-kotlin1/library-tests/classes/superTypes.ql
--- a/java/ql/test-kotlin1/library-tests/collection-literals/PrintAst.expected
+++ b/java/ql/test-kotlin1/library-tests/collection-literals/PrintAst.expected
--- a/java/ql/test-kotlin1/library-tests/collection-literals/PrintAst.qlref
+++ b/java/ql/test-kotlin1/library-tests/collection-literals/PrintAst.qlref
--- a/java/ql/test-kotlin1/library-tests/collection-literals/test.kt
+++ b/java/ql/test-kotlin1/library-tests/collection-literals/test.kt
--- a/java/ql/test-kotlin2/library-tests/comments/comments.expected
+++ b/java/ql/test-kotlin2/library-tests/comments/comments.expected
--- a/java/ql/test-kotlin2/library-tests/comments/comments.kt
+++ b/java/ql/test-kotlin2/library-tests/comments/comments.kt
--- a/java/ql/test-kotlin1/library-tests/comments/comments.ql
+++ b/java/ql/test-kotlin1/library-tests/comments/comments.ql
--- a/java/ql/test-kotlin1/library-tests/companion_objects/accesses.expected
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/accesses.expected
--- a/java/ql/test-kotlin1/library-tests/companion_objects/accesses.ql
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/accesses.ql
--- a/java/ql/test-kotlin1/library-tests/companion_objects/companion_objects.expected
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/companion_objects.expected
--- a/java/ql/test-kotlin1/library-tests/companion_objects/companion_objects.kt
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/companion_objects.kt
--- a/java/ql/test-kotlin1/library-tests/companion_objects/companion_objects.ql
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/companion_objects.ql
--- a/java/ql/test-kotlin1/library-tests/companion_objects/method_accesses.expected
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/method_accesses.expected
--- a/java/ql/test-kotlin1/library-tests/companion_objects/method_accesses.ql
+++ b/java/ql/test-kotlin1/library-tests/companion_objects/method_accesses.ql
--- a/java/ql/test-kotlin2/library-tests/compilation-units/cus.expected
+++ b/java/ql/test-kotlin2/library-tests/compilation-units/cus.expected
--- a/java/ql/test-kotlin1/library-tests/compilation-units/cus.ql
+++ b/java/ql/test-kotlin1/library-tests/compilation-units/cus.ql
--- a/java/ql/test-kotlin1/library-tests/compilation-units/test.kt
+++ b/java/ql/test-kotlin1/library-tests/compilation-units/test.kt
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/Test.kt
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/Test.kt
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.ql
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.ql
--- a/Show More
+++ b/Show More