[FIR-TEST] Move FIR ide tests to separate module

generators/build.gradle.kts

@@ -37,6 +37,7 @@ dependencies {
 
     testCompile(projectTests(":compiler:cli"))
     testCompile(projectTests(":idea:idea-maven"))
+    testCompile(projectTests(":idea:idea-fir"))
     testCompile(projectTests(":j2k"))
     testCompile(projectTests(":nj2k"))
     testCompile(projectTests(":libraries:tools:new-project-wizard:new-project-wizard-cli"))

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

@@ -258,16 +258,6 @@ fun main(args: Array<String>) {
             model("checker/diagnosticsMessage")
         }
 
-        testClass<AbstractFirPsiCheckerTest> {
-            model("checker", recursive = false)
-            model("checker/regression")
-            model("checker/recovery")
-            model("checker/rendering")
-            model("checker/duplicateJvmSignature")
-            model("checker/infos")
-            model("checker/diagnosticsMessage")
-        }
-
         testClass<AbstractJavaAgainstKotlinSourceCheckerTest> {
             model("kotlinAndJavaChecker/javaAgainstKotlin")
             model("kotlinAndJavaChecker/javaWithKotlin")
@@ -517,10 +507,6 @@ fun main(args: Array<String>) {
             model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
         }
 
-        testClass<AbstractFirReferenceResolveTest> {
-            model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
-        }
-
         testClass<AbstractReferenceResolveInJavaTest> {
             model("resolve/referenceInJava/binaryAndSource", extension = "java")
             model("resolve/referenceInJava/sourceOnly", extension = "java")
@@ -889,7 +875,9 @@ fun main(args: Array<String>) {
         testClass<AbstractSlicerNullnessGroupingTest> {
             model("slicer/inflow", singleClass = true)
         }
+    }
 
+    testGroup("idea/idea-fir/tests", "idea/testData") {
         testClass<AbstractFirMultiModuleResolveTest> {
             model("fir/multiModule", recursive = false, extension = null)
         }
@@ -897,6 +885,20 @@ fun main(args: Array<String>) {
         testClass<AbstractFirLazyResolveTest> {
             model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
         }
+
+        testClass<AbstractFirReferenceResolveTest> {
+            model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
+        }
+
+        testClass<AbstractFirPsiCheckerTest> {
+            model("checker", recursive = false)
+            model("checker/regression")
+            model("checker/recovery")
+            model("checker/rendering")
+            model("checker/duplicateJvmSignature")
+            model("checker/infos")
+            model("checker/diagnosticsMessage")
+        }
     }
 
     testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {

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

@@ -81,7 +81,6 @@ import org.jetbrains.kotlin.idea.editor.AbstractMultiLineStringIndentTest
 import org.jetbrains.kotlin.idea.editor.backspaceHandler.AbstractBackspaceHandlerTest
 import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractQuickDocProviderTest
 import org.jetbrains.kotlin.idea.filters.AbstractKotlinExceptionFilterTest
-import org.jetbrains.kotlin.idea.fir.AbstractFirMultiModuleResolveTest
 import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyWithLibTest
@@ -249,16 +248,6 @@ fun main(args: Array<String>) {
             model("checker/diagnosticsMessage")
         }
 
-        testClass<AbstractFirPsiCheckerTest> {
-            model("checker", recursive = false)
-            model("checker/regression")
-            model("checker/recovery")
-            model("checker/rendering")
-            model("checker/duplicateJvmSignature")
-            model("checker/infos")
-            model("checker/diagnosticsMessage")
-        }
-
         testClass<AbstractJavaAgainstKotlinSourceCheckerTest> {
             model("kotlinAndJavaChecker/javaAgainstKotlin")
             model("kotlinAndJavaChecker/javaWithKotlin")
@@ -503,10 +492,6 @@ fun main(args: Array<String>) {
             model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
         }
 
-        testClass<AbstractFirReferenceResolveTest> {
-            model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
-        }
-
         testClass<AbstractReferenceResolveInJavaTest> {
             model("resolve/referenceInJava/binaryAndSource", extension = "java")
             model("resolve/referenceInJava/sourceOnly", extension = "java")
@@ -865,10 +850,6 @@ fun main(args: Array<String>) {
         testClass<AbstractScratchLineMarkersTest> {
             model("scratch/lineMarker", testMethod = "doScratchTest", pattern = KT_OR_KTS)
         }
-
-        testClass<AbstractFirMultiModuleResolveTest> {
-            model("fir/multiModule", recursive = false, extension = null)
-        }
     }
 
     /*

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

@@ -81,7 +81,6 @@ import org.jetbrains.kotlin.idea.editor.AbstractMultiLineStringIndentTest
 import org.jetbrains.kotlin.idea.editor.backspaceHandler.AbstractBackspaceHandlerTest
 import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractQuickDocProviderTest
 import org.jetbrains.kotlin.idea.filters.AbstractKotlinExceptionFilterTest
-import org.jetbrains.kotlin.idea.fir.AbstractFirMultiModuleResolveTest
 import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyWithLibTest
@@ -249,16 +248,6 @@ fun main(args: Array<String>) {
             model("checker/diagnosticsMessage")
         }
 
-        testClass<AbstractFirPsiCheckerTest> {
-            model("checker", recursive = false)
-            model("checker/regression")
-            model("checker/recovery")
-            model("checker/rendering")
-            model("checker/duplicateJvmSignature")
-            model("checker/infos")
-            model("checker/diagnosticsMessage")
-        }
-
         testClass<AbstractJavaAgainstKotlinSourceCheckerTest> {
             model("kotlinAndJavaChecker/javaAgainstKotlin")
             model("kotlinAndJavaChecker/javaWithKotlin")
@@ -503,10 +492,6 @@ fun main(args: Array<String>) {
             model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
         }
 
-        testClass<AbstractFirReferenceResolveTest> {
-            model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
-        }
-
         testClass<AbstractReferenceResolveInJavaTest> {
             model("resolve/referenceInJava/binaryAndSource", extension = "java")
             model("resolve/referenceInJava/sourceOnly", extension = "java")
@@ -866,9 +851,6 @@ fun main(args: Array<String>) {
             model("scratch/lineMarker", testMethod = "doScratchTest", pattern = KT_OR_KTS)
         }
 
-        testClass<AbstractFirMultiModuleResolveTest> {
-            model("fir/multiModule", recursive = false, extension = null)
-        }
     }
 
     /*

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

@@ -81,7 +81,6 @@ import org.jetbrains.kotlin.idea.editor.AbstractMultiLineStringIndentTest
 import org.jetbrains.kotlin.idea.editor.backspaceHandler.AbstractBackspaceHandlerTest
 import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractQuickDocProviderTest
 import org.jetbrains.kotlin.idea.filters.AbstractKotlinExceptionFilterTest
-import org.jetbrains.kotlin.idea.fir.AbstractFirMultiModuleResolveTest
 import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyWithLibTest
@@ -249,16 +248,6 @@ fun main(args: Array<String>) {
             model("checker/diagnosticsMessage")
         }
 
-        testClass<AbstractFirPsiCheckerTest> {
-            model("checker", recursive = false)
-            model("checker/regression")
-            model("checker/recovery")
-            model("checker/rendering")
-            model("checker/duplicateJvmSignature")
-            model("checker/infos")
-            model("checker/diagnosticsMessage")
-        }
-
         testClass<AbstractJavaAgainstKotlinSourceCheckerTest> {
             model("kotlinAndJavaChecker/javaAgainstKotlin")
             model("kotlinAndJavaChecker/javaWithKotlin")
@@ -503,10 +492,6 @@ fun main(args: Array<String>) {
             model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
         }
 
-        testClass<AbstractFirReferenceResolveTest> {
-            model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME)
-        }
-
         testClass<AbstractReferenceResolveInJavaTest> {
             model("resolve/referenceInJava/binaryAndSource", extension = "java")
             model("resolve/referenceInJava/sourceOnly", extension = "java")
@@ -865,10 +850,6 @@ fun main(args: Array<String>) {
         testClass<AbstractScratchLineMarkersTest> {
             model("scratch/lineMarker", testMethod = "doScratchTest", pattern = KT_OR_KTS)
         }
-
-        testClass<AbstractFirMultiModuleResolveTest> {
-            model("fir/multiModule", recursive = false, extension = null)
-        }
     }
 
     /*