diff --git a/.idea/runConfigurations/Generate_Compiler_Tests.xml b/.idea/runConfigurations/Generate_Compiler_Tests.xml
index 44a573c3fb5..621873a8928 100644
--- a/.idea/runConfigurations/Generate_Compiler_Tests.xml
+++ b/.idea/runConfigurations/Generate_Compiler_Tests.xml
@@ -10,12 +10,11 @@
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index e01d48d01cf..67d8d3ebee0 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -99,8 +99,5 @@ projectTest(parallel = true) {
}
val generateTestData by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestDataKt")
-val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt") {
- dependsOn(generateTestData)
-}
testsJar()
diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts
index 77faab3ee3f..cacf5c9dd8a 100644
--- a/compiler/tests-common-new/build.gradle.kts
+++ b/compiler/tests-common-new/build.gradle.kts
@@ -17,9 +17,9 @@ dependencies {
testImplementation(projectTests(":generators:test-generator"))
- testImplementation(platform("org.junit:junit-bom:5.7.0"))
- testImplementation("org.junit.jupiter:junit-jupiter")
- testImplementation("org.junit.platform:junit-platform-commons:1.7.0")
+ testApi(platform("org.junit:junit-bom:5.7.0"))
+ testApi("org.junit.jupiter:junit-jupiter")
+ testApi("org.junit.platform:junit-platform-commons:1.7.0")
testApi(projectTests(":compiler:test-infrastructure"))
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
testImplementation(projectTests(":compiler:tests-compiler-utils"))
@@ -88,5 +88,3 @@ projectTest(parallel = true, jUnit5Enabled = true) {
}
testsJar()
-
-val generateTests by generator("org.jetbrains.kotlin.test.generators.GenerateNewCompilerTestsKt")
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt
index 1f95054aeb1..4a8222e28c0 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt
@@ -9,14 +9,14 @@ import org.jetbrains.kotlin.generators.InconsistencyChecker
import org.jetbrains.kotlin.generators.TestGroupSuite
import org.jetbrains.kotlin.generators.testGroupSuite
-fun generateNewTestGroupSuite(
+fun generateTestGroupSuiteWithJUnit5(
args: Array,
init: TestGroupSuite.() -> Unit
) {
- generateNewTestGroupSuite(InconsistencyChecker.hasDryRunArg(args), init)
+ generateTestGroupSuiteWithJUnit5(InconsistencyChecker.hasDryRunArg(args), init)
}
-fun generateNewTestGroupSuite(
+fun generateTestGroupSuiteWithJUnit5(
dryRun: Boolean = false,
init: TestGroupSuite.() -> Unit
) {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt
index c6902c89a75..492f658534f 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt
@@ -22,6 +22,8 @@ import java.io.File
import java.io.IOException
import java.util.*
+private const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt"
+
private val METHOD_GENERATORS = listOf(
SimpleTestClassModelTestAllFilesPresentMethodGenerator,
SimpleTestMethodGenerator,
diff --git a/compiler/tests-for-compiler-generator/build.gradle.kts b/compiler/tests-for-compiler-generator/build.gradle.kts
new file mode 100644
index 00000000000..59c5fe04815
--- /dev/null
+++ b/compiler/tests-for-compiler-generator/build.gradle.kts
@@ -0,0 +1,35 @@
+plugins {
+ kotlin("jvm")
+ id("jps-compatible")
+}
+
+dependencies {
+ testRuntimeOnly(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
+ testImplementation(kotlinStdlib())
+
+ testImplementation(platform("org.junit:junit-bom:5.7.0"))
+ testImplementation("org.junit.jupiter:junit-jupiter")
+ testImplementation(projectTests(":compiler:tests-common"))
+ testImplementation(projectTests(":compiler:tests-common-new"))
+ testImplementation(projectTests(":compiler:tests-common"))
+ testImplementation(projectTests(":compiler"))
+ testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
+ testImplementation(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
+ testImplementation(projectTests(":compiler:fir:fir2ir"))
+ testImplementation(projectTests(":compiler:fir:analysis-tests"))
+ testImplementation(projectTests(":compiler:visualizer"))
+ testImplementation(projectTests(":generators:test-generator"))
+ testCompileOnly(project(":kotlin-reflect-api"))
+ testRuntimeOnly(project(":kotlin-reflect"))
+}
+
+sourceSets {
+ "main" {}
+ "test" { projectDefault() }
+}
+
+val generateTests by generator("org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt") {
+ dependsOn(":compiler:generateTestData")
+}
+
+testsJar()
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateCompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateCompilerTests.kt
new file mode 100644
index 00000000000..bebe8383f90
--- /dev/null
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateCompilerTests.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 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
+
+fun main(args: Array) {
+ System.setProperty("java.awt.headless", "true")
+
+ generateJUnit3CompilerTests(args)
+ generateJUnit5CompilerTests(args)
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
similarity index 99%
rename from compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
rename to compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
index 8bad7ab7bbe..8a5a654f8ff 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
@@ -1,9 +1,9 @@
/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.generators.tests
+package org.jetbrains.kotlin.test.generators
import org.jetbrains.kotlin.asJava.AbstractCompilerLightClassTest
import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
@@ -62,9 +62,7 @@ import org.jetbrains.kotlin.types.AbstractTypeBindingTest
import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizer
import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizer
-fun main(args: Array) {
- System.setProperty("java.awt.headless", "true")
-
+fun generateJUnit3CompilerTests(args: Array) {
generateTestGroupSuite(args) {
testGroup("compiler/tests-gen", "compiler/testData") {
testClass {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
similarity index 83%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
rename to compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index 113823e1fe5..793b2f7f652 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -5,14 +5,14 @@
package org.jetbrains.kotlin.test.generators
-import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME
+import org.jetbrains.kotlin.generators.util.TestGeneratorUtil
import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.runners.*
-fun main(args: Array) {
+fun generateJUnit5CompilerTests(args: Array) {
val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$"
- generateNewTestGroupSuite(args) {
+ generateTestGroupSuiteWithJUnit5(args) {
testGroup("compiler/tests-common-new/tests-gen", "compiler/testData") {
testClass {
model("diagnostics/tests", pattern = "^(.*)\\.kts?$", excludedPattern = excludedFirTestdataPattern)
@@ -47,15 +47,14 @@ fun main(args: Array) {
testGroup("compiler/tests-common-new/tests-gen", "compiler/fir/analysis-tests/testData") {
testClass {
- model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME)
- model("resolveWithStdlib", pattern = KT_WITHOUT_DOTS_IN_NAME)
+ model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
+ model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
}
testClass {
- model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME)
+ model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
}
}
}
-}
-const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt"
+}
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index b572a5b6367..61b9c15af60 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
val depenencyProjects = arrayOf(
":generators",
":compiler",
- ":compiler:tests-common-new",
+ ":compiler:tests-for-compiler-generator",
":js:js.tests",
":compiler:tests-java8",
":core:descriptors.runtime"
diff --git a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
index 287b3fe3dd3..559832b2d0c 100644
--- a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
+++ b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
@@ -7,14 +7,13 @@ package org.jetbrains.kotlin.pill.generateAllTests;
import org.jetbrains.kotlin.generators.tests.*;
import org.jetbrains.kotlin.generators.InconsistencyChecker;
-import org.jetbrains.kotlin.test.generators.GenerateNewCompilerTestsKt;
+import org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt;
import java.util.List;
public class Main {
public static void main(String[] args) {
GenerateCompilerTestsKt.main(args);
- GenerateNewCompilerTestsKt.main(args);
GenerateTestsKt.main(args);
GenerateJsTestsKt.main(args);
GenerateJava8TestsKt.main(args);
diff --git a/settings.gradle b/settings.gradle
index 01a97906baa..5f2fd646923 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -121,6 +121,7 @@ include ":benchmarks",
":compiler:tests-mutes:tc-integration",
":compiler:tests-common-jvm6",
":compiler:tests-against-klib",
+ ":compiler:tests-for-compiler-generator",
":dukat",
":js:js.ast",
":js:js.serializer",