From 23c088afd64564b839b3682d0afb8c726c2bfca4 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 10 Nov 2020 11:58:45 +0300 Subject: [PATCH] [TEST-GEN] Reorganize package structure in `:generators:test-generator` module --- .../tests/GenerateCompilerTestsAgainstKlib.kt | 2 +- .../generators/tests/GenerateJava8Tests.kt | 2 +- .../spec/utils/tasks/GenerateSpecTests.kt | 2 +- .../generators/tests/GenerateCompilerTests.kt | 6 +- .../tests/GenerateRuntimeDescriptorTests.kt | 2 +- .../kotlin/generators/InconsistencyChecker.kt | 37 +++++ .../generators => }/MethodGenerator.kt | 4 +- .../generator => }/TestGenerationDSL.kt | 141 +++++++----------- .../generators => }/TestGenerator.kt | 5 +- .../impl/RunTestMethodGenerator.kt | 8 +- ...ModelTestAllFilesPresentMethodGenerator.kt | 8 +- .../impl/SimpleTestMethodGenerator.kt | 10 +- ...stModelAllFilesPresentedMethodGenerator.kt | 8 +- .../generators => }/impl/TestGeneratorImpl.kt | 9 +- .../generator => model}/AnnotationModel.kt | 4 +- .../CoroutinesTestMethodModel.kt | 4 +- .../DelegatingTestClassModel.kt | 17 +-- .../generator => model}/RunTestMethodModel.kt | 4 +- .../SimpleTestClassModel.kt | 6 +- .../SimpleTestMethodModel.kt | 7 +- .../SingleClassTestModel.kt | 17 +-- .../{tests/generator => model}/TestModel.kt | 19 +-- .../tests/generator/TestGeneratorUtil.kt | 42 ------ .../generators/util/TestGeneratorUtil.kt | 36 +++++ .../kotlin/generators/util/generatorUtil.kt | 24 --- .../kotlin/generators/tests/GenerateTests.kt | 12 +- .../generators/tests/GenerateTests.kt.as41 | 12 +- .../generators/tests/GenerateTests.kt.as42 | 12 +- .../generators/tests/GenerateJsTests.kt | 2 +- .../kotlinp/test/GenerateKotlinpTests.kt | 2 +- .../kotlin/pill/generateAllTests/Main.java | 2 +- 31 files changed, 203 insertions(+), 263 deletions(-) create mode 100644 generators/test-generator/tests/org/jetbrains/kotlin/generators/InconsistencyChecker.kt rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/MethodGenerator.kt (82%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => }/TestGenerationDSL.kt (83%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/TestGenerator.kt (77%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/impl/RunTestMethodGenerator.kt (82%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt (89%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/impl/SimpleTestMethodGenerator.kt (70%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt (89%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator/generators => }/impl/TestGeneratorImpl.kt (96%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/AnnotationModel.kt (84%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{util => model}/CoroutinesTestMethodModel.kt (82%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/DelegatingTestClassModel.kt (50%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/RunTestMethodModel.kt (89%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/SimpleTestClassModel.kt (96%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/SimpleTestMethodModel.kt (90%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/SingleClassTestModel.kt (80%) rename generators/test-generator/tests/org/jetbrains/kotlin/generators/{tests/generator => model}/TestModel.kt (57%) delete mode 100644 generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.kt create mode 100644 generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TestGeneratorUtil.kt delete mode 100644 generators/test-generator/tests/org/jetbrains/kotlin/generators/util/generatorUtil.kt 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 a626b5eeb46..72096fe2337 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.tests.generator.generateTestGroupSuite +import org.jetbrains.kotlin.generators.generateTestGroupSuite import org.jetbrains.kotlin.test.TargetBackend fun main(args: Array) { 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 6b3ea576df3..f7dcd0b338f 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.tests.generator.generateTestGroupSuite +import org.jetbrains.kotlin.generators.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 911ab6d5df2..9c981538503 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.tests.generator.generateTestGroupSuite +import org.jetbrains.kotlin.generators.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 e5c647abf35..b5b3545ac57 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -30,9 +30,9 @@ 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.tests.generator.generateTestGroupSuite -import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME -import org.jetbrains.kotlin.generators.util.KT_WITHOUT_DOTS_IN_NAME +import org.jetbrains.kotlin.generators.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 import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase import org.jetbrains.kotlin.ir.AbstractIrJsTextTestCase 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 8be52e056a7..2836c757ddf 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.tests.generator.generateTestGroupSuite +import org.jetbrains.kotlin.generators.generateTestGroupSuite import org.jetbrains.kotlin.jvm.runtime.AbstractJvm8RuntimeDescriptorLoaderTest import org.jetbrains.kotlin.jvm.runtime.AbstractJvmRuntimeDescriptorLoaderTest diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/InconsistencyChecker.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/InconsistencyChecker.kt new file mode 100644 index 00000000000..4281c4044d5 --- /dev/null +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/InconsistencyChecker.kt @@ -0,0 +1,37 @@ +/* + * 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 + +interface InconsistencyChecker { + fun add(affectedFile: String) + + val affectedFiles: List + + companion object { + fun hasDryRunArg(args: Array) = args.any { it == "dryRun" } + + fun inconsistencyChecker(dryRun: Boolean) = if (dryRun) DefaultInconsistencyChecker else EmptyInconsistencyChecker + } +} + +object DefaultInconsistencyChecker : InconsistencyChecker { + private val files = mutableListOf() + + override fun add(affectedFile: String) { + files.add(affectedFile) + } + + override val affectedFiles: List + get() = files +} + +object EmptyInconsistencyChecker : InconsistencyChecker { + override fun add(affectedFile: String) { + } + + override val affectedFiles: List + get() = emptyList() +} diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/MethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/MethodGenerator.kt similarity index 82% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/MethodGenerator.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/MethodGenerator.kt index 7b8bbac5fe0..6da9a8f7cba 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/MethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/MethodGenerator.kt @@ -3,9 +3,9 @@ * 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.generator.generators +package org.jetbrains.kotlin.generators -import org.jetbrains.kotlin.generators.tests.generator.MethodModel +import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.utils.Printer abstract class MethodGenerator { diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt similarity index 83% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt index 2e7c0a75ab6..9cb4a090161 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerationDSL.kt @@ -1,19 +1,70 @@ /* - * Copyright 2010-2019 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.generator +package org.jetbrains.kotlin.generators import junit.framework.TestCase -import org.jetbrains.kotlin.generators.tests.generator.InconsistencyChecker.Companion.hasDryRunArg -import org.jetbrains.kotlin.generators.tests.generator.InconsistencyChecker.Companion.inconsistencyChecker -import org.jetbrains.kotlin.generators.tests.generator.generators.impl.* +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 import java.util.* import java.util.regex.Pattern +fun testGroupSuite( + init: TestGroupSuite.() -> Unit +): 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 + get() = _testGroups + + fun testGroup( + testsRoot: String, + testDataRoot: String, + testRunnerMethodName: String = RunTestMethodModel.METHOD_NAME, + additionalRunnerArguments: List = emptyList(), + init: TestGroup.() -> Unit + ) { + _testGroups += TestGroup( + testsRoot, + testDataRoot, + testRunnerMethodName, + additionalRunnerArguments, + ).apply(init) + } +} + class TestGroup( private val testsRoot: String, val testDataRoot: String, @@ -96,86 +147,6 @@ class TestGroup( } } -fun testGroupSuite( - init: TestGroupSuite.() -> Unit -): 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 - get() = _testGroups - - fun testGroup( - testsRoot: String, - testDataRoot: String, - testRunnerMethodName: String = RunTestMethodModel.METHOD_NAME, - additionalRunnerArguments: List = emptyList(), - init: TestGroup.() -> Unit - ) { - _testGroups += TestGroup( - testsRoot, - testDataRoot, - testRunnerMethodName, - additionalRunnerArguments, - ).apply(init) - } -} - -interface InconsistencyChecker { - fun add(affectedFile: String) - - val affectedFiles: List - - companion object { - fun hasDryRunArg(args: Array) = args.any { it == "dryRun" } - - fun inconsistencyChecker(dryRun: Boolean) = if (dryRun) DefaultInconsistencyChecker else EmptyInconsistencyChecker - } -} - -object DefaultInconsistencyChecker : InconsistencyChecker { - private val files = mutableListOf() - - override fun add(affectedFile: String) { - files.add(affectedFile) - } - - override val affectedFiles: List - get() = files -} - -object EmptyInconsistencyChecker : InconsistencyChecker { - override fun add(affectedFile: String) { - } - - override val affectedFiles: List - get() = emptyList() -} - fun getDefaultSuiteTestClassName(baseTestClassName: String): String { require(baseTestClassName.startsWith("Abstract")) { "Doesn't start with \"Abstract\": $baseTestClassName" } return baseTestClassName.substringAfter("Abstract") + "Generated" diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/TestGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerator.kt similarity index 77% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/TestGenerator.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerator.kt index f7f80dc2be6..f17535d5b98 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/TestGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/TestGenerator.kt @@ -3,10 +3,9 @@ * 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.generator.generators +package org.jetbrains.kotlin.generators -import org.jetbrains.kotlin.generators.tests.generator.MethodModel -import org.jetbrains.kotlin.generators.tests.generator.TestGroup +import org.jetbrains.kotlin.generators.model.MethodModel abstract class TestGenerator( methodGenerators: List> diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/RunTestMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt similarity index 82% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/RunTestMethodGenerator.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt index 3398b8e1adf..6dd71d49783 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/RunTestMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/RunTestMethodGenerator.kt @@ -3,11 +3,11 @@ * 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.generator.generators.impl +package org.jetbrains.kotlin.generators.impl -import org.jetbrains.kotlin.generators.tests.generator.MethodModel -import org.jetbrains.kotlin.generators.tests.generator.RunTestMethodModel -import org.jetbrains.kotlin.generators.tests.generator.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel +import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.RunTestMethodModel import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.utils.Printer diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt similarity index 89% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt index 0e9d959920f..f5aad1e0d61 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt @@ -3,12 +3,12 @@ * 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.generator.generators.impl +package org.jetbrains.kotlin.generators.impl import com.intellij.openapi.util.text.StringUtil -import org.jetbrains.kotlin.generators.tests.generator.MethodModel -import org.jetbrains.kotlin.generators.tests.generator.SimpleTestClassModel -import org.jetbrains.kotlin.generators.tests.generator.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel +import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.SimpleTestClassModel import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.utils.Printer diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SimpleTestMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt similarity index 70% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SimpleTestMethodGenerator.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt index f805a88a64b..bd0cb8b5983 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SimpleTestMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt @@ -3,12 +3,12 @@ * 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.generator.generators.impl +package org.jetbrains.kotlin.generators.impl -import org.jetbrains.kotlin.generators.tests.generator.MethodModel -import org.jetbrains.kotlin.generators.tests.generator.RunTestMethodModel -import org.jetbrains.kotlin.generators.tests.generator.SimpleTestMethodModel -import org.jetbrains.kotlin.generators.tests.generator.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel +import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.RunTestMethodModel +import org.jetbrains.kotlin.generators.model.SimpleTestMethodModel import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt similarity index 89% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt index 87798da2012..21fcadf6fbb 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt @@ -3,12 +3,12 @@ * 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.generator.generators.impl +package org.jetbrains.kotlin.generators.impl import com.intellij.openapi.util.text.StringUtil -import org.jetbrains.kotlin.generators.tests.generator.MethodModel -import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel -import org.jetbrains.kotlin.generators.tests.generator.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel +import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.SingleClassTestModel import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.utils.Printer diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/TestGeneratorImpl.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt similarity index 96% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/TestGeneratorImpl.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt index c6f4b94aa46..c2e33314dd9 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/generators/impl/TestGeneratorImpl.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/TestGeneratorImpl.kt @@ -3,11 +3,12 @@ * 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.generator.generators.impl +package org.jetbrains.kotlin.generators.impl -import org.jetbrains.kotlin.generators.tests.generator.* -import org.jetbrains.kotlin.generators.tests.generator.generators.MethodGenerator -import org.jetbrains.kotlin.generators.tests.generator.generators.TestGenerator +import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.TestGenerator +import org.jetbrains.kotlin.generators.TestGroup +import org.jetbrains.kotlin.generators.model.* import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil import org.jetbrains.kotlin.test.JUnit3RunnerWithInners import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/AnnotationModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/AnnotationModel.kt similarity index 84% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/AnnotationModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/AnnotationModel.kt index dc0b941152f..79dfe7945b6 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/AnnotationModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/AnnotationModel.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2019 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.generator +package org.jetbrains.kotlin.generators.model import org.jetbrains.kotlin.test.MuteExtraSuffix import org.jetbrains.kotlin.utils.Printer diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/CoroutinesTestMethodModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/CoroutinesTestMethodModel.kt similarity index 82% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/util/CoroutinesTestMethodModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/CoroutinesTestMethodModel.kt index bf0160a2651..0ae612dab1f 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/CoroutinesTestMethodModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/CoroutinesTestMethodModel.kt @@ -3,10 +3,8 @@ * 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.util +package org.jetbrains.kotlin.generators.model -import org.jetbrains.kotlin.generators.tests.generator.MethodModel -import org.jetbrains.kotlin.generators.tests.generator.SimpleTestMethodModel import org.jetbrains.kotlin.test.TargetBackend import java.io.File import java.util.regex.Pattern diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/DelegatingTestClassModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/DelegatingTestClassModel.kt similarity index 50% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/DelegatingTestClassModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/DelegatingTestClassModel.kt index b1449f0bba8..f3a7f9318da 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/DelegatingTestClassModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/DelegatingTestClassModel.kt @@ -1,19 +1,8 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * 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.generator +package org.jetbrains.kotlin.generators.model open class DelegatingTestClassModel(private val delegate: TestClassModel) : TestClassModel() { override val name: String diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/RunTestMethodModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/RunTestMethodModel.kt similarity index 89% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/RunTestMethodModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/RunTestMethodModel.kt index f321bb7cb5e..6329901aa2a 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/RunTestMethodModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/RunTestMethodModel.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.generator +package org.jetbrains.kotlin.generators.model import org.jetbrains.kotlin.test.TargetBackend diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt similarity index 96% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt index e5c5ef79ca4..a8564a70546 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt @@ -1,11 +1,11 @@ /* - * 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.generator +package org.jetbrains.kotlin.generators.model import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil.fileNameToJavaIdentifier +import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.fileNameToJavaIdentifier import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend import java.io.File diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestMethodModel.kt similarity index 90% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestMethodModel.kt index 204d91f1cd2..304ce4ac499 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestMethodModel.kt @@ -1,15 +1,14 @@ /* - * 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.generator +package org.jetbrains.kotlin.generators.model import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil.escapeForJavaIdentifier +import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.escapeForJavaIdentifier import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.utils.Printer import java.io.File import java.util.regex.Pattern diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SingleClassTestModel.kt similarity index 80% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SingleClassTestModel.kt index fa1ab0d32f2..abb6e76d6c3 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SingleClassTestModel.kt @@ -1,19 +1,8 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * 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.generator +package org.jetbrains.kotlin.generators.model import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/TestModel.kt similarity index 57% rename from generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestModel.kt rename to generators/test-generator/tests/org/jetbrains/kotlin/generators/model/TestModel.kt index 64dcc101889..539002d2041 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestModel.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/model/TestModel.kt @@ -1,22 +1,9 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * 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.generator - -import org.jetbrains.kotlin.utils.Printer +package org.jetbrains.kotlin.generators.model interface TestEntityModel { val name: String diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.kt deleted file mode 100644 index 30f02201653..00000000000 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jetbrains.kotlin.generators.tests.generator - -import kotlin.text.capitalize -import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil -import java.io.File -import java.lang.StringBuilder - -object TestGeneratorUtil { - @JvmStatic - fun escapeForJavaIdentifier(fileName: String): String { - // A file name may contain characters (like ".") that can't be a part of method name - val result = StringBuilder() - for (c in fileName) { - if (Character.isJavaIdentifierPart(c)) { - result.append(c) - } else { - result.append("_") - } - } - return result.toString() - } - - @JvmStatic - fun fileNameToJavaIdentifier(file: File): String { - return escapeForJavaIdentifier(file.name).capitalize() - } -} diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TestGeneratorUtil.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TestGeneratorUtil.kt new file mode 100644 index 00000000000..2766a4b4235 --- /dev/null +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TestGeneratorUtil.kt @@ -0,0 +1,36 @@ +/* + * 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.util + +import org.intellij.lang.annotations.Language +import kotlin.text.capitalize +import java.io.File +import java.lang.StringBuilder + +object TestGeneratorUtil { + @Language("RegExp") const val KT_OR_KTS = """^(.+)\.(kt|kts)$""" + @Language("RegExp") const val KT_OR_KTS_WITHOUT_DOTS_IN_NAME = """^([^.]+)\.(kt|kts)$""" + + @Language("RegExp") const val KT_WITHOUT_DOTS_IN_NAME = """^([^.]+)\.kt$""" + + @JvmStatic + fun escapeForJavaIdentifier(fileName: String): String { + // A file name may contain characters (like ".") that can't be a part of method name + val result = StringBuilder() + for (c in fileName) { + if (Character.isJavaIdentifierPart(c)) { + result.append(c) + } else { + result.append("_") + } + } + return result.toString() + } + + @JvmStatic + fun fileNameToJavaIdentifier(file: File): String { + return escapeForJavaIdentifier(file.name).capitalize() + } +} diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/generatorUtil.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/generatorUtil.kt deleted file mode 100644 index f63c8311e58..00000000000 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/generatorUtil.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.generators.util - -import org.intellij.lang.annotations.Language - -@Language("RegExp") const val KT_OR_KTS = """^(.+)\.(kt|kts)$""" -@Language("RegExp") const val KT_OR_KTS_WITHOUT_DOTS_IN_NAME = """^([^.]+)\.(kt|kts)$""" - -@Language("RegExp") const val KT_WITHOUT_DOTS_IN_NAME = """^([^.]+)\.kt$""" diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 0c357ac10e4..066125041f5 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -24,12 +24,12 @@ import org.jetbrains.kotlin.findUsages.* import org.jetbrains.kotlin.fir.plugin.AbstractFirAllOpenDiagnosticTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase -import org.jetbrains.kotlin.generators.tests.generator.TestGroup -import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix -import org.jetbrains.kotlin.generators.tests.generator.generateTestGroupSuite -import org.jetbrains.kotlin.generators.util.KT_OR_KTS -import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME -import org.jetbrains.kotlin.generators.util.KT_WITHOUT_DOTS_IN_NAME +import org.jetbrains.kotlin.generators.TestGroup +import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.model.muteExtraSuffix +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 import org.jetbrains.kotlin.idea.AbstractExpressionSelectionTest import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest import org.jetbrains.kotlin.idea.actions.AbstractGotoTestOrCodeActionTest 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 a63098ddd2d..bf16f61fa92 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as41 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as41 @@ -29,12 +29,12 @@ import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase -import org.jetbrains.kotlin.generators.tests.generator.TestGroup -import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix -import org.jetbrains.kotlin.generators.tests.generator.generateTestGroupSuite -import org.jetbrains.kotlin.generators.util.KT_OR_KTS -import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME -import org.jetbrains.kotlin.generators.util.KT_WITHOUT_DOTS_IN_NAME +import org.jetbrains.kotlin.generators.TestGroup +import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.model.muteExtraSuffix +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 import org.jetbrains.kotlin.idea.AbstractExpressionSelectionTest import org.jetbrains.kotlin.idea.index.AbstractKotlinTypeAliasByExpansionShortNameIndexTest import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest 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 d4d273fb092..03b01f09375 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as42 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as42 @@ -29,12 +29,12 @@ import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase -import org.jetbrains.kotlin.generators.tests.generator.TestGroup -import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix -import org.jetbrains.kotlin.generators.tests.generator.testGroup -import org.jetbrains.kotlin.generators.util.KT_OR_KTS -import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME -import org.jetbrains.kotlin.generators.util.KT_WITHOUT_DOTS_IN_NAME +import org.jetbrains.kotlin.generators.TestGroup +import org.jetbrains.kotlin.generators.generateTestGroupSuite +import org.jetbrains.kotlin.generators.model.muteExtraSuffix +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 import org.jetbrains.kotlin.idea.AbstractExpressionSelectionTest import org.jetbrains.kotlin.idea.index.AbstractKotlinTypeAliasByExpansionShortNameIndexTest import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest 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 31eee6f2f80..c87be5fad87 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.tests.generator.generateTestGroupSuite +import org.jetbrains.kotlin.generators.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/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt index d8447c04020..4246f620da1 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.tests.generator.generateTestGroupSuite +import org.jetbrains.kotlin.generators.generateTestGroupSuite fun main(args: Array) { System.setProperty("java.awt.headless", "true") 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 0d3b5a1b9ce..d714adf624e 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 @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.pill.generateAllTests; import org.jetbrains.kotlin.generators.tests.*; -import org.jetbrains.kotlin.generators.tests.generator.InconsistencyChecker; +import org.jetbrains.kotlin.generators.InconsistencyChecker; import java.util.List;