[Build] Move utils for generation JUnit 5 tests to :generators module

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.
  */
 

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<String>) {
     val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$"

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

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<String>) {
     System.setProperty("java.awt.headless", "true")

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<String>) {

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())

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 {

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<String>,

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

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

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)

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<String>) {
             }
         }
 
-        testGroup("plugins/fir/fir-plugin-prototype/tests", "plugins/fir/fir-plugin-prototype/testData") {
-            testClass<AbstractFirAllOpenDiagnosticTest> {
-                model("")
-            }
-        }
-
         testGroup("plugins/lombok/lombok-compiler-plugin/tests", "plugins/lombok/lombok-compiler-plugin/testData") {
             testClass<AbstractLombokCompileTest> {
                 model("compile")
@@ -374,5 +368,11 @@ fun main(args: Array<String>) {
                 model("codegen")
             }
         }
+
+        testGroup("plugins/fir/fir-plugin-prototype/tests", "plugins/fir/fir-plugin-prototype/testData") {
+            testClass<AbstractFirAllOpenDiagnosticTest> {
+                model("")
+            }
+        }
     }
 }

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<String>) {
     System.setProperty("java.awt.headless", "true")
@@ -22,4 +22,4 @@ fun main(args: Array<String>) {
             }
         }
     }
-}
+}