From 64549b5dd35941a53fc0027ee3c210c94f1764be Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Mon, 8 Dec 2014 20:22:34 +0300
Subject: [PATCH] Update DecompiledTextForWrongAbiVersionTest

---
 .../decompiler/stubBuilder/KotlinClsStubBuilder.kt     |  2 +-
 .../plugin/decompiler/stubBuilder/clsStubBuilding.kt   |  2 +-
 .../DecompiledTextForWrongAbiVersionTest.kt            | 10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt
index c6237248897..e6c15c228e1 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt
@@ -53,7 +53,7 @@ public class KotlinClsStubBuilder : ClsStubBuilder() {
         val classId = kotlinBinaryClass.getClassId()
         val packageFqName = classId.getPackageFqName()
         if (!header.isCompatibleAbiVersion) {
-            return createIncompatibleAbiVersionFileStub(packageFqName)
+            return createIncompatibleAbiVersionFileStub()
         }
 
         val components = createStubBuilderComponents(file, packageFqName)
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
index 809de1eefb8..e3fd2a55536 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
@@ -64,7 +64,7 @@ fun createPackageFacadeFileStub(
     return fileStub
 }
 
-fun createIncompatibleAbiVersionFileStub(packageFqName: FqName) = createFileStub(packageFqName)
+fun createIncompatibleAbiVersionFileStub() = createFileStub(FqName.ROOT)
 
 fun createFileStub(packageFqName: FqName): KotlinFileStubImpl {
     val fileStub = KotlinFileStubImpl(null, packageFqName.asString(), packageFqName.isRoot())
diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
index 88571dac6f0..d78693a464e 100644
--- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
@@ -20,17 +20,15 @@ import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.jet.JetTestCaseBuilder
 import com.intellij.psi.PsiManager
 import org.junit.Assert
-import com.intellij.psi.PsiCompiledFile
 import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor
 import java.io.File
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.impl.compiled.ClsFileImpl
 import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest
-import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.ANONYMOUS_FUNCTION
 import org.jetbrains.jet.plugin.decompiler.AbstractInternalCompiledClassesTest
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.findClassFileByName
+import org.jetbrains.jet.plugin.decompiler.JetClsFile
 
 public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() {
 
@@ -55,10 +53,8 @@ public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClas
 
     private fun checkFileWithWrongAbiVersion(file: VirtualFile) {
         val psiFile = PsiManager.getInstance(getProject()!!).findFile(file)
-        Assert.assertTrue(psiFile is ClsFileImpl)
-        val decompiledPsiFile = (psiFile as PsiCompiledFile).getDecompiledPsiFile()
-        Assert.assertTrue(decompiledPsiFile is JetFile)
-        val decompiledText = decompiledPsiFile!!.getText()!!
+        Assert.assertTrue(psiFile is JetClsFile)
+        val decompiledText = psiFile!!.getText()!!
         Assert.assertTrue(decompiledText.contains(INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT))
     }
 }