Skip to content

Kotlin: Update tests to use new kotlin_2_3_20 fixture #22048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jketema wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Kotlin: Update tests to use new kotlin_2_3_20 fixture #22048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
402c0f8
Kotlin: Update tests to use new `kotlin_2_3_20` fixture
jketema Jun 24, 2026
f6b3d1e
Kotlin: Remove unneeded pytest imports
jketema Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import pathlib
import pytest


@pytest.mark.kotlin1
def test(codeql, java_full):
def test(codeql, java_full, kotlinc_2_3_20):
java_srcs = " ".join([str(s) for s in pathlib.Path().glob("*.java")])
codeql.database.create(
command=[
f"javac {java_srcs} -d build",
"kotlinc -language-version 1.9 user.kt -cp build",
f"{kotlinc_2_3_20} -language-version 1.9 user.kt -cp build",
]
)
8 changes: 3 additions & 5 deletions java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import commands
import pytest


@pytest.mark.kotlin1
def test(codeql, java_full):
commands.run("kotlinc -language-version 1.9 test.kt -d lib")
codeql.database.create(command="kotlinc -language-version 1.9 user.kt -cp lib")
def test(codeql, java_full, kotlinc_2_3_20):
commands.run(f"{kotlinc_2_3_20} -language-version 1.9 test.kt -d lib")
codeql.database.create(command=f"{kotlinc_2_3_20} -language-version 1.9 user.kt -cp lib")
8 changes: 2 additions & 6 deletions java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
import pytest


@pytest.mark.kotlin1
def test(codeql, java_full):
codeql.database.create(command="kotlinc -J-Xmx2G -language-version 1.9 SomeClass.kt")
def test(codeql, java_full, kotlinc_2_3_20):
codeql.database.create(command=f"{kotlinc_2_3_20} -J-Xmx2G -language-version 1.9 SomeClass.kt")
8 changes: 3 additions & 5 deletions java/ql/integration-tests/kotlin/all-platforms/file_classes/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import commands
import pytest


@pytest.mark.kotlin1
def test(codeql, java_full):
commands.run("kotlinc -language-version 1.9 A.kt")
codeql.database.create(command="kotlinc -cp . -language-version 1.9 B.kt C.kt")
def test(codeql, java_full, kotlinc_2_3_20):
commands.run(f"{kotlinc_2_3_20} -language-version 1.9 A.kt")
codeql.database.create(command=f"{kotlinc_2_3_20} -cp . -language-version 1.9 B.kt C.kt")
6 changes: 2 additions & 4 deletions java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import commands
import pytest


@pytest.mark.kotlin1
def test(codeql, java_full):
def test(codeql, java_full, kotlinc_2_3_20):
commands.run(["javac", "Test.java", "-d", "bin"])
codeql.database.create(command="kotlinc -language-version 1.9 user.kt -cp bin")
codeql.database.create(command=f"{kotlinc_2_3_20} -language-version 1.9 user.kt -cp bin")
8 changes: 3 additions & 5 deletions java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import commands
import pytest


@pytest.mark.kotlin1
def test(codeql, java_full):
def test(codeql, java_full, kotlinc_2_3_20):
# Compile the JavaDefns2 copy outside tracing, to make sure the Kotlin view of it matches the Java view seen by the traced javac compilation of JavaDefns.java below.
commands.run(["javac", "JavaDefns2.java"])
codeql.database.create(
command=[
"kotlinc kotlindefns.kt",
f"{kotlinc_2_3_20} kotlindefns.kt",
"javac JavaUser.java JavaDefns.java -cp .",
"kotlinc -language-version 1.9 -cp . kotlinuser.kt",
f"{kotlinc_2_3_20} -language-version 1.9 -cp . kotlinuser.kt",
Comment on lines 8 to +11
]
)
Loading