From 0d8f909bda61191427aa84606ec2ef53b7fd1103 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 13 Jan 2021 19:34:04 +0100 Subject: [PATCH] Use ObsoleteTestInfrastructure instead of Deprecated in black box tests --- .../codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt | 2 ++ .../kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt | 2 ++ .../jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java | 4 ++-- .../kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt | 2 ++ .../kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt | 3 +++ .../codegen/ir/AbstractComposeLikeIrBlackBoxCodegenTest.kt | 2 ++ .../kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt | 2 ++ .../kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt | 3 ++- .../kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt | 2 ++ .../kotlin/spec/codegen/AbstractBlackBoxCodegenTestSpec.kt | 4 +++- .../kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt | 3 ++- .../noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt | 1 + 12 files changed, 25 insertions(+), 5 deletions(-) diff --git a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt index 66b468a6e55..2c780b82dda 100644 --- a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt +++ b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.codegen.ir +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.js.K2JSCompiler @@ -19,6 +20,7 @@ import java.io.File import java.nio.file.Paths import java.util.* +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTest() { lateinit var klibName: String lateinit var outputDir: File diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt index 28f63b170d2..dd94b91cd42 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt @@ -16,12 +16,14 @@ package org.jetbrains.kotlin.codegen +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.test.util.JUnit4Assertions import java.io.File +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() { override fun doMultiFileTest(wholeFile: File, files: List) { javaClassesOutputDirectory = writeJavaFiles(files)!!.let { directory -> diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java index b87ef697160..81c27a5a51d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java @@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.ObsoleteTestInfrastructure; import org.jetbrains.kotlin.TestsRuntimeError; import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.codegen.ir.AbstractFirBlackBoxCodegenTest; @@ -26,8 +27,7 @@ import static org.jetbrains.kotlin.test.KotlinTestUtils.assertEqualsToFile; import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getBoxMethodOrNull; import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getGeneratedClass; -// Prefer using new test runner: org.jetbrains.kotlin.test.runners.codegen.AbstractBlackBoxCodegenTest -@Deprecated +@ObsoleteTestInfrastructure(replacer = "org.jetbrains.kotlin.test.runners.codegen.AbstractBlackBoxCodegenTest") public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { protected void doMultiFileTest( @NotNull File wholeFile, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt index ca87087d2e0..236ff9051db 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt @@ -16,8 +16,10 @@ package org.jetbrains.kotlin.codegen +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import java.io.File +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractBlackBoxInlineCodegenTest : AbstractBlackBoxCodegenTest() { override fun doMultiFileTest(wholeFile: File, files: List) { super.doMultiFileTest(wholeFile, files) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt index 348a67caff4..7bf00e5d4dd 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.codegen +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.cli.common.output.writeAll import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.test.ConfigurationKind @@ -14,6 +15,7 @@ import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.util.concurrent.TimeUnit +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractCustomJDKBlackBoxCodegenTest : AbstractBlackBoxCodegenTest() { @Throws(Exception::class) override fun doTest(filePath: String) { @@ -68,6 +70,7 @@ abstract class AbstractCustomJDKBlackBoxCodegenTest : AbstractBlackBoxCodegenTes } } +@OptIn(ObsoleteTestInfrastructure::class) internal fun runJvmInstance( jdkHome: File, additionalArgs: List, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractComposeLikeIrBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractComposeLikeIrBlackBoxCodegenTest.kt index 62643cf45e1..384ed603827 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractComposeLikeIrBlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractComposeLikeIrBlackBoxCodegenTest.kt @@ -5,10 +5,12 @@ package org.jetbrains.kotlin.codegen.ir +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.test.TargetBackend +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractComposeLikeIrBlackBoxCodegenTest : AbstractBlackBoxCodegenTest() { override val backend = TargetBackend.JVM_IR diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt index fbcd2bc211e..22e25260a4d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractFirBlackBoxCodegenTest.kt @@ -5,10 +5,12 @@ package org.jetbrains.kotlin.codegen.ir +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractFirBlackBoxCodegenTest : AbstractIrBlackBoxCodegenTest() { override fun updateConfiguration(configuration: CompilerConfiguration) { super.updateConfiguration(configuration) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt index cb1a7a427eb..2105fa4146a 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt @@ -16,10 +16,11 @@ package org.jetbrains.kotlin.codegen.ir +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.test.TargetBackend -@Deprecated("Prefer using new test runner: org.jetbrains.kotlin.test.runners.codegen.AbstractIrBlackBoxCodegenTest") +@ObsoleteTestInfrastructure("org.jetbrains.kotlin.test.runners.codegen.AbstractIrBlackBoxCodegenTest") abstract class AbstractIrBlackBoxCodegenTest : AbstractBlackBoxCodegenTest() { override val backend = TargetBackend.JVM_IR } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt index c75c1a71e86..46b128c0f2d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt @@ -16,9 +16,11 @@ package org.jetbrains.kotlin.codegen.ir +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.test.TargetBackend +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractIrBlackBoxInlineCodegenTest : AbstractBlackBoxCodegenTest() { override val backend = TargetBackend.JVM_IR } diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/AbstractBlackBoxCodegenTestSpec.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/AbstractBlackBoxCodegenTestSpec.kt index d9e6ae8b506..953f495a209 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/AbstractBlackBoxCodegenTestSpec.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/AbstractBlackBoxCodegenTestSpec.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.spec.codegen import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.TestExceptionsComparator import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.spec.utils.GeneralConfiguration.SPEC_TESTDATA_PATH @@ -15,8 +16,9 @@ import org.jetbrains.kotlin.spec.utils.parsers.CommonPatterns.packagePattern import org.jetbrains.kotlin.spec.utils.validators.BlackBoxTestTypeValidator import org.jetbrains.kotlin.spec.utils.validators.SpecTestValidationException import org.junit.Assert -import java.io.* +import java.io.File +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractBlackBoxCodegenTestSpec : AbstractBlackBoxCodegenTest() { companion object { private const val CODEGEN_BOX_TESTDATA_PATH = "$SPEC_TESTDATA_PATH/codegen/box" diff --git a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt index 05dda7c0ddc..e7242c272cc 100755 --- a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.android.synthetic.test import com.intellij.openapi.util.io.FileUtil import com.intellij.util.ArrayUtil +import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.codegen.CodegenTestFiles @@ -20,8 +21,8 @@ import java.io.File import java.net.URL import java.util.regex.Pattern +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { - private fun createAndroidAPIEnvironment(path: String) { return createEnvironmentForConfiguration(KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) } diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt b/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt index 312b6934637..b63012f9ee1 100644 --- a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt +++ b/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.test.TargetBackend internal val NOARG_ANNOTATIONS = listOf("NoArg", "NoArg2", "test.NoArg") +@OptIn(ObsoleteTestInfrastructure::class) abstract class AbstractBlackBoxCodegenTestForNoArg : AbstractBlackBoxCodegenTest() { override fun loadMultiFiles(files: MutableList) { NoArgComponentRegistrar.registerNoArgComponents(