Skip to content

Commit 705c804

Browse files
committed
KAPT: Run tests on JDK 21
Previously, some tests have also been disabled on JDK 11+, since we did not filter out empty filesets, which led to failed assertion inside JDK. #KT-57389
1 parent 120c99d commit 705c804

File tree

8 files changed

+19
-4
lines changed

8 files changed

+19
-4
lines changed

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ fun main(args: Array<String>) {
382382
model("kotlinRunner")
383383
}
384384

385-
testClass<AbstractIrKotlinKaptContextTest>(annotations = annotations) {
385+
testClass<AbstractIrKotlinKaptContextTest> {
386386
model("kotlinRunner")
387387
}
388388

plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/annotationProcessing.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ fun KaptContext.parseJavaFiles(javaSourceFiles: List<File>): JavacList<JCTree.JC
297297
}
298298

299299
private fun KaptContext.initModulesIfNeeded(files: JavacList<JCTree.JCCompilationUnit>): JavacList<JCTree.JCCompilationUnit> {
300-
if (isJava9OrLater()) {
300+
if (files.isNotEmpty() && isJava9OrLater()) {
301301
val initModulesMethod = compiler.javaClass.getMethod("initModules", JavacList::class.java)
302302

303303
@Suppress("UNCHECKED_CAST")

plugins/kapt3/kapt3-compiler/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ testsJar {}
6262
kaptTestTask("test", JavaLanguageVersion.of(8))
6363
kaptTestTask("testJdk11", JavaLanguageVersion.of(11))
6464
kaptTestTask("testJdk17", JavaLanguageVersion.of(17))
65+
kaptTestTask("testJdk21", JavaLanguageVersion.of(21))
6566

6667
fun Project.kaptTestTask(name: String, javaLanguageVersion: JavaLanguageVersion) {
6768
val service = extensions.getByType<JavaToolchainService>()

plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/runners/AbstractClassFileToSourceStubConverterTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.kapt3.test.KaptRegularExtensionForTestConfigurator
1212
import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
1313
import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.USE_JVM_IR
1414
import org.jetbrains.kotlin.kapt3.test.handlers.ClassFileToSourceKaptStubHandler
15+
import org.jetbrains.kotlin.kapt3.util.doOpenInternalPackagesIfRequired
1516
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
1617
import org.jetbrains.kotlin.test.TargetBackend
1718
import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
@@ -26,6 +27,10 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
2627
abstract class AbstractClassFileToSourceStubConverterTestBase(
2728
targetBackend: TargetBackend
2829
) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) {
30+
init {
31+
doOpenInternalPackagesIfRequired()
32+
}
33+
2934
override fun TestConfigurationBuilder.configuration() {
3035
globalDefaults {
3136
frontend = FrontendKinds.ClassicFrontend

plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/runners/AbstractKotlinKaptContextTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.jetbrains.kotlin.kapt3.test.runners
77

8+
import org.jetbrains.kotlin.kapt3.util.doOpenInternalPackagesIfRequired
89
import org.jetbrains.kotlin.kapt3.test.*
910
import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
1011
import org.jetbrains.kotlin.kapt3.test.handlers.KaptContextHandler
@@ -20,6 +21,10 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
2021
abstract class AbstractKotlinKaptContextTestBase(
2122
targetBackend: TargetBackend
2223
) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) {
24+
init {
25+
doOpenInternalPackagesIfRequired()
26+
}
27+
2328
override fun TestConfigurationBuilder.configuration() {
2429
globalDefaults {
2530
frontend = FrontendKinds.ClassicFrontend

plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrKotlinKaptContextTestGenerated.java

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/kapt4/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ testsJar {}
5757
kaptTestTask("test", JavaLanguageVersion.of(8))
5858
kaptTestTask("testJdk11", JavaLanguageVersion.of(11))
5959
kaptTestTask("testJdk17", JavaLanguageVersion.of(17))
60+
kaptTestTask("testJdk21", JavaLanguageVersion.of(21))
6061

6162
fun Project.kaptTestTask(name: String, javaLanguageVersion: JavaLanguageVersion) {
6263
val service = extensions.getByType<JavaToolchainService>()

plugins/kapt4/test/org/jetbrains/kotlin/kapt4/AbstractKotlinKaptContextTestBase.kt renamed to plugins/kapt4/test/org/jetbrains/kotlin/kapt4/AbstractKotlinKapt4ContextTestBase.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.jetbrains.kotlin.kapt4
77

8+
import org.jetbrains.kotlin.kapt3.util.doOpenInternalPackagesIfRequired
89
import org.jetbrains.kotlin.kapt3.test.*
910
import org.jetbrains.kotlin.kapt3.test.KaptTestDirectives.MAP_DIAGNOSTIC_LOCATIONS
1011
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
@@ -22,6 +23,10 @@ open class AbstractKotlinKapt4ContextTest : AbstractKotlinKapt4ContextTestBase(T
2223
abstract class AbstractKotlinKapt4ContextTestBase(
2324
targetBackend: TargetBackend
2425
) : AbstractKotlinCompilerWithTargetBackendTest(targetBackend) {
26+
init {
27+
doOpenInternalPackagesIfRequired()
28+
}
29+
2530
override fun TestConfigurationBuilder.configuration() {
2631
globalDefaults {
2732
frontend = FrontendKinds.FIR

0 commit comments

Comments
 (0)