Created module idea-test-framework and moved classes needed for idea tests there

Moved tests for completion and their test data into module idea-completion

.idea/modules.xml

@@ -33,6 +33,7 @@
       <module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" filepath="$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />

.idea/runConfigurations/Smart_Completion_Tests.xml

@@ -23,11 +23,11 @@
     </option>
     <envs />
     <patterns>
-      <pattern testClass="org.jetbrains.kotlin.completion.JvmSmartCompletionTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.completion.handlers.SmartCompletionHandlerTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.completion.handlers.SmartCompletionMultifileHandlerTest" />
-      <pattern testClass="org.jetbrains.kotlin.completion.weighers.SmartCompletionWeigherTestGenerated" />
-      <pattern testClass="org.jetbrains.kotlin.completion.MultiFileSmartCompletionTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.JvmSmartCompletionTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.handlers.SmartCompletionHandlerTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.handlers.SmartCompletionMultifileHandlerTest" />
+      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.weighers.SmartCompletionWeigherTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.idea.completion.test.MultiFileSmartCompletionTestGenerated" />
     </patterns>
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />

generators/generators.iml

@@ -28,5 +28,7 @@
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
+    <orderEntry type="module" module-name="idea-completion" scope="TEST" />
   </component>
 </module>

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.generators.tests
 
 import junit.framework.TestCase
+import org.jetbrains.kotlin.AbstractDataFlowValueRenderingTest
 import org.jetbrains.kotlin.addImport.AbstractAddImportTest
 import org.jetbrains.kotlin.android.*
 import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest
@@ -30,13 +31,6 @@ import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsR
 import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest
 import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
 import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxInlineCodegenTest
-import org.jetbrains.kotlin.completion.*
-import org.jetbrains.kotlin.completion.handlers.AbstractBasicCompletionHandlerTest
-import org.jetbrains.kotlin.completion.handlers.AbstractCompletionCharFilterTest
-import org.jetbrains.kotlin.completion.handlers.AbstractKeywordCompletionHandlerTest
-import org.jetbrains.kotlin.completion.handlers.AbstractSmartCompletionHandlerTest
-import org.jetbrains.kotlin.completion.weighers.AbstractBasicCompletionWeigherTest
-import org.jetbrains.kotlin.completion.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest
 import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest
 import org.jetbrains.kotlin.formatter.AbstractJetTypingIndentationTestBase
@@ -52,6 +46,13 @@ import org.jetbrains.kotlin.idea.codeInsight.AbstractOutOfBlockModificationTest
 import org.jetbrains.kotlin.idea.codeInsight.moveUpDown.AbstractCodeMoverTest
 import org.jetbrains.kotlin.idea.codeInsight.surroundWith.AbstractSurroundWithTest
 import org.jetbrains.kotlin.idea.codeInsight.unwrap.AbstractUnwrapRemoveTest
+import org.jetbrains.kotlin.idea.completion.test.*
+import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractBasicCompletionHandlerTest
+import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractCompletionCharFilterTest
+import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordCompletionHandlerTest
+import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
+import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
+import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.idea.configuration.AbstractConfigureProjectByChangingFileTest
 import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
@@ -344,59 +345,6 @@ fun main(args: Array<String>) {
             model("quickfix", pattern = "^before(\\w+)\\.kt$")
         }
 
-        testClass(javaClass<AbstractJSBasicCompletionTest>()) {
-            model("completion/basic/common")
-            model("completion/basic/js")
-        }
-
-        testClass(javaClass<AbstractJvmBasicCompletionTest>()) {
-            model("completion/basic/common")
-            model("completion/basic/java")
-        }
-
-        testClass(javaClass<AbstractJvmSmartCompletionTest>()) {
-            model("completion/smart")
-        }
-
-        testClass(javaClass<AbstractKeywordCompletionTest>()) {
-            model("completion/keywords", recursive = false)
-        }
-
-        testClass(javaClass<AbstractJvmWithLibBasicCompletionTest>()) {
-            model("completion/basic/custom", recursive = false)
-        }
-
-        testClass(javaClass<AbstractBasicCompletionHandlerTest>()) {
-            model("completion/handlers/basic")
-        }
-
-        testClass(javaClass<AbstractSmartCompletionHandlerTest>()) {
-            model("completion/handlers/smart")
-        }
-
-        testClass(javaClass<AbstractKeywordCompletionHandlerTest>()) {
-            model("completion/handlers/keywords")
-        }
-
-        testClass(javaClass<AbstractCompletionCharFilterTest>()) {
-            model("completion/handlers/charFilter")
-        }
-
-        testClass(javaClass<AbstractCodeFragmentCompletionHandlerTest>()) {
-            model("completion/handlers/runtimeCast")
-        }
-
-        testClass(javaClass<AbstractCodeFragmentCompletionTest>()) {
-            model("completion/basic/codeFragments", extension = "kt")
-        }
-
-        testClass(javaClass<AbstractMultiFileJvmBasicCompletionTest>()) {
-            model("completion/basic/multifile", extension = null, recursive = false)
-        }
-        testClass(javaClass<AbstractMultiFileSmartCompletionTest>()) {
-            model("completion/smartMultiFile", extension = null, recursive = false)
-        }
-
         testClass(javaClass<AbstractGotoSuperTest>()) {
             model("navigation/gotoSuper", extension = "test")
         }
@@ -540,13 +488,6 @@ fun main(args: Array<String>) {
             model("refactoring/move", extension = "test", singleClass = true)
         }
 
-        testClass(javaClass<AbstractBasicCompletionWeigherTest>()) {
-            model("completion/weighers/basic", pattern = """^([^\.]+)\.kt$""")
-        }
-        testClass(javaClass<AbstractSmartCompletionWeigherTest>()) {
-            model("completion/weighers/smart", pattern = """^([^\.]+)\.kt$""")
-        }
-
         testClass(javaClass<AbstractConfigureProjectByChangingFileTest>()) {
             model("configuration/android-gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestAndroidGradle")
             model("configuration/gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestGradle")
@@ -611,14 +552,6 @@ fun main(args: Array<String>) {
             model("addImport", pattern = """^([^\.]+)\.kt$""")
         }
 
-        testClass(javaClass<AbstractCompiledKotlinInJavaCompletionTest>()) {
-            model("completion/injava", extension = "java")
-        }
-
-        testClass(javaClass<AbstractKotlinSourceInJavaCompletionTest>()) {
-            model("completion/injava", extension = "java")
-        }
-
         testClass(javaClass<AbstractSmartSelectionTest>()) {
             model("smartSelection", testMethod = "doTestSmartSelection", pattern = """^([^\.]+)\.kt$""")
         }
@@ -695,10 +628,6 @@ fun main(args: Array<String>) {
         testClass(javaClass<AbstractKDocHighlightingTest>()) {
             model("kdoc/highlighting")
         }
-
-        testClass<AbstractJvmBasicCompletionTest>("org.jetbrains.kotlin.idea.kdoc.KDocCompletionTestGenerated") {
-            model("kdoc/completion")
-        }
     }
 
     testGroup("idea/tests", "compiler/testData") {
@@ -707,6 +636,85 @@ fun main(args: Array<String>) {
         }
     }
 
+    testGroup("idea/idea-completion/tests", "idea/idea-completion/testData") {
+        testClass(javaClass<AbstractCompiledKotlinInJavaCompletionTest>()) {
+            model("injava", extension = "java")
+        }
+
+        testClass(javaClass<AbstractKotlinSourceInJavaCompletionTest>()) {
+            model("injava", extension = "java")
+        }
+
+        testClass(javaClass<AbstractBasicCompletionWeigherTest>()) {
+            model("weighers/basic", pattern = """^([^\.]+)\.kt$""")
+        }
+
+        testClass(javaClass<AbstractSmartCompletionWeigherTest>()) {
+            model("weighers/smart", pattern = """^([^\.]+)\.kt$""")
+        }
+
+        testClass(javaClass<AbstractJSBasicCompletionTest>()) {
+            model("basic/common")
+            model("basic/js")
+        }
+
+        testClass(javaClass<AbstractJvmBasicCompletionTest>()) {
+            model("basic/common")
+            model("basic/java")
+        }
+
+        testClass(javaClass<AbstractJvmSmartCompletionTest>()) {
+            model("smart")
+        }
+
+        testClass(javaClass<AbstractKeywordCompletionTest>()) {
+            model("keywords", recursive = false)
+        }
+
+        testClass(javaClass<AbstractJvmWithLibBasicCompletionTest>()) {
+            model("basic/custom", recursive = false)
+        }
+
+        testClass(javaClass<AbstractBasicCompletionHandlerTest>()) {
+            model("handlers/basic")
+        }
+
+        testClass(javaClass<AbstractSmartCompletionHandlerTest>()) {
+            model("handlers/smart")
+        }
+
+        testClass(javaClass<AbstractKeywordCompletionHandlerTest>()) {
+            model("handlers/keywords")
+        }
+
+        testClass(javaClass<AbstractCompletionCharFilterTest>()) {
+            model("handlers/charFilter")
+        }
+
+        testClass(javaClass<AbstractMultiFileJvmBasicCompletionTest>()) {
+            model("basic/multifile", extension = null, recursive = false)
+        }
+
+        testClass(javaClass<AbstractMultiFileSmartCompletionTest>()) {
+            model("smartMultiFile", extension = null, recursive = false)
+        }
+
+        testClass<AbstractJvmBasicCompletionTest>("org.jetbrains.kotlin.idea.completion.test.KDocCompletionTestGenerated") {
+            model("kdoc")
+        }
+    }
+
+    //TODO: move these tests into idea-completion module
+    testGroup("idea/tests", "idea/idea-completion/testData") {
+        testClass(javaClass<AbstractCodeFragmentCompletionHandlerTest>()) {
+            model("handlers/runtimeCast")
+        }
+
+        testClass(javaClass<AbstractCodeFragmentCompletionTest>()) {
+            model("basic/codeFragments", extension = "kt")
+        }
+    }
+
     testGroup("j2k/tests", "j2k/testData") {
         testClass(javaClass<AbstractJavaToKotlinConverterSingleFileTest>()) {
             model("fileOrElement", extension = "java")

idea/idea-completion/idea-completion.iml

@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -17,5 +18,9 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-core" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="library" scope="RUNTIME" name="junit-plugin" level="project" />
+    <orderEntry type="module" module-name="idea" scope="RUNTIME" />
   </component>
 </module>