From e978c6f8e0ecc7ddda0ebe7583df4a5210432915 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <mail@yanex.org>
Date: Thu, 13 Jan 2022 18:02:08 +0900
Subject: [PATCH] [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
---
 .idea/modules.xml                             |  1 +
 .../kotlin.features-trainer.iml               |  3 ---
 .../tests/kotlin.features-trainer.tests.iml   | 26 +++++++++++++++++++
 .../ifs/FileStructureSuggesterKotlinTest.kt   |  0
 .../IntroduceVariableSuggesterKotlinTest.kt   |  0
 .../training/ifs/KotlinSuggestersTestUtils.kt |  2 +-
 .../ReplaceCompletionSuggesterKotlinTest.kt   |  0
 .../ifs/SurroundWithSuggesterKotlinTest.kt    |  0
 .../training/ifs/UnwrapSuggesterKotlinTest.kt |  0
 .../{ => tests}/testData/KotlinCodeExample.kt |  0
 .../kotlin.all-tests/kotlin.all-tests.iml     |  2 ++
 11 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml
 rename plugins/kotlin/features-trainer/{testSrc => tests/test}/org/jetbrains/kotlin/training/ifs/FileStructureSuggesterKotlinTest.kt (100%)
 rename plugins/kotlin/features-trainer/{testSrc => tests/test}/org/jetbrains/kotlin/training/ifs/IntroduceVariableSuggesterKotlinTest.kt (100%)
 rename plugins/kotlin/features-trainer/{testSrc => tests/test}/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt (83%)
 rename plugins/kotlin/features-trainer/{testSrc => tests/test}/org/jetbrains/kotlin/training/ifs/ReplaceCompletionSuggesterKotlinTest.kt (100%)
 rename plugins/kotlin/features-trainer/{testSrc => tests/test}/org/jetbrains/kotlin/training/ifs/SurroundWithSuggesterKotlinTest.kt (100%)
 rename plugins/kotlin/features-trainer/{testSrc => tests/test}/org/jetbrains/kotlin/training/ifs/UnwrapSuggesterKotlinTest.kt (100%)
 rename plugins/kotlin/features-trainer/{ => tests}/testData/KotlinCodeExample.kt (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 52100cdd8a7e..083ff3c1090c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -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" />
diff --git a/plugins/kotlin/features-trainer/kotlin.features-trainer.iml b/plugins/kotlin/features-trainer/kotlin.features-trainer.iml
index b4b465dc8948..ee4b7e9961bf 100644
--- a/plugins/kotlin/features-trainer/kotlin.features-trainer.iml
+++ b/plugins/kotlin/features-trainer/kotlin.features-trainer.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>
diff --git a/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml b/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml
new file mode 100644
index 000000000000..9f849aaf1789
--- /dev/null
+++ b/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml
@@ -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>
\ No newline at end of file
diff --git a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/FileStructureSuggesterKotlinTest.kt b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/FileStructureSuggesterKotlinTest.kt
similarity index 100%
rename from plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/FileStructureSuggesterKotlinTest.kt
rename to plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/FileStructureSuggesterKotlinTest.kt
diff --git a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/IntroduceVariableSuggesterKotlinTest.kt b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/IntroduceVariableSuggesterKotlinTest.kt
similarity index 100%
rename from plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/IntroduceVariableSuggesterKotlinTest.kt
rename to plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/IntroduceVariableSuggesterKotlinTest.kt
diff --git a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt
similarity index 83%
rename from plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt
rename to plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt
index d11d92d8b318..2773644a93a2 100644
--- a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt
+++ b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/KotlinSuggestersTestUtils.kt
@@ -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"
 }
\ No newline at end of file
diff --git a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/ReplaceCompletionSuggesterKotlinTest.kt b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/ReplaceCompletionSuggesterKotlinTest.kt
similarity index 100%
rename from plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/ReplaceCompletionSuggesterKotlinTest.kt
rename to plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/ReplaceCompletionSuggesterKotlinTest.kt
diff --git a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/SurroundWithSuggesterKotlinTest.kt b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/SurroundWithSuggesterKotlinTest.kt
similarity index 100%
rename from plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/SurroundWithSuggesterKotlinTest.kt
rename to plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/SurroundWithSuggesterKotlinTest.kt
diff --git a/plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/UnwrapSuggesterKotlinTest.kt b/plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/UnwrapSuggesterKotlinTest.kt
similarity index 100%
rename from plugins/kotlin/features-trainer/testSrc/org/jetbrains/kotlin/training/ifs/UnwrapSuggesterKotlinTest.kt
rename to plugins/kotlin/features-trainer/tests/test/org/jetbrains/kotlin/training/ifs/UnwrapSuggesterKotlinTest.kt
diff --git a/plugins/kotlin/features-trainer/testData/KotlinCodeExample.kt b/plugins/kotlin/features-trainer/tests/testData/KotlinCodeExample.kt
similarity index 100%
rename from plugins/kotlin/features-trainer/testData/KotlinCodeExample.kt
rename to plugins/kotlin/features-trainer/tests/testData/KotlinCodeExample.kt
diff --git a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
index 6a6ddf5078de..2ab80a972651 100644
--- a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
+++ b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
@@ -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>
\ No newline at end of file