hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-06-25 14:47:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Update tests to use new kotlin_2_3_20 fixture

Browse Source
This commit is contained in:
Jeroen Ketema
2026-06-24 22:50:32 +02:00
parent cd23341dab
commit 402c0f89bc
6 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.py
View File

@@ -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
java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.py
View File

@@ -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
java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/test.py
View File

@@ -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
java/ql/integration-tests/kotlin/all-platforms/file_classes/test.py
View File

@@ -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")

5
java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.py
View File

@@ -2,7 +2,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")

7
java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.py
View File

@@ -2,14 +2,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",
]
)