From 2ceebfedf1972639bc374a0246270fbbfa450adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Fri, 26 Apr 2019 17:51:09 +0200 Subject: [PATCH] [devkit] MissingRecentApiInspectionTestBase: cleanup GitOrigin-RevId: d35eefb647a20d06468b304f5e797a736c0bdbd9 --- .../missingApi/MissingRecentApiInspectionTestBase.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTestBase.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTestBase.kt index 49776f4e963d..3c7b49a5cf92 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTestBase.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTestBase.kt @@ -4,8 +4,6 @@ package org.jetbrains.idea.devkit.kotlin.inspections.missingApi import com.intellij.codeInsight.AnnotationUtil import com.intellij.openapi.roots.JavaModuleExternalPaths import com.intellij.openapi.roots.ModuleRootModificationUtil -import com.intellij.psi.JavaPsiFacade -import com.intellij.psi.search.GlobalSearchScope import com.intellij.testFramework.TestDataPath import org.jetbrains.idea.devkit.DevkitJavaTestsUtil import org.jetbrains.idea.devkit.inspections.PluginModuleTestCase @@ -92,19 +90,17 @@ abstract class MissingRecentApiInspectionTestBase : PluginModuleTestCase() { } private fun assertAnnotationsFoundForClass(className: String) { - val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project))!! + val psiClass = myFixture.findClass(className) val annotations = AnnotationUtil.findAllAnnotations(psiClass, listOf(MissingRecentApiUsageProcessor.AVAILABLE_SINCE_ANNOTATION), false) assertNotEmpty(annotations) } fun `test highlighting of missing API usages in Java file`() { - myFixture.configureByFiles("plugin/missingApiUsages.java") - myFixture.checkHighlighting() + myFixture.testHighlighting("plugin/missingApiUsages.java") } fun `test highlighting of missing API usages in Kotlin file`() { - myFixture.configureByFiles("plugin/missingApiUsages.kt") - myFixture.checkHighlighting() + myFixture.testHighlighting("plugin/missingApiUsages.kt") } }