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

Rewrite SmartCompletionMultifileHandlerTest to KotlinFixtureCompletionBaseTestCase

Browse Source 
Use light projects as an attempt to fight leaking project errors
This commit is contained in:
Nikolay Krasko
2020-08-22 19:34:19 +03:00
parent e95c3e2905
commit 18195b3296
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionMultifileHandlerTest.kt
+17 -14
View File
@@ -6,16 +6,20 @@
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.completion.CompletionType
import com.intellij.codeInsight.lookup.Lookup
import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElement
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 SmartCompletionMultifileHandlerTest : KotlinCompletionTestCase() { class SmartCompletionMultifileHandlerTest : KotlinFixtureCompletionBaseTestCase() {
fun testImportExtensionFunction() { fun testImportExtensionFunction() {
doTest() doTest()
} }
@@ -36,20 +40,15 @@ class SmartCompletionMultifileHandlerTest : KotlinCompletionTestCase() {
doTest(lookupString = "Nested") doTest(lookupString = "Nested")
} }
override fun setUp() {
setType(CompletionType.SMART)
super.setUp()
}
private fun doTest(lookupString: String? = null, itemText: String? = null) { private fun doTest(lookupString: String? = null, itemText: String? = null) {
val fileName = getTestName(false) val fileName = getTestName(false)
val fileNames = listOf("$fileName-1.kt", "$fileName-2.kt", "$fileName.java") val fileNames = listOf("$fileName-1.kt", "$fileName-2.kt", "$fileName.java")
configureByFiles(null, *fileNames.filter { File(testDataPath + it).exists() }.toTypedArray()) myFixture.configureByFiles(*fileNames.filter { File(testDataPath + it).exists() }.toTypedArray())
complete(1) val items = complete(CompletionType.SMART, 1)
if (myItems != null) { if (items != null) {
fun isMatching(lookupElement: LookupElement): Boolean { fun isMatching(lookupElement: LookupElement): Boolean {
if (lookupString != null && lookupElement.lookupString != lookupString) return false if (lookupString != null && lookupElement.lookupString != lookupString) return false
@@ -60,16 +59,20 @@ class SmartCompletionMultifileHandlerTest : KotlinCompletionTestCase() {
return true return true
} }
val items = myItems.filter(::isMatching) val matchedItems = items.filter(::isMatching)
when (items.size) { when (matchedItems.size) {
0 -> fail("No matching items found") 0 -> fail("No matching items found")
1 -> selectItem(myItems[0]) 1 -> CompletionHandlerTestBase.selectItem(myFixture, items[0], Lookup.NORMAL_SELECT_CHAR)
else -> fail("Multiple matching items found") else -> fail("Multiple matching items found")
} }
} }
checkResultByFile("$fileName.kt.after") myFixture.checkResultByFile("$fileName.kt.after")
} }
override fun getTestDataPath() = File(COMPLETION_TEST_DATA_BASE_PATH, "/handlers/multifile/smart/").path + File.separator override fun getTestDataPath() = File(COMPLETION_TEST_DATA_BASE_PATH, "/handlers/multifile/smart/").path + File.separator
override fun defaultCompletionType(): CompletionType = CompletionType.BASIC
override fun getPlatform(): TargetPlatform = JvmPlatforms.unspecifiedJvmPlatform
override fun getProjectDescriptor() = LightJavaCodeInsightFixtureTestCase.JAVA_LATEST
} }