From 7cb2631991bab8568fa8623baa706ede9f861750 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Thu, 21 May 2020 15:05:39 +0300 Subject: [PATCH] [ULC] Fix light class Coherence test --- .../kotlin/asJava/KotlinLightClassCoherenceTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java index 9a0d42c6cd2..9ada04e4a10 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope; import junit.framework.ComparisonFailure; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.asJava.classes.KtLightClass; +import org.jetbrains.kotlin.asJava.classes.KtUltraLightSupport; import org.jetbrains.kotlin.name.SpecialNames; import java.io.File; @@ -50,7 +51,15 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase { @NotNull protected PsiClass doTest(String qualifiedName) { - KtLightClass psiClass = (KtLightClass) finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject())); + boolean forceFlag = KtUltraLightSupport.Companion.getForceUsingOldLightClasses(); + KtLightClass psiClass; + try { + KtUltraLightSupport.Companion.setForceUsingOldLightClasses(true); + psiClass = (KtLightClass) finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject())); + } finally { + KtUltraLightSupport.Companion.setForceUsingOldLightClasses(forceFlag); + } + assertNotNull("Class not found: " + qualifiedName, psiClass); Asserter asserter = new Asserter();