From f12cce0243196ac09a48163fbab054fbb51ec4f9 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 9 Feb 2015 17:52:42 +0300
Subject: [PATCH] Report incomplete hierarchy error for deserialized types

 #KT-5129 Fixed

Delete a JPS test that was specifically testing that we would not fail in this
situation; now there's a compilation error

Original commit: 949144e0c02bb1ee753701423e95b9e71d4f1eb4
---
 .../jps/build/SimpleKotlinJpsBuildTest.kt     | 51 ++-----------------
 1 file changed, 4 insertions(+), 47 deletions(-)

diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
index 3870a842b98..ef23610fde3 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
@@ -25,54 +25,11 @@ import org.jetbrains.kotlin.test.JetTestUtils
 import java.io.File
 
 public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
-
     override fun setUp() {
         super.setUp()
         workDir = JetTestUtils.tmpDirForTest(this)
     }
 
-    public fun testThreeModulesNoReexport() {
-        val aFile = createFile("a/a.kt",
-                               """
-                                   trait A1 {
-                                       fun bar()
-                                   }
-                                   trait A2 {
-                                       fun bar()
-                                   }
-                               """)
-        val a = addModule("a", PathUtil.getParentPath(aFile))
-
-        val bFile = createFile("b/b.kt",
-                               """
-                                    trait B1 {
-                                        fun foo(): B2? = null
-                                    }
-
-                                    trait B2 : A1, A2 {
-                                        override fun bar() {}
-                                    }
-                               """)
-        val b = addModule("b", PathUtil.getParentPath(bFile))
-        JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension(
-                b.getDependenciesList().addModuleDependency(a)
-        ).setExported(false)
-
-        val cFile = createFile("c/c.kt",
-                               """
-                                    class C : B1 {
-                                        fun test() {
-                                            foo()?.bar()
-                                        }
-                                    }
-                               """)
-        val c = addModule("c", PathUtil.getParentPath(cFile))
-        c.getDependenciesList().addModuleDependency(b)
-
-        addKotlinRuntimeDependency()
-        rebuildAll()
-    }
-
     public fun testLoadingKotlinFromDifferentModules() {
         val aFile = createFile("m1/K.kt",
                                """
@@ -102,21 +59,21 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
                                """)
         val b = addModule("b", PathUtil.getParentPath(bFile))
         JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension(
-                b.getDependenciesList().addModuleDependency(a)
-        ).setExported(false)
+                b.dependenciesList.addModuleDependency(a)
+        ).isExported = false
 
         addKotlinRuntimeDependency()
         rebuildAll()
     }
 
-    public fun testThreeModulesNoReexportWithDaemon() {
+    public fun testDaemon() {
         System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"")
         System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "")
         // spaces in the name to test proper file name handling
         val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running");
         try {
             System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath)
-            testThreeModulesNoReexport()
+            testLoadingKotlinFromDifferentModules()
         }
         finally {
             flagFile.delete()