[JKLIB][TEST] added annotations libraries to compile java srcs with org.jetbrains.annotations or @null @NotNull

zardilior · zardilior · commit 4e0866f6ba7f · 2026-04-28T21:07:27.000-06:00
diff --git a/compiler/jklib.tests/build.gradle.kts b/compiler/jklib.tests/build.gradle.kts
@@ -24,6 +24,9 @@ projectTests {
 
     withJvmStdlibAndReflect()
     withMockJdkRuntime()
+    withMockJdkAnnotationsJar()
+    withAnnotations()
+    withThirdPartyJava8Annotations()
 
     testTask(
         jUnitMode = JUnitMode.JUnit5,
diff --git a/compiler/jklib.tests/testFixtures/org/jetbrains/kotlin/jklib/test/irText/JKlibJavaSourceConfigurator.kt b/compiler/jklib.tests/testFixtures/org/jetbrains/kotlin/jklib/test/irText/JKlibJavaSourceConfigurator.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jklib.test.irText
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.cli.jvm.config.configureJdkClasspathRoots
 import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
+import org.jetbrains.kotlin.codegen.forTestCompile.JavaForeignAnnotationType
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.test.MockLibraryUtil
@@ -18,8 +19,10 @@ import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.assertions
-import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
+import org.jetbrains.kotlin.test.services.javaFiles
 import org.jetbrains.kotlin.test.services.sourceFileProvider
+import org.jetbrains.kotlin.test.services.standardLibrariesPathProvider
+import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import java.io.File
 
@@ -50,12 +53,26 @@ class JKlibJavaSourceConfigurator(testServices: TestServices) : EnvironmentConfi
 
         configuration.configureJdkClasspathRoots()
 
-        val javaFiles = module.files.filter { it.name.endsWith(".java") }
+        val javaFiles = module.javaFiles
         if (javaFiles.isEmpty()) return
 
         javaFiles.forEach { testServices.sourceFileProvider.getOrCreateRealFileForSourceFile(it) }
 
         val javaDir = testServices.sourceFileProvider.getJavaSourceDirectoryForModule(module)
+        val java8AnnotationsDir = File(JavaForeignAnnotationType.Java8Annotations.path)
+        val java8AnnotationsJar = MockLibraryUtil.compileJavaFilesLibraryToJar(
+            java8AnnotationsDir.path,
+            "java8-annotations",
+            assertions = testServices.assertions,
+            // keeping this to suppress warnings during tests
+            extraOptions = listOf("-Xlint:-options")
+        )
+        
+        val jvmAnnotationsJar = testServices.standardLibrariesPathProvider.jvmAnnotationsForTests()
+        
+        configuration.addJvmClasspathRoot(jvmAnnotationsJar)
+        configuration.addJvmClasspathRoot(java8AnnotationsJar)
+        
         val jvmClasspathRoots = configuration.jvmClasspathRoots.map { it.absolutePath }
 
         try {
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: delegatedImplementationOfJavaInterface.kt
diff --git a/compiler/testData/ir/irText/classes/kt43217.kt b/compiler/testData/ir/irText/classes/kt43217.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: kt43217.kt
diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.kt b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: nullCheckOnGenericLambdaReturn.kt
diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.kt b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 // FILE: nullCheckOnLambdaReturn.kt
 fun checkAny(fn: () -> Any) = fn()
diff --git a/compiler/testData/ir/irText/fakeOverrides/annotations/basicNullabilityAnnotationOverride.kt b/compiler/testData/ir/irText/fakeOverrides/annotations/basicNullabilityAnnotationOverride.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // SKIP_KT_DUMP
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/ir/irText/fakeOverrides/annotations/intersectionNullabilityAnnotation.kt b/compiler/testData/ir/irText/fakeOverrides/annotations/intersectionNullabilityAnnotation.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // SKIP_KT_DUMP
 // TARGET_BACKEND: JVM
 
diff --git a/compiler/testData/ir/irText/fakeOverrides/annotations/typeParameterAnnotationOverride.kt b/compiler/testData/ir/irText/fakeOverrides/annotations/typeParameterAnnotationOverride.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // SKIP_KT_DUMP
 // TARGET_BACKEND: JVM
 // DISABLE_JAVA_FACADE
diff --git a/compiler/testData/ir/irText/firProblems/SignatureComputationComplexJavaGeneric.kt b/compiler/testData/ir/irText/firProblems/SignatureComputationComplexJavaGeneric.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM_IR
 // ISSUE: KT-57022
 // DISABLE_JAVA_FACADE
diff --git a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.kt b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // Exception in new-reflect implementation
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.kt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 // FILE: enhancedNullability.kt
 // WITH_JDK
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInCatch.kt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInCatch.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 // FILE: J.java
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsT.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: nnStringVsT.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTAny.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: nnStringVsTAny.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTConstrained.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: nnStringVsTConstrained.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: nnStringVsTXArray.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/nnStringVsTXString.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: nnStringVsTXString.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsAny.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsAny.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: stringVsAny.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsT.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsT.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: stringVsT.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTAny.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTAny.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: stringVsTAny.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTConstrained.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTConstrained.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: stringVsTConstrained.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTXArray.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTXArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: stringVsTXArray.kt
diff --git a/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTXString.kt b/compiler/testData/ir/irText/types/nullChecks/nullCheckOnLambdaResult/stringVsTXString.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JKLIB
 // TARGET_BACKEND: JVM
 
 // FILE: stringVsTXString.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// IGNORE_BACKEND: JKLIB`
`2`	`1`	`// TARGET_BACKEND: JVM`
`3`	`2`
`4`	`3`	`// FILE: delegatedImplementationOfJavaInterface.kt`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// IGNORE_BACKEND: JKLIB`
`2`	`1`	`// SKIP_KT_DUMP`
`3`	`2`	`// TARGET_BACKEND: JVM`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// IGNORE_BACKEND: JKLIB`
`2`	`1`	`// TARGET_BACKEND: JVM_IR`
`3`	`2`	`// ISSUE: KT-57022`
`4`	`3`	`// DISABLE_JAVA_FACADE`