From b7e2649b917d781b39a2ea85db93de946641f069 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 2 Sep 2016 00:07:12 +0300 Subject: [PATCH] Tests: ArrayList is now available by default, so change the type being imported. Improve test to ensure it's found before removing import directive. --- .../kotlin/idea/DummyFileResolveCachingTest.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt index 7023559ff83..d52927688f4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt @@ -31,15 +31,18 @@ class DummyFileResolveCachingTest : LightCodeInsightFixtureTestCase() { fun test() { myFixture.configureByText(KotlinFileType.INSTANCE, "") - val dummyFileText = "import java.util.ArrayList" + val dummyFileText = "import java.util.Properties" val dummyFile = KtPsiFactory(project).createAnalyzableFile("Dummy.kt", dummyFileText, file) - dummyFile.getResolutionFacade().getFileResolutionScope(dummyFile) + fun findClassifier(identifier: String) = + dummyFile.getResolutionFacade() + .getFileResolutionScope(dummyFile) + .findClassifier(Name.identifier(identifier), NoLookupLocation.FROM_IDE) + + assertNotNull(findClassifier("Properties")) dummyFile.importDirectives.single().delete() - val resolutionScope = dummyFile.getResolutionFacade().getFileResolutionScope(dummyFile) - val classifier = resolutionScope.findClassifier(Name.identifier("ArrayList"), NoLookupLocation.FROM_IDE) - assertNull(classifier) + assertNull(findClassifier("Properties")) } } \ No newline at end of file