diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestJdkKind.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.java similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/test/TestJdkKind.java rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.java diff --git a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt index 72096fe2337..bfcbf80e52a 100644 --- a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt +++ b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestsAgainstKlib.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.generators.tests import org.jetbrains.kotlin.codegen.ir.AbstractCompileKotlinAgainstKlibTest -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.test.TargetBackend fun main(args: Array) { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 961fae208a3..6d07fe643a5 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") public class DiagnosticTestGenerated extends AbstractDiagnosticTest { @Nested diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticUsingJavacTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticUsingJavacTestGenerated.java index 70b8d92d33d..449b963beca 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticUsingJavacTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticUsingJavacTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/tests/javac") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java index bc9296a4f9d..0c45772647f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest { @Nested diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index 6838d378e17..33db9111fc8 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosticTest { @Nested diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt index dacb7084f04..b6c7372d5a3 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt @@ -36,3 +36,5 @@ fun main(args: Array) { } } } + +const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt" 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 ee63c382f21..c6902c89a75 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 @@ -8,10 +8,11 @@ package org.jetbrains.kotlin.test.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.* +import org.jetbrains.kotlin.generators.impl.SimpleTestClassModelTestAllFilesPresentMethodGenerator +import org.jetbrains.kotlin.generators.impl.SimpleTestMethodGenerator +import org.jetbrains.kotlin.generators.impl.SingleClassTestModelAllFilesPresentedMethodGenerator import org.jetbrains.kotlin.generators.model.* import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestMetadata import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.Printer @@ -22,7 +23,6 @@ import java.io.IOException import java.util.* private val METHOD_GENERATORS = listOf( - RunTestMethodGenerator, SimpleTestClassModelTestAllFilesPresentMethodGenerator, SimpleTestMethodGenerator, SingleClassTestModelAllFilesPresentedMethodGenerator @@ -82,15 +82,8 @@ object NewTestGeneratorImpl : TestGenerator(METHOD_GENERATORS) { suiteTestClassFqName: String, baseTestClassFqName: String, private val testClassModels: Collection, - methodGenerators: Map> + private val methodGenerators: Map> ) { - private val methodGenerators = methodGenerators.toMutableMap().apply { - val newGenerator = this.computeIfPresent(CoroutinesTestMethodModel.Kind) { _, _ -> - SimpleTestMethodGenerator - } ?: return@apply - this[CoroutinesTestMethodModel.Kind] = newGenerator - } - private val baseTestClassPackage: String = baseTestClassFqName.substringBeforeLast('.', "") private val baseTestClassName: String = baseTestClassFqName.substringAfterLast('.', baseTestClassFqName) private val suiteClassPackage: String = suiteTestClassFqName.substringBeforeLast('.', baseTestClassPackage) @@ -148,7 +141,7 @@ object NewTestGeneratorImpl : TestGenerator(METHOD_GENERATORS) { p.println("import java.io.File;") p.println("import java.util.regex.Pattern;") p.println() - p.println("/** This class is generated by {@link ", KotlinTestUtils.TEST_GENERATOR_NAME, "}. DO NOT MODIFY MANUALLY */") + p.println("/** This class is generated by {@link ", TEST_GENERATOR_NAME, "}. DO NOT MODIFY MANUALLY */") p.generateSuppressAllWarnings() diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 236b42857a4..f326e3dcd6d 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -45,6 +45,8 @@ dependencies { testCompile(project(":js:js.translator")) testCompile(project(":native:frontend.native")) testCompileOnly(project(":plugins:android-extensions-compiler")) + testApi(projectTests(":generators:test-generator")) + testCompile(projectTests(":compiler:tests-classic-compiler-utils")) testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common-jvm6")) testCompile(project(":kotlin-scripting-compiler-impl")) diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt similarity index 100% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGenerationDSL.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGenerationDSL.kt new file mode 100644 index 00000000000..e450be255ae --- /dev/null +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGenerationDSL.kt @@ -0,0 +1,33 @@ +/* + * 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.impl + +import org.jetbrains.kotlin.generators.InconsistencyChecker +import org.jetbrains.kotlin.generators.InconsistencyChecker.Companion.inconsistencyChecker +import org.jetbrains.kotlin.generators.TestGroupSuite +import org.jetbrains.kotlin.generators.testGroupSuite + +fun generateTestGroupSuite( + args: Array, + init: TestGroupSuite.() -> Unit +) { + generateTestGroupSuite(InconsistencyChecker.hasDryRunArg(args), init) +} + +fun generateTestGroupSuite( + dryRun: Boolean = false, + init: TestGroupSuite.() -> Unit +) { + val suite = testGroupSuite(init) + for (testGroup in suite.testGroups) { + for (testClass in testGroup.testClasses) { + val (changed, testSourceFilePath) = TestGeneratorImpl.generateAndSave(testClass, dryRun) + if (changed) { + inconsistencyChecker(dryRun).add(testSourceFilePath) + } + } + } +} diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt similarity index 100% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java index d49b371fdea..c0b7f831644 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java @@ -15,7 +15,7 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt index f7dcd0b338f..6e08b32fb75 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsNoAnnotation import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsTest import org.jetbrains.kotlin.checkers.AbstractJspecifyAnnotationsTest import org.jetbrains.kotlin.checkers.javac.AbstractJavacForeignJava8AnnotationsTest -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8Test import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8WithPsiClassReadingTest import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJava8UsingJavacTest 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 9c981538503..4ce74268fda 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 @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.spec.utils.tasks -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.spec.checkers.AbstractDiagnosticsTestSpec import org.jetbrains.kotlin.spec.checkers.AbstractFirDiagnosticsTestSpec import org.jetbrains.kotlin.spec.codegen.AbstractBlackBoxCodegenTestSpec diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index fa92b5f0fc4..054895e8556 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.java.AbstractFirOldFrontendLightClassesTest import org.jetbrains.kotlin.fir.java.AbstractFirTypeEnhancementTest import org.jetbrains.kotlin.fir.java.AbstractOwnFirTypeEnhancementTest import org.jetbrains.kotlin.fir.lightTree.AbstractLightTree2FirConverterTestCase -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.integration.AbstractAntTaskTest diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/generators/tests/GenerateRuntimeDescriptorTests.kt b/core/descriptors.runtime/tests/org/jetbrains/kotlin/generators/tests/GenerateRuntimeDescriptorTests.kt index 2836c757ddf..4ef9773d4c7 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/generators/tests/GenerateRuntimeDescriptorTests.kt +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/generators/tests/GenerateRuntimeDescriptorTests.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.generators.tests -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.jvm.runtime.AbstractJvm8RuntimeDescriptorLoaderTest import org.jetbrains.kotlin.jvm.runtime.AbstractJvmRuntimeDescriptorLoaderTest diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index 1360363a085..eb9cadc61a2 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { testCompile(intellijDep()) { includeJars("util") } testCompile(project(":core:util.runtime")) - testCompile(projectTests(":compiler:tests-common")) + testApi(projectTests(":compiler:test-infrastructure-utils")) testCompile(kotlinStdlib()) testCompile(commonDep("junit:junit")) testCompile(project(":generators")) diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt index a66e9c1a13a..263ec402de0 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt @@ -5,10 +5,7 @@ package org.jetbrains.kotlin.generators -import org.jetbrains.kotlin.generators.impl.TestGeneratorImpl import org.jetbrains.kotlin.generators.model.* -import org.jetbrains.kotlin.generators.InconsistencyChecker.Companion.hasDryRunArg -import org.jetbrains.kotlin.generators.InconsistencyChecker.Companion.inconsistencyChecker import org.jetbrains.kotlin.generators.util.TestGeneratorUtil import org.jetbrains.kotlin.test.TargetBackend import java.io.File @@ -21,28 +18,6 @@ fun testGroupSuite( return TestGroupSuite().apply(init) } -fun generateTestGroupSuite( - args: Array, - init: TestGroupSuite.() -> Unit -) { - generateTestGroupSuite(hasDryRunArg(args), init) -} - -fun generateTestGroupSuite( - dryRun: Boolean = false, - init: TestGroupSuite.() -> Unit -) { - val suite = testGroupSuite(init) - for (testGroup in suite.testGroups) { - for (testClass in testGroup.testClasses) { - val (changed, testSourceFilePath) = TestGeneratorImpl.generateAndSave(testClass, dryRun) - if (changed) { - inconsistencyChecker(dryRun).add(testSourceFilePath) - } - } - } -} - class TestGroupSuite { private val _testGroups = mutableListOf() val testGroups: List diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/CoroutinesTestMethodModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/CoroutinesTestMethodModel.kt deleted file mode 100644 index 0ae612dab1f..00000000000 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/CoroutinesTestMethodModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.model - -import org.jetbrains.kotlin.test.TargetBackend -import java.io.File -import java.util.regex.Pattern - -class CoroutinesTestMethodModel( - rootDir: File, - file: File, - filenamePattern: Pattern, - checkFilenameStartsLowerCase: Boolean?, - targetBackend: TargetBackend, - skipIgnored: Boolean, - val isLanguageVersion1_3: Boolean -) : SimpleTestMethodModel( - rootDir, - file, - filenamePattern, - checkFilenameStartsLowerCase, - targetBackend, - skipIgnored -) { - object Kind : MethodModel.Kind() - - override val kind: MethodModel.Kind - get() = Kind - - override val name: String - get() = super.name + if (isLanguageVersion1_3) "_1_3" else "_1_2" -} diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 2ee65a13b1d..598a8d160a1 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.plugin.AbstractFirAllOpenDiagnosticTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.TestGroup -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as41 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as41 index 8f42e940994..19aacbb1a76 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as41 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as41 @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.TestGroup -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as42 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as42 index 8d15228c1a8..c74929eb79b 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as42 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as42 @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.TestGroup -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index c87be5fad87..0042c3b6ee6 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.generators.tests -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.js.test.AbstractDceTest import org.jetbrains.kotlin.js.test.AbstractJsLineNumberTest import org.jetbrains.kotlin.js.test.es6.semantics.* diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index 96a77bc4918..8d863d34fec 100644 --- a/libraries/tools/kotlinp/build.gradle.kts +++ b/libraries/tools/kotlinp/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { testCompileOnly(project(":kotlinx-metadata")) testCompileOnly(project(":kotlinx-metadata-jvm")) testCompile(commonDep("junit:junit")) + testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":generators:test-generator")) testRuntime(project(":kotlinx-metadata-jvm", configuration = "runtime")) diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt index 4246f620da1..39ecb0dd840 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt +++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kotlinp.test -import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite fun main(args: Array) { System.setProperty("java.awt.headless", "true")