[kotlin] Move tests in kotlin.features-trainer module to a separate module

This commit partially solves a problem of a circular module dependency between tests of 'kotlin.compiler-plugins.kotlinx-serialization.common' module, tests of 'kotlin.idea.tests' module, and tests of 'kotlin.features-trainer'.

GitOrigin-RevId: e969138bf215202dbe077950d12d64510c6fd5e1
This commit is contained in:
Yan Zhulanow
2022-01-22 11:11:15 +00:00
committed by intellij-monorepo-bot
parent 91f5da16e0
commit e978c6f8e0
11 changed files with 30 additions and 4 deletions
+1
View File
@@ -973,6 +973,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/coverage/kotlin.coverage.iml" filepath="$PROJECT_DIR$/plugins/kotlin/coverage/kotlin.coverage.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/coverage/tests/kotlin.coverage.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/coverage/tests/kotlin.coverage.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/features-trainer/kotlin.features-trainer.iml" filepath="$PROJECT_DIR$/plugins/kotlin/features-trainer/kotlin.features-trainer.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/fir/kotlin.fir.iml" filepath="$PROJECT_DIR$/plugins/kotlin/fir/kotlin.fir.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/kotlin.fir-all-tests/kotlin.fir-all-tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/kotlin.fir-all-tests/kotlin.fir-all-tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/kotlin/analysis-api-providers-ide-impl/kotlin.fir.analysis-api-providers-ide-impl.iml" filepath="$PROJECT_DIR$/plugins/kotlin/analysis-api-providers-ide-impl/kotlin.fir.analysis-api-providers-ide-impl.iml" />
@@ -5,7 +5,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -21,8 +20,6 @@
<orderEntry type="module" module-name="kotlin.core" />
<orderEntry type="module" module-name="kotlin.formatter" />
<orderEntry type="module" module-name="kotlin.jvm" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="kotlin.plugin" scope="TEST" />
<orderEntry type="module" module-name="kotlin.idea" />
<orderEntry type="module" module-name="kotlin.common" />
</component>
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.featuresTrainer" />
<orderEntry type="module" module-name="intellij.java.featuresTrainer" />
<orderEntry type="module" module-name="intellij.java.psi" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.editor" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
<orderEntry type="module" module-name="kotlin.core" />
<orderEntry type="module" module-name="kotlin.formatter" />
<orderEntry type="module" module-name="kotlin.jvm" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="kotlin.plugin" scope="TEST" />
<orderEntry type="module" module-name="kotlin.idea" />
</component>
</module>
@@ -6,5 +6,5 @@ import java.io.File
object KotlinSuggestersTestUtils {
val testDataPath: String
get() = PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/plugins/kotlin/features-trainer/testData"
get() = PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/plugins/kotlin/features-trainer/tests/testData"
}
@@ -99,5 +99,7 @@
<orderEntry type="module" module-name="kotlin.gradle.gradle-native.tests" />
<orderEntry type="module" module-name="kotlin.uast.uast-kotlin.tests" />
<orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea.tests" />
<orderEntry type="module" module-name="kotlin.features-trainer" />
<orderEntry type="module" module-name="kotlin.features-trainer.tests" />
</component>
</module>