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

This reverts commit 36ec0a2e2e.

build.gradle.kts

@@ -563,7 +563,7 @@ tasks {
             ":compiler:fir:lightTree:test",
             ":compiler:fir:resolve:test",
             ":compiler:fir:fir2ir:test",
-            ":idea:idea-fir:test"
+            ":idea:firTest"
         )
     }
 
@@ -657,8 +657,7 @@ tasks {
             ":idea:jvm-debugger:jvm-debugger-evaluation:test",
             ":idea:jvm-debugger:jvm-debugger-sequence:test",
             ":idea:jvm-debugger:eval4j:test",
-            ":idea:scripting-support:test",
+            ":idea:scripting-support:test"
-            ":idea:idea-fir:test"
         )
     }
 

generators/build.gradle.kts

@@ -37,7 +37,6 @@ 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,6 +258,16 @@ 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")
@@ -507,6 +517,10 @@ 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")
@@ -875,9 +889,7 @@ 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)
         }
@@ -885,20 +897,6 @@ 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,6 +81,7 @@ 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
@@ -248,6 +249,16 @@ 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")
@@ -492,6 +503,10 @@ 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")
@@ -850,6 +865,10 @@ 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,6 +81,7 @@ 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
@@ -248,6 +249,16 @@ 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")
@@ -492,6 +503,10 @@ 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")
@@ -851,6 +866,9 @@ 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,6 +81,7 @@ 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
@@ -248,6 +249,16 @@ 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")
@@ -492,6 +503,10 @@ 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")
@@ -850,6 +865,10 @@ 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)
+        }
     }
 
     /*

idea/build.gradle.kts

@@ -188,6 +188,15 @@ projectTest(parallel = true) {
     workingDir = rootDir
 }
 
+projectTest("firTest", parallel = true) {
+    dependsOn(":dist")
+    workingDir = rootDir
+    filter {
+        includeTestsMatching("org.jetbrains.kotlin.idea.fir.*")
+        includeTestsMatching("org.jetbrains.kotlin.idea.resolve.FirReferenceResolveTestGenerated")
+    }
+}
+
 configureFormInstrumentation()
 
 testsJar()

idea/idea-fir/build.gradle.kts

@@ -1,60 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    testCompileOnly(toolsJar())
-    testCompile(projectTests(":idea"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testCompile(commonDep("junit:junit"))
-
-    testCompileOnly(intellijDep())
-    testRuntime(intellijDep())
-
-    Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntime(intellijPluginDep("java"))
-    }
-
-    testRuntime(intellijRuntimeAnnotations())
-    testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false }
-    testRuntime(commonDep("org.jetbrains", "markdown"))
-    testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":kotlin-preloader"))
-
-    testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false }
-
-    testRuntime(project(":plugins:android-extensions-compiler"))
-    testRuntimeOnly(project(":kotlin-android-extensions-runtime")) // TODO: fix import (workaround for jps build)
-    testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }
-    testRuntime(project(":allopen-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":kotlin-allopen-compiler-plugin"))
-    testRuntime(project(":noarg-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":kotlin-noarg-compiler-plugin"))
-    testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-compiler-impl"))
-    testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":kotlinx-serialization-compiler-plugin"))
-    testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":idea:idea-android")) { isTransitive = false }
-    testRuntime(project(":plugins:lint")) { isTransitive = false }
-    testRuntime(project(":plugins:uast-kotlin"))
-    testRuntime(project(":nj2k:nj2k-services")) { isTransitive = false }
-}
-
-sourceSets {
-    "main" { none() }
-    "test" { projectDefault() }
-}
-
-projectTest(parallel = true) {
-    dependsOn(":dist")
-    workingDir = rootDir
-}
-
-testsJar()

idea/tests/org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2019 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.
  */
 

idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirLazyResolveTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2019 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.
  */
 

idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractFirReferenceResolveTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2019 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.
  */
 

settings.gradle

@@ -151,7 +151,6 @@ include ":kotlin-build-common",
         ":idea:formatter",
         ":idea:ide-common",
         ":idea:idea-core",
-        ":idea:idea-fir",
         ":idea:kotlin-gradle-tooling",
         ":idea:idea-android",
         ":idea:idea-android-output-parser",