From 443f8b6f02eacae3d38d44841a6fcce0d0553d88 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 15 Aug 2018 17:48:57 +0300
Subject: [PATCH] Minor: Fix test data

---
 .../idea/codeInsight/gradle/GradleFacetImportTest.kt      | 8 ++++++--
 .../idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 | 8 ++++++--
 .../idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 | 8 ++++++--
 .../configuration/KotlinFrameworkSupportProviderTest.kt   | 4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
index 291f314c67f..fc94a2f2e96 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
@@ -1399,7 +1399,11 @@ compileTestKotlin {
         }
 
         val rootManager = ModuleRootManager.getInstance(getModule("js-module"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single().library!!
+        val stdlib = rootManager
+            .orderEntries
+            .filterIsInstance<LibraryOrderEntry>()
+            .first { it.libraryName?.startsWith("Gradle: kotlin-stdlib-js-") ?: false }
+            .library!!
         assertTrue(stdlib.getFiles(OrderRootType.CLASSES).isNotEmpty())
         assertEquals(JSLibraryKind, (stdlib as LibraryEx).kind)
     }
@@ -2262,7 +2266,7 @@ compileTestKotlin {
         importProject()
 
         Assert.assertEquals(
-            "-Xdump-declarations-to=tmpTest",
+            "-version",
             testFacetSettings.compilerSettings!!.additionalArguments
         )
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31
index cfa3d51ebd8..50944706c13 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31
@@ -1209,7 +1209,11 @@ compileTestKotlin {
         }
 
         val rootManager = ModuleRootManager.getInstance(getModule("js-module"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single().library!!
+        val stdlib = rootManager
+            .orderEntries
+            .filterIsInstance<LibraryOrderEntry>()
+            .first { it.libraryName?.startsWith("Gradle: kotlin-stdlib-js-") ?: false }
+            .library!!
         assertTrue(stdlib.getFiles(OrderRootType.CLASSES).isNotEmpty())
         assertEquals(JSLibraryKind, (stdlib as LibraryEx).kind)
     }
@@ -2011,7 +2015,7 @@ compileTestKotlin {
         importProject()
 
         Assert.assertEquals(
-            "-Xdump-declarations-to=tmpTest",
+            "-version",
             testFacetSettings.compilerSettings!!.additionalArguments
         )
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32
index cfa3d51ebd8..50944706c13 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32
@@ -1209,7 +1209,11 @@ compileTestKotlin {
         }
 
         val rootManager = ModuleRootManager.getInstance(getModule("js-module"))
-        val stdlib = rootManager.orderEntries.filterIsInstance<LibraryOrderEntry>().single().library!!
+        val stdlib = rootManager
+            .orderEntries
+            .filterIsInstance<LibraryOrderEntry>()
+            .first { it.libraryName?.startsWith("Gradle: kotlin-stdlib-js-") ?: false }
+            .library!!
         assertTrue(stdlib.getFiles(OrderRootType.CLASSES).isNotEmpty())
         assertEquals(JSLibraryKind, (stdlib as LibraryEx).kind)
     }
@@ -2011,7 +2015,7 @@ compileTestKotlin {
         importProject()
 
         Assert.assertEquals(
-            "-Xdump-declarations-to=tmpTest",
+            "-version",
             testFacetSettings.compilerSettings!!.additionalArguments
         )
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt
index 7a8ab9525d0..02092b5ee0c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinFrameworkSupportProviderTest.kt
@@ -21,8 +21,8 @@ class KotlinFrameworkSupportProviderTest : FrameworkSupportProviderTestCase() {
         addSupport()
 
         with (KotlinCommonCompilerArgumentsHolder.getInstance(module.project).settings) {
-            TestCase.assertEquals(VersionView.Specific(LanguageVersion.LATEST_STABLE), languageVersionView)
-            TestCase.assertEquals(VersionView.Specific(LanguageVersion.LATEST_STABLE), apiVersionView)
+            TestCase.assertEquals(VersionView.LatestStable, languageVersionView)
+            TestCase.assertEquals(VersionView.LatestStable, apiVersionView)
         }
     }