From 9b7f22d2c7870ec49037f921e65ad8021cebc508 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 15 Oct 2015 20:58:10 +0300
Subject: [PATCH] Fix ClsStubConsistencyTest: it didn't do anything after some
 previous changes (cherry picked from commit f5af9fc)

---
 .../decompiler/stubBuilder/ClsStubConsistencyTest.kt  |  4 ++--
 .../KotlinJavaScriptStubConsistencyTest.kt            |  8 ++++----
 .../decompiler/stubBuilder/StubConsistencyBaseTest.kt | 11 +++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt
index 54178930747..675c765efe8 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt
@@ -21,12 +21,12 @@ import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
-import kotlin.properties.Delegates
 
 public class ClsStubConsistencyTest : StubConsistencyBaseTest() {
     override fun getVirtualFileFinder(): VirtualFileFinder = JvmVirtualFileFinder.SERVICE.getInstance(getProject())
-    override fun getPackages(): List<FqName> = listOf(FqName("kotlin"))
+    override fun getFileIds(): List<ClassId> = listOf(ClassId.topLevel(FqName("kotlin.CollectionsKt")))
 
     override fun createStubBuilder() = KotlinClsStubBuilder()
 
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 b4fac01482e..566aa319ef0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt
@@ -16,15 +16,14 @@
 
 package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledTextFromJsMetadata
 import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager
 import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
 import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder
+import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
 import org.jetbrains.kotlin.name.FqName
-import kotlin.properties.Delegates
 
 public class KotlinJavaScriptStubConsistencyTest : StubConsistencyBaseTest() {
     override fun setUp() {
@@ -32,9 +31,10 @@ public class KotlinJavaScriptStubConsistencyTest : StubConsistencyBaseTest() {
         KotlinJavaScriptLibraryManager.getInstance(getProject()).syncUpdateProjectLibrary()
     }
 
-    override fun getPackages(): List<FqName> = listOf(
+    override fun getFileIds() = listOf(
             "java.util", "jquery", "jquery.ui",
-            "kotlin", "kotlin.browser", "kotlin.dom", "kotlin.js").map { FqName(it) }
+            "kotlin", "kotlin.browser", "kotlin.dom", "kotlin.js"
+    ).map { PackageClassUtils.getPackageClassId(FqName(it)) }
 
     override fun getVirtualFileFinder(): VirtualFileFinder =
         JsVirtualFileFinder.SERVICE.getInstance(getProject())
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 ce495ee3eb0..2259a6f6370 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt
@@ -20,16 +20,15 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.compiled.ClsStubBuilder
 import com.intellij.util.indexing.FileContentImpl
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
-import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder
 import org.junit.Assert
 
 public abstract class StubConsistencyBaseTest : JetLightCodeInsightFixtureTestCase() {
 
-    protected abstract fun getPackages(): List<FqName>
+    protected abstract fun getFileIds(): List<ClassId>
     protected abstract fun getVirtualFileFinder(): VirtualFileFinder
 
     protected abstract fun createStubBuilder(): ClsStubBuilder
@@ -37,12 +36,12 @@ public abstract class StubConsistencyBaseTest : JetLightCodeInsightFixtureTestCa
     protected abstract fun getDecompiledText(packageFile: VirtualFile): String
 
     public fun testConsistency() {
-        getPackages().forEach { doTest(it) }
+        getFileIds().forEach { doTest(it) }
     }
 
-    private fun doTest(packageFqName: FqName) {
+    private fun doTest(id: ClassId) {
         val project = getProject()
-        val packageFile = getVirtualFileFinder().findVirtualFileWithHeader(PackageClassUtils.getPackageClassId(packageFqName))!!
+        val packageFile = getVirtualFileFinder().findVirtualFileWithHeader(id)!!
         val decompiledText = getDecompiledText(packageFile)
         val fileWithDecompiledText = JetPsiFactory(project).createFile(decompiledText)
         val stubTreeFromDecompiledText = JetFileStubBuilder().buildStubTree(fileWithDecompiledText)