azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 9955f342c0.
This commit is contained in:
Dmitriy Novozhilov
2020-03-13 20:51:41 +03:00
parent bdd88e1655
commit 9daed1f2c6
18 changed files with 84 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/build.gradle.kts
-1
View File
@@ -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
+14 -16
View File
@@ -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
+19
View File
@@ -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
+18
View File
@@ -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
+19
View File
@@ -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)
}
}
/*