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

Rewrite CompletionMultiFileHandlerTest to KotlinFixtureCompletionBaseTestCase

Browse Source 
Use light projects as an attempt to fight leaking project errors
This commit is contained in:
Nikolay Krasko
2020-08-20 18:57:51 +03:00
parent f92083989a
commit e95c3e2905
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionMultifileHandlerTest.kt
+19 -11
View File
@@ -5,15 +5,19 @@
package org.jetbrains.kotlin.idea.completion.test.handlers package org.jetbrains.kotlin.idea.completion.test.handlers
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.lookup.LookupElementPresentation import com.intellij.codeInsight.lookup.LookupElementPresentation
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH
import org.jetbrains.kotlin.idea.completion.test.KotlinCompletionTestCase import org.jetbrains.kotlin.idea.completion.test.KotlinFixtureCompletionBaseTestCase
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
import org.junit.runner.RunWith import org.junit.runner.RunWith
import java.io.File import java.io.File
@RunWith(JUnit3WithIdeaConfigurationRunner::class) @RunWith(JUnit3WithIdeaConfigurationRunner::class)
class CompletionMultiFileHandlerTest : KotlinCompletionTestCase() { class CompletionMultiFileHandlerTest : KotlinFixtureCompletionBaseTestCase() {
fun testExtensionFunctionImport() { fun testExtensionFunctionImport() {
doTest() doTest()
} }
@@ -122,24 +126,28 @@ class CompletionMultiFileHandlerTest : KotlinCompletionTestCase() {
require(filteredFiles.isNotEmpty()) { "At least one of $defaultFiles should exist!" } require(filteredFiles.isNotEmpty()) { "At least one of $defaultFiles should exist!" }
configureByFiles(null, *extraFileNames) myFixture.configureByFiles(*extraFileNames)
configureByFiles(null, *filteredFiles.toTypedArray()) myFixture.configureByFiles(*filteredFiles.toTypedArray())
complete(2) val items = complete(CompletionType.BASIC, 2)
if (myItems != null) { if (items != null) {
val item = if (tailText == null) val item = if (tailText == null)
myItems.singleOrNull() ?: error("Multiple items in completion") items.singleOrNull() ?: error("Multiple items in completion")
else { else {
val presentation = LookupElementPresentation() val presentation = LookupElementPresentation()
myItems.first { items.first {
it.renderElement(presentation) it.renderElement(presentation)
presentation.tailText == tailText presentation.tailText == tailText
} ?: error("Tail text not found") }
} }
selectItem(item, completionChar) CompletionHandlerTestBase.selectItem(myFixture, item, completionChar)
} }
checkResultByFile("$fileName.kt.after") myFixture.checkResultByFile("$fileName.kt.after")
} }
override fun getTestDataPath() = File(COMPLETION_TEST_DATA_BASE_PATH, "/handlers/multifile/").path + File.separator override fun getTestDataPath() = File(COMPLETION_TEST_DATA_BASE_PATH, "/handlers/multifile/").path + File.separator
override fun defaultCompletionType(): CompletionType = CompletionType.BASIC
override fun getPlatform(): TargetPlatform = JvmPlatforms.unspecifiedJvmPlatform
override fun getProjectDescriptor() = LightJavaCodeInsightFixtureTestCase.JAVA_LATEST
} }