From cb210b6c788f12075b336b70da046d2b6186ca04 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 19 Jan 2017 22:30:13 +0300 Subject: [PATCH] KJS: fix stub consistency test which was broken after JsonClass was renamed and transformed to object `kotlin.js.Console` is used instead of `kotlin.js.JSON` to avoid problems on case-sensitive filesystems since right now we also have `kotlin.js.Json` (will be removed later) --- .../stubBuilder/KotlinJavaScriptStubConsistencyTest.kt | 2 +- .../idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt index a3743c7ed42..5fb80fc3a94 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt @@ -30,7 +30,7 @@ class KotlinJavaScriptStubConsistencyTest : StubConsistencyBaseTest() { override fun getFileIds() = listOf( "jquery", "jquery.ui", "kotlin", "kotlin.collections", "kotlin.browser", "kotlin.dom", "kotlin.js" - ).map { OldPackageFacadeClassUtils.getPackageClassId(FqName(it)) } + ClassId.topLevel(FqName("kotlin.js.JsonClass")) + ).map { OldPackageFacadeClassUtils.getPackageClassId(FqName(it)) } + ClassId.topLevel(FqName("kotlin.js.Console")) override fun getVirtualFileFinder(): VirtualFileFinder = JsVirtualFileFinder.SERVICE.getInstance(project) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt index 600ca048bf1..988d371c4d2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt @@ -41,7 +41,7 @@ abstract class StubConsistencyBaseTest : KotlinLightCodeInsightFixtureTestCase() private fun doTest(id: ClassId) { val project = project - val packageFile = getVirtualFileFinder().findVirtualFileWithHeader(id)!! + val packageFile = getVirtualFileFinder().findVirtualFileWithHeader(id) ?: throw AssertionError("File not found for id: $id") val decompiledText = getDecompiledText(packageFile) val fileWithDecompiledText = KtPsiFactory(project).createFile(decompiledText) val stubTreeFromDecompiledText = KtFileStubBuilder().buildStubTree(fileWithDecompiledText)