Skip to content

Commit a0e698f

Browse files
andersfugmannCopilot
andersfugmann
and
Copilot
committed
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>
1 parent 7ad6046 commit a0e698f

1,277 files changed

Lines changed: 2 additions & 33353 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ JS:
2020

2121
Kotlin:
2222
- java/kotlin-extractor/**/*
23-
- java/ql/test-kotlin*/**/*
23+
- java/ql/test-kotlin/**/*
2424

2525
Python:
2626
- python/**/*

‎CODEOWNERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
/swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
2929
/misc/codegen/ @github/codeql-swift
3030
/java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
31-
/java/ql/test-kotlin1/ @github/codeql-kotlin
32-
/java/ql/test-kotlin2/ @github/codeql-kotlin
31+
/java/ql/test-kotlin/ @github/codeql-kotlin
3332

3433
# Experimental CodeQL cryptography
3534
**/experimental/**/quantum/ @github/ps-codeql

java/ql/test-kotlin1/TestUtilities/InlineExpectationsTest.qll renamed to java/ql/test-kotlin/TestUtilities/InlineExpectationsTest.qll

File renamed without changes.

java/ql/test-kotlin1/TestUtilities/InlineFlowTest.qll renamed to java/ql/test-kotlin/TestUtilities/InlineFlowTest.qll

File renamed without changes.

java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll renamed to java/ql/test-kotlin/TestUtilities/internal/InlineExpectationsTestImpl.qll

File renamed without changes.

java/ql/test-kotlin1/library-tests/.gitignore renamed to java/ql/test-kotlin/library-tests/.gitignore

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.expected renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/Generated.expected

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.kt renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/Generated.kt

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.ql renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/Generated.ql

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/NonGenerated.kt renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/NonGenerated.kt

File renamed without changes.

0 commit comments

Comments
 (0)