diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/runners/RunnerWithTargetBackendForTestGeneratorMarker.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/runners/RunnerWithTargetBackendForTestGeneratorMarker.kt similarity index 92% rename from compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/runners/RunnerWithTargetBackendForTestGeneratorMarker.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/runners/RunnerWithTargetBackendForTestGeneratorMarker.kt index 3625ee56e60..c1253d57478 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/runners/RunnerWithTargetBackendForTestGeneratorMarker.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/runners/RunnerWithTargetBackendForTestGeneratorMarker.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index 8606e86ce93..82d70b911fb 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.test.generators -import org.jetbrains.kotlin.generators.model.annotation +import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlin.generators.util.TestGeneratorUtil import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.runners.* @@ -16,8 +16,6 @@ import org.jetbrains.kotlin.test.runners.ir.interpreter.AbstractIrInterpreterAft import org.jetbrains.kotlin.test.runners.ir.interpreter.AbstractIrInterpreterAfterPsi2IrTest import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizerTest import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizerTest -import org.junit.jupiter.api.parallel.Execution -import org.junit.jupiter.api.parallel.ExecutionMode fun generateJUnit5CompilerTests(args: Array) { val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$" diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt index f903d82ad4c..9caa767b1c1 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.spec.utils.GeneralConfiguration.SPEC_TEST_PATH import org.jetbrains.kotlin.spec.utils.GeneralConfiguration.TESTS_MAP_FILENAME import org.jetbrains.kotlin.spec.utils.SectionsJsonMapGenerator import org.jetbrains.kotlin.spec.utils.TestsJsonMapGenerator -import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 +import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec import java.io.File import java.nio.file.Files diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt index 26e57310455..8d961adbb91 100644 --- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt +++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.visualizer -import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 +import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 fun main(args: Array) { System.setProperty("java.awt.headless", "true") diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt index 858fc84c8b8..d5e7789a8f0 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractInnerDecl import org.jetbrains.kotlin.generators.util.TestGeneratorUtil import org.jetbrains.kotlin.spec.utils.GeneralConfiguration import org.jetbrains.kotlin.spec.utils.tasks.detectDirsWithTestsMapFileOnly -import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 +import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec fun main(args: Array) { diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 483f7272572..900fd0dbfbd 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -66,6 +66,10 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testImplementation(intellijDep()) { includeJars("idea_rt") } testImplementation(project(":kotlin-reflect")) + testImplementation(projectTests(":compiler:test-infrastructure-utils")) + testImplementation(projectTests(":compiler:test-infrastructure")) + testImplementation(projectTests(":compiler:tests-common-new")) + testApiJUnit5() if (Ide.IJ()) { testCompileOnly(jpsBuildTest()) diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index 4dda7670866..ac68508c1ec 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -10,7 +10,12 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(kotlinStdlib()) testApi(commonDep("junit:junit")) + testApiJUnit5() testApi(project(":generators")) + + testCompileOnly(project(":kotlin-reflect-api")) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":core:descriptors.runtime")) } sourceSets { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt similarity index 75% rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt index 15854a4a2db..577cff0dd6e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGenerationDSL.kt @@ -1,13 +1,9 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.test.generators - -import org.jetbrains.kotlin.generators.InconsistencyChecker -import org.jetbrains.kotlin.generators.TestGroupSuite -import org.jetbrains.kotlin.generators.testGroupSuite +package org.jetbrains.kotlin.generators fun generateTestGroupSuiteWithJUnit5( args: Array, diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt similarity index 97% rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt index cfb378f077d..f80bab966ec 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/NewTestGeneratorImpl.kt @@ -1,13 +1,10 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.test.generators +package org.jetbrains.kotlin.generators -import org.jetbrains.kotlin.generators.MethodGenerator -import org.jetbrains.kotlin.generators.TestGenerator -import org.jetbrains.kotlin.generators.TestGroup import org.jetbrains.kotlin.generators.impl.SimpleTestClassModelTestAllFilesPresentMethodGenerator import org.jetbrains.kotlin.generators.impl.SimpleTestMethodGenerator import org.jetbrains.kotlin.generators.impl.SingleClassTestModelAllFilesPresentedMethodGenerator diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/ReflectionBasedTargetBackendComputer.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/ReflectionBasedTargetBackendComputer.kt similarity index 94% rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/ReflectionBasedTargetBackendComputer.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/ReflectionBasedTargetBackendComputer.kt index c54e3feb240..63398a94c73 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/ReflectionBasedTargetBackendComputer.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/ReflectionBasedTargetBackendComputer.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.test.generators +package org.jetbrains.kotlin.generators import org.jetbrains.kotlin.generators.model.DefaultTargetBackendComputer import org.jetbrains.kotlin.generators.model.TargetBackendComputer diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt index edfd5c2ff83..610bba5225a 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateKotlinGradleOptionsTest.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.generators.arguments.test -import com.intellij.testFramework.UsefulTestCase import junit.framework.TestCase import org.jetbrains.kotlin.generators.arguments.generateKotlinGradleOptions +import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.jetbrains.kotlin.utils.Printer import java.io.ByteArrayOutputStream import java.io.File @@ -35,7 +35,7 @@ class GenerateKotlinGradleOptionsTest : TestCase() { } val upToDateContent = bytesOut.toString() - UsefulTestCase.assertSameLinesWithFile(file.absolutePath, upToDateContent) + KtUsefulTestCase.assertSameLinesWithFile(file.absolutePath, upToDateContent) } generateKotlinGradleOptions(::getPrinter) diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index f72e14f28d2..9f48167c2f6 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidIrBoxTest import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidSyntheticPropertyDescriptorTest import org.jetbrains.kotlin.fir.plugin.AbstractFirAllOpenDiagnosticTest import org.jetbrains.kotlin.generators.TestGroup +import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.jvm.abi.* @@ -35,7 +36,6 @@ import org.jetbrains.kotlin.parcelize.test.runners.AbstractParcelizeIrBytecodeLi import org.jetbrains.kotlin.samWithReceiver.AbstractSamWithReceiverScriptTest import org.jetbrains.kotlin.samWithReceiver.AbstractSamWithReceiverTest import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeListingTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest @@ -269,12 +269,6 @@ fun main(args: Array) { } } - testGroup("plugins/fir/fir-plugin-prototype/tests", "plugins/fir/fir-plugin-prototype/testData") { - testClass { - model("") - } - } - testGroup("plugins/lombok/lombok-compiler-plugin/tests", "plugins/lombok/lombok-compiler-plugin/testData") { testClass { model("compile") @@ -374,5 +368,11 @@ fun main(args: Array) { model("codegen") } } + + testGroup("plugins/fir/fir-plugin-prototype/tests", "plugins/fir/fir-plugin-prototype/testData") { + testClass { + model("") + } + } } } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt index bd0cd9b45f1..c26e8127ef1 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/TestGenerator.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlinx.serialization -import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 +import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -22,4 +22,4 @@ fun main(args: Array) { } } } -} \ No newline at end of file +}