From bd3a0b4684206e2d244309b36f328ac6815cd930 Mon Sep 17 00:00:00 2001 From: Alexey Belkov Date: Sat, 16 Mar 2024 16:35:51 +0400 Subject: [PATCH] [kotlin] J2K tests: load dependency files only if needed Most tests don't need them. GitOrigin-RevId: 0060a4d1be0b2beb5cdb08d7ec477625edd2455a --- ...ractJavaToKotlinConverterSingleFileTest.kt | 16 +++++++++++-- .../j2k/AbstractJavaToKotlinConverterTest.kt | 23 ++----------------- .../annotations/annotationInterface3.kt | 4 +++- .../newJ2k/annotations/annotationUsages.java | 1 + .../testData/newJ2k/annotations/kt-31726.java | 1 + .../newJ2k/annotations/typeUseAnnotation.java | 1 + .../testData/newJ2k/class/anonymousClass.java | 1 + .../testData/newJ2k/class/anonymousClass.kt | 1 + .../constructors/constructorAnnotations.java | 1 + .../AbstractPropertyPrivateSetter.java | 1 + .../AbstractPropertyPrivateSetter.kt | 1 + .../OverridesOfExternalCode.java | 2 ++ .../function/java8MRSamConstructor.java | 1 + .../newJ2k/function/java8MRSamConstructor.kt | 1 + .../testData/newJ2k/issues/kt-19549.java | 1 + .../kotlinApiAccess/ClassObjectMembers.java | 2 +- .../CorrectFunNullabilityDetected.java | 1 + .../CorrectNullabilityDetected.java | 1 + .../kotlinApiAccess/ExtensionFunction.java | 1 + .../kotlinApiAccess/ExtensionProperty.java | 1 + .../kotlinApiAccess/GlobalFunction.java | 1 + .../GlobalGenericFunction.java | 1 + .../newJ2k/kotlinApiAccess/GlobalValue1.java | 1 + .../newJ2k/kotlinApiAccess/GlobalValue2.java | 1 + .../kotlinApiAccess/InheritedProperty.java | 1 + .../newJ2k/kotlinApiAccess/ObjectMembers.java | 1 + .../newJ2k/kotlinApiAccess/Property.java | 1 + .../newJ2k/kotlinApiAccess/Property2.java | 1 + .../StaticImportAllFromFileFacade.java | 1 + .../StaticImportAllFromObject.java | 1 + .../StaticImportFromCompanionObject.java | 1 + .../StaticImportFromCompanionObject2.java | 1 + .../StaticImportFromCompanionObject3.java | 1 + .../StaticImportFromFileFacade.java | 1 + .../parameterToReceiver.java | 1 + .../parameterToReceiver.kt | 1 + .../newJ2k/methodCallExpression/vararg2.java | 1 + .../newJ2k/mutableCollections/Overrides.java | 1 + .../newJ2k/mutableCollections/Overrides.kt | 1 + .../newAnonymousClass3.java | 1 + .../recordClass/annotations.java | 1 + .../newJ2k/nullability/IndirectOverride.java | 1 + .../newJ2k/nullability/IndirectOverride.kt | 1 + .../newJ2k/postProcessing/GetOperator.java | 2 ++ .../newJ2k/postProcessing/SortModifiers.java | 1 + .../SyntheticExtensionPropertyAccess.java | 1 + ...mutablePropertyAnnotatedWithJpaColumn.java | 1 + .../mutablePropertyAnnotatedWithJpaColumn.kt | 1 + .../typeParameters/typeFromOtherFile.java | 1 + .../function/java8MRSamConstructor.java | 1 + .../function/java8MRSamConstructor.kt | 1 + 51 files changed, 69 insertions(+), 25 deletions(-) diff --git a/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 64ff3324ed54..22e14b1b1fd9 100644 --- a/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -18,6 +18,10 @@ import java.util.regex.Pattern private val testHeaderPattern: Pattern = Pattern.compile("//(expression|statement|method)\n") +private const val JPA_ANNOTATIONS_DIRECTIVE = "ADD_JPA_ANNOTATIONS" +private const val KOTLIN_API_DIRECTIVE = "ADD_KOTLIN_API" +private const val JAVA_API_DIRECTIVE = "ADD_JAVA_API" + abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterTest() { override fun setUp() { super.setUp() @@ -43,10 +47,12 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli } private fun doTest(javaFile: File, fileContents: String) { - addExternalFiles(javaFile) - val (prefix, javaCode) = getPrefixAndJavaCode(fileContents) val directives = KotlinTestUtils.parseDirectives(javaCode) + + addExternalFiles(javaFile) + addDependencies(directives) + val settings = configureSettings(directives) val convertedText = convertJavaToKotlin(prefix, javaCode, settings) val expectedFile = File(javaFile.path.replace(".java", ".kt")) @@ -62,6 +68,12 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli KotlinTestUtils.assertEqualsToFile(expectedFile, actualText) } + private fun addDependencies(directives: Directives) { + if (directives.contains(JPA_ANNOTATIONS_DIRECTIVE)) addJpaColumnAnnotations() + if (directives.contains(KOTLIN_API_DIRECTIVE)) addFile("KotlinApi.kt", "kotlinApi") + if (directives.contains(JAVA_API_DIRECTIVE)) addFile("JavaApi.java", "javaApi") + } + private fun addExternalFiles(javaFile: File) { val externalFileName = "${javaFile.nameWithoutExtension}.external" val externalFiles = javaFile.parentFile.listFiles { _, name -> diff --git a/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index 8dc57daf0a6e..77163fb37647 100644 --- a/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/plugins/kotlin/j2k/shared/tests/test/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -19,15 +19,7 @@ private val ignoreDirectives: Set = setOf(IGNORE_K1, IGNORE_K2) abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = J2K_PROJECT_DESCRIPTOR - override fun setUp() { - super.setUp() - addFile("KotlinApi.kt", "kotlinApi") - addFile("JavaApi.java", "javaApi") - addJavaLangRecordClass() - addJpaColumnAnnotations() - } - - private fun addFile(fileName: String, dirName: String? = null) { + protected fun addFile(fileName: String, dirName: String? = null) { addFile(File(KotlinRoot.DIR, "j2k/shared/tests/testData/$fileName"), dirName) } @@ -56,18 +48,7 @@ abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixture protected fun KtFile.getFileTextWithErrors(): String = if (isFirPlugin) getK2FileTextWithErrors(this) else dumpTextWithErrors() - // Needed to make the Kotlin compiler think it is running on JDK 16+ - // see org.jetbrains.kotlin.resolve.jvm.checkers.JvmRecordApplicabilityChecker - private fun addJavaLangRecordClass() { - myFixture.addClass( - """ - package java.lang; - public abstract class Record {} - """.trimIndent() - ) - } - - private fun addJpaColumnAnnotations() { + protected fun addJpaColumnAnnotations() { myFixture.addClass( """ package javax.persistence; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationInterface3.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationInterface3.kt index 981182c70ca1..c876fed8c36b 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationInterface3.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationInterface3.kt @@ -1,3 +1,5 @@ +import Anon.E + internal annotation class Anon(val value: String) { enum class E { A, B @@ -11,6 +13,6 @@ internal annotation class Anon(val value: String) { @Anon("a") internal interface I { companion object { - val e: Anon.E = Anon.field + val e: E = Anon.field } } diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationUsages.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationUsages.java index 1b3a4ced4545..af1bb9c65374 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationUsages.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/annotationUsages.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API import javaApi.*; @Anon1(value = {"a"}, stringArray = {"b"}, intArray = {1, 2}, string = "x") diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/kt-31726.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/kt-31726.java index 1744bd624dc8..e3e373a15fe6 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/kt-31726.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/kt-31726.java @@ -1,3 +1,4 @@ +// !ADD_JAVA_API import javaApi.SpecialExternal; //Annotation class: diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/typeUseAnnotation.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/typeUseAnnotation.java index b0da4e89b723..e32fcdd4e109 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/typeUseAnnotation.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/annotations/typeUseAnnotation.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API import javaApi.Anon5; import javaApi.TypeUseAnon1; import javaApi.TypeUseAnon2; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.java index 7f53c8e60c36..0b421601d66b 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API package test; import javaApi.*; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.kt index fae6cbfc0107..c1fac1932454 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/class/anonymousClass.kt @@ -1,3 +1,4 @@ +// !ADD_JAVA_API package test import javaApi.Listener diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/constructors/constructorAnnotations.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/constructors/constructorAnnotations.java index d4adb15fb918..34d0099d3457 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/constructors/constructorAnnotations.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/constructors/constructorAnnotations.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API import javaApi.Anon5; class A { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.java index 0ffadb196363..7a3f38a0bdb1 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API package test; import kotlinApi.*; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt index 733258dbf5e7..bbefb55a0155 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/AbstractPropertyPrivateSetter.kt @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API package test import kotlinApi.KotlinClassAbstractProperty diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/OverridesOfExternalCode.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/OverridesOfExternalCode.java index 459f7b90f1ba..9fb76ba30d14 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/OverridesOfExternalCode.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/detectProperties/OverridesOfExternalCode.java @@ -1,4 +1,6 @@ // IGNORE_K2 +// !ADD_KOTLIN_API +// !ADD_JAVA_API import kotlinApi.KotlinClassWithProperties; import javaApi.JavaClassWithProperties; import javaApi.JavaClassDerivedFromKotlinClassWithProperties; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.java index 8230e8ea7113..e11e0f649a24 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API package test; import javaApi.*; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.kt index d53bf697b5e9..dc198ee1e5a5 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/function/java8MRSamConstructor.kt @@ -1,3 +1,4 @@ +// !ADD_JAVA_API package test import javaApi.JFunction0 diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/issues/kt-19549.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/issues/kt-19549.java index 5c504b9d2e4a..4fada8ac3e94 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/issues/kt-19549.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/issues/kt-19549.java @@ -1,3 +1,4 @@ +// IGNORE_K2 public class TestNestedClassesHierarchy { public static class Base {} public static class Derived extends Base {} diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ClassObjectMembers.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ClassObjectMembers.java index 7a5a8865d3cf..c9d15717c2ec 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ClassObjectMembers.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ClassObjectMembers.java @@ -1,4 +1,4 @@ - +// !ADD_KOTLIN_API import kotlinApi.KotlinClass; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectFunNullabilityDetected.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectFunNullabilityDetected.java index 3765dfd15c61..eeb5d367dcf7 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectFunNullabilityDetected.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectFunNullabilityDetected.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.* class A { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.java index f472f4f993ce..44cba05c2f79 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.*; class A { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionFunction.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionFunction.java index 0ec6aed02654..04b0375848fc 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionFunction.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionFunction.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.KotlinApiKt; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionProperty.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionProperty.java index d04a4d145ac6..5d573a1aa60b 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionProperty.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ExtensionProperty.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import kotlinApi.KotlinApiKt; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalFunction.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalFunction.java index df86da537af9..ae016dd3a317 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalFunction.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalFunction.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.KotlinApiKt; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalGenericFunction.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalGenericFunction.java index dce815453c69..974bbb56963e 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalGenericFunction.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalGenericFunction.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.KotlinApiKt; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue1.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue1.java index 47cbdfecab7b..a2527affab84 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue1.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue1.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import kotlinApi.KotlinApiKt; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue2.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue2.java index e1e3a421be19..a01bfd16db41 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue2.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/GlobalValue2.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import kotlinApi.KotlinApiKt; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/InheritedProperty.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/InheritedProperty.java index d5cf631c5f14..beaa095c7835 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/InheritedProperty.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/InheritedProperty.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.* class C extends KotlinClass { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ObjectMembers.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ObjectMembers.java index 1e7eadb732d8..cc59b5b22861 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ObjectMembers.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/ObjectMembers.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.KotlinObject; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property.java index d7f4030b9ba1..b69bd63922fe 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.* class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property2.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property2.java index c2135b94971b..e8825533c5ea 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property2.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/Property2.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.* class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromFileFacade.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromFileFacade.java index 5804702254e9..292bf0d3f504 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromFileFacade.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromFileFacade.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import static kotlinApi.KotlinApiKt.*; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromObject.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromObject.java index ca878c922482..9fcc31e83afa 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromObject.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportAllFromObject.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import static kotlinApi.KotlinObject.*; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.java index afdaed2e7f98..83641d61b459 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import static kotlinApi.KotlinClass.CONST; public class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.java index 4ea2b544ee5f..daeef71b52d4 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject2.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import static kotlinApi.KotlinClass.*; public class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject3.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject3.java index 16dc407a88e4..3b9ae3c6987a 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject3.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromCompanionObject3.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import static kotlinApi.KotlinClass.getStaticProperty; class C { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromFileFacade.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromFileFacade.java index ca0b4c7e0d98..be024d99971d 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromFileFacade.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/kotlinApiAccess/StaticImportFromFileFacade.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API import static kotlinApi.KotlinApiKt.extensionFunction; import static kotlinApi.KotlinApiKt.getExtensionProperty; import static kotlinApi.KotlinApiKt.setExtensionProperty; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.java index 2987e1b7cd32..5c38cbd18e10 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.java @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API public class J { public static void adjust(String name, int maxLen) { String.valueOf(1 + 1); diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.kt index 2e086748d43f..0292a2fc2e99 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/parameterToReceiver.kt @@ -1,5 +1,6 @@ import kotlinApi.extensionFunction +// !ADD_KOTLIN_API object J { fun adjust(name: String?, maxLen: Int) { (1 + 1).toString() diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/vararg2.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/vararg2.java index 3aa31892e1c9..6c416883cb9b 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/vararg2.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/methodCallExpression/vararg2.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API import javaApi.WithVarargConstructor; import java.lang.String; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.java index cb76b596e8ab..42ee3834df1d 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API package javaApi; import kotlinApi.KotlinClass; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.kt index 5423d6af7286..59fa8ccf99bb 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/mutableCollections/Overrides.kt @@ -1,3 +1,4 @@ +// !ADD_KOTLIN_API package javaApi import kotlinApi.KotlinClass diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/newAnonymousClass3.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/newAnonymousClass3.java index 50b905a4251d..45cf839352cc 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/newAnonymousClass3.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newClassExpression/newAnonymousClass3.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_KOTLIN_API import kotlinApi.KotlinInterface; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newJavaFeatures/recordClass/annotations.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newJavaFeatures/recordClass/annotations.java index 60e86786b918..61e8ef919018 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newJavaFeatures/recordClass/annotations.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/newJavaFeatures/recordClass/annotations.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API // JVM_TARGET: 17 import javaApi.Anon5; import javaApi.TypeUseAnon1; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.java index 50ffbdada004..eb3918eac288 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API class C extends javaApi.Derived { public String foo(String s) { return s; } } diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.kt index d26dc04f3895..ba060cd53fd2 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/nullability/IndirectOverride.kt @@ -1,5 +1,6 @@ import javaApi.Derived +// !ADD_JAVA_API internal class C : Derived() { override fun foo(s: String?): String? { return s diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/GetOperator.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/GetOperator.java index fe0227c455a5..ecb7bfcb7e50 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/GetOperator.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/GetOperator.java @@ -1,4 +1,6 @@ // IGNORE_K2 +// !ADD_KOTLIN_API +// !ADD_JAVA_API import java.util.HashMap; import kotlinApi.KotlinClass; import javaApi.JavaClass; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SortModifiers.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SortModifiers.java index 510603c5b59f..4e3baf56b7e2 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SortModifiers.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SortModifiers.java @@ -1,3 +1,4 @@ +// IGNORE_K2 public class TestInnerClasses { public class Base {} public class Derived extends Base {} diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SyntheticExtensionPropertyAccess.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SyntheticExtensionPropertyAccess.java index 3b7a0e42e766..c23cdcc4980a 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SyntheticExtensionPropertyAccess.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/SyntheticExtensionPropertyAccess.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API import javaApi.Base; class C extends Base { diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.java index d91f6de177fe..e56c83259f38 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.java @@ -1,3 +1,4 @@ +// !ADD_JPA_ANNOTATIONS public class J { @javax.persistence.Column private String title; diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.kt b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.kt index 01a56c1621a4..e941b23ed448 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/postProcessing/mutablePropertyAnnotatedWithJpaColumn.kt @@ -1,5 +1,6 @@ import javax.persistence.Column +// !ADD_JPA_ANNOTATIONS class J { @Column private var title: String? = null diff --git a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/typeFromOtherFile.java b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/typeFromOtherFile.java index e863459eab1c..199dddecb860 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/typeFromOtherFile.java +++ b/plugins/kotlin/j2k/shared/tests/testData/newJ2k/typeParameters/typeFromOtherFile.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API import java.util.*; import javaApi.T; diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.java b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.java index 5990ff0cbc2b..799191b0b13e 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.java +++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.java @@ -1,4 +1,5 @@ // IGNORE_K2 +// !ADD_JAVA_API package test; import javaApi.*; diff --git a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.kt b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.kt index af13bb3d67dd..301d7d417e91 100644 --- a/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.kt +++ b/plugins/kotlin/j2k/shared/tests/testData/partialConverter/function/java8MRSamConstructor.kt @@ -1,3 +1,4 @@ +// !ADD_JAVA_API package test import javaApi.MethodReferenceHelperClass