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

Add IdeaOpenApiClassFinder and BundledGroovyClassFinder to known finder

Browse Source 
Fix testKnownNonClasspathFinder for 173 branch
This commit is contained in:
Nikolay Krasko
2017-11-30 14:48:56 +03:00
parent e2418ec892
commit 2c79481f37
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
+13 -4
View File
@@ -27,18 +27,27 @@ class RegisteredFindersTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST
fun testKnownNonClasspathFinder() { fun testKnownNonClasspathFinder() {
val expectedFindersNames = setOf("GantClassFinder", "GradleClassFinder", "KotlinScriptDependenciesClassFinder", "AlternativeJreClassFinder").toMutableSet() val expectedFindersNames = setOf(
val optionalFindersNames = setOf("AlternativeJreClassFinder").toMutableSet() "GantClassFinder",
"GradleClassFinder",
"KotlinScriptDependenciesClassFinder"
).toMutableSet()
val optionalFindersNames = setOf(
"AlternativeJreClassFinder",
"IdeaOpenApiClassFinder",
"BundledGroovyClassFinder")
project.getExtensions<PsiElementFinder>(PsiElementFinder.EP_NAME).forEach { finder -> project.getExtensions<PsiElementFinder>(PsiElementFinder.EP_NAME).forEach { finder ->
if (finder is NonClasspathClassFinder) { if (finder is NonClasspathClassFinder) {
val name = finder::class.java.simpleName val name = finder::class.java.simpleName
val removed = expectedFindersNames.remove(name) val isKnown = expectedFindersNames.remove(name) || optionalFindersNames.contains(name)
Assert.assertTrue("Unknown finder found: $finder, class name: $name, search in $expectedFindersNames.\n" + Assert.assertTrue("Unknown finder found: $finder, class name: $name, search in $expectedFindersNames.\n" +
"Consider updating ${KotlinJavaPsiFacade::class.java}", "Consider updating ${KotlinJavaPsiFacade::class.java}",
removed) isKnown)
} }
} }
expectedFindersNames.removeAll(optionalFindersNames) expectedFindersNames.removeAll(optionalFindersNames)
Assert.assertTrue("Some finders wasn't found: $expectedFindersNames", expectedFindersNames.isEmpty()) Assert.assertTrue("Some finders wasn't found: $expectedFindersNames", expectedFindersNames.isEmpty())