From 04a4bef615a826580930e5d30d04a58724bfdbf2 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Mon, 18 Sep 2017 19:40:55 +0300
Subject: [PATCH] Misc: Fix multiplatform test configuration

---
 .../jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt  | 2 +-
 .../caches/resolve/AbstractMultiModuleHighlightingTest.kt     | 2 +-
 .../jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt | 2 +-
 .../jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
index e5475ebe7f7..3e9fcaeed04 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
@@ -27,7 +27,7 @@ class FindUsagesMultiModuleTest : AbstractFindUsagesMultiModuleTest() {
                                     implName: String = "jvm",
                                     implKind: TargetPlatformKind<*> = TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) {
         val commonModule = module(commonName)
-        commonModule.createFacet(TargetPlatformKind.Common)
+        commonModule.createFacet(TargetPlatformKind.Common, false)
 
         val jvm = module(implName)
         jvm.createFacet(implKind)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleHighlightingTest.kt
index 0f727fe9bc1..e4a4bc5a142 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleHighlightingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleHighlightingTest.kt
@@ -41,7 +41,7 @@ abstract class AbstractMultiModuleHighlightingTest : AbstractMultiHighlightingTe
             jdk: TestJdkKind = TestJdkKind.MOCK_JDK
     ) {
         val commonModule = module("common", jdk)
-        commonModule.createFacet(TargetPlatformKind.Common)
+        commonModule.createFacet(TargetPlatformKind.Common, false)
         if (withStdlibCommon) {
             commonModule.addLibrary(ForTestCompileRuntime.stdlibCommonForTests(), kind = CommonLibraryKind)
         }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt
index 53df32e7253..ef5cdce7a5d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt
@@ -28,7 +28,7 @@ class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() {
             withTests: Boolean = false
     ) {
         val commonModule = module(expectName, hasTestRoot = withTests)
-        commonModule.createFacet(TargetPlatformKind.Common)
+        commonModule.createFacet(TargetPlatformKind.Common, false)
 
         impls.forEach { (implName, implKind) ->
             val implModule = module(implName, hasTestRoot = withTests)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
index 5965809ff06..cbc3a29d36f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
@@ -118,11 +118,11 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() {
     }
 }
 
-fun Module.createFacet(platformKind: TargetPlatformKind<*>? = null) {
+fun Module.createFacet(platformKind: TargetPlatformKind<*>? = null, useProjectSettings: Boolean = true) {
     val accessToken = WriteAction.start()
     try {
         val modelsProvider = IdeModifiableModelsProviderImpl(project)
-        getOrCreateFacet(modelsProvider, true).configuration.settings.initializeIfNeeded(
+        getOrCreateFacet(modelsProvider, useProjectSettings).configuration.settings.initializeIfNeeded(
                 this,
                 modelsProvider.getModifiableRootModel(this),
                 platformKind