From fce21d108281bb1bc7676c291d4a88480fca5f32 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 8 Aug 2018 18:42:39 +0300
Subject: [PATCH] Make GradleClassFinder optional in tests for known class
 finder

Since 182 Gradle plugin is not fully loaded in tests and GradleClassFinder
is absent in the list.
---
 .../kotlin/idea/RegisteredFindersTest.kt      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
index d5e778bab0a..93296318e86 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
@@ -18,33 +18,37 @@ package org.jetbrains.kotlin.idea
 
 import com.intellij.psi.NonClasspathClassFinder
 import com.intellij.psi.PsiElementFinder
+import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
 import org.junit.Assert
 
 class RegisteredFindersTest : KotlinLightCodeInsightFixtureTestCase() {
-    override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST
+    override fun getProjectDescriptor(): LightProjectDescriptor = LightCodeInsightFixtureTestCase.JAVA_LATEST
 
     fun testKnownNonClasspathFinder() {
         val expectedFindersNames = setOf(
-                "GantClassFinder",
-                "GradleClassFinder",
-                "KotlinScriptDependenciesClassFinder"
+            "GantClassFinder",
+            "KotlinScriptDependenciesClassFinder"
         ).toMutableSet()
 
         val optionalFindersNames = setOf(
-                "AlternativeJreClassFinder",
-                "IdeaOpenApiClassFinder",
-                "BundledGroovyClassFinder")
+            "GradleClassFinder",
+            "AlternativeJreClassFinder",
+            "IdeaOpenApiClassFinder",
+            "BundledGroovyClassFinder"
+        )
 
         project.getExtensions<PsiElementFinder>(PsiElementFinder.EP_NAME).forEach { finder ->
             if (finder is NonClasspathClassFinder) {
                 val name = finder::class.java.simpleName
                 val isKnown = expectedFindersNames.remove(name) || optionalFindersNames.contains(name)
-                Assert.assertTrue("Unknown finder found: $finder, class name: $name, search in $expectedFindersNames.\n" +
-                                  "Consider updating ${KotlinJavaPsiFacade::class.java}",
-                                  isKnown)
+                Assert.assertTrue(
+                    "Unknown finder found: $finder, class name: $name, search in $expectedFindersNames.\n" +
+                            "Consider updating ${KotlinJavaPsiFacade::class.java}",
+                    isKnown
+                )
             }
         }