From 1622cf9506bf0e9f925662eccd928a930be81769 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 24 Sep 2015 18:49:39 +0300 Subject: [PATCH] Fix stdlib facade names in bytecode generation and decompilation tests. --- .../testData/codegen/bytecodeText/inlineFromOtherModule.kt | 5 +++-- .../decompiler/textBuilder/DecompiledTextConsistencyTest.kt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt b/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt index dd1a5560e31..da3f7e5b13d 100644 --- a/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt +++ b/compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt @@ -2,5 +2,6 @@ fun foo() { assert(1 == 1) { "Hahaha" } } -// 1 INVOKESTATIC kotlin\/KotlinPackage\.getASSERTIONS_ENABLED -// 0 INVOKESTATIC kotlin\/AssertionsJVMKt\.getASSERTIONS_ENABLED +// 0 INVOKESTATIC kotlin\/KotlinPackage\.getASSERTIONS_ENABLED +// 1 INVOKESTATIC kotlin\/PreconditionsKt\.getASSERTIONS_ENABLED +// 0 INVOKESTATIC kotlin\/PreconditionsKt__.+\.getASSERTIONS_ENABLED diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index c0049acad54..b0514fe03a3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -37,9 +37,9 @@ public class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { override fun getPackages(): List = emptyList() - override fun getFacades(): List = listOf(FqName("kotlin.KotlinPackage")) + override fun getFacades(): List = listOf(FqName("kotlin.CollectionsKt")) - override fun getTopLevelMembers(): Map = mapOf("kotlin.KotlinPackage" to "linkedListOf") + override fun getTopLevelMembers(): Map = mapOf("kotlin.CollectionsKt" to "linkedListOf") override fun getVirtualFileFinder(): VirtualFileFinder = JvmVirtualFileFinder.SERVICE.getInstance(project)