From c770a80ab9b19aa7599e1ba57fc0233821ce9499 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 17 Oct 2018 18:10:55 +0300
Subject: [PATCH] MPP wizard tests: run Native tests using correct task name

---
 ...nGradleNativeMultiplatformModuleBuilder.kt |  3 +--
 ...eMobileSharedMultiplatformModuleBuilder.kt |  2 +-
 ...nGradleSharedMultiplatformModuleBuilder.kt |  2 +-
 .../AbstractGradleMultiplatformWizardTest.kt  | 13 +++++++++--
 .../gradle/GradleMultiplatformWizardTest.kt   | 23 +++++++++++--------
 .../GradleMultiplatformWizardTest.kt.181      |  2 +-
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
index 04722c011a3..888a72c80da 100644
--- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.ide.konan.gradle
 
-import com.intellij.openapi.module.Module
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder
 import org.jetbrains.kotlin.konan.target.presetName
@@ -16,7 +15,7 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
     private val nativeTargetName = defaultNativeTarget.userTargetName
 
     private val nativeSourceName get() = "$nativeTargetName$productionSuffix"
-    private val nativeTestName get() = "$nativeTargetName$testSuffix"
+    val nativeTestName get() = "$nativeTargetName$testSuffix"
 
     override fun getBuilderId() = "kotlin.gradle.multiplatform.native"
 
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
index 95ff31e2ef0..2d4230ce63b 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileSharedMultiplatformModuleBuilder.kt
@@ -19,7 +19,7 @@ class KotlinGradleMobileSharedMultiplatformModuleBuilder : KotlinGradleAbstractM
     private val jvmSourceName get() = "$jvmTargetName$productionSuffix"
     private val jvmTestName get() = "$jvmTargetName$testSuffix"
     private val nativeSourceName get() = "$nativeTargetName$productionSuffix"
-    private val nativeTestName get() = "$nativeTargetName$testSuffix"
+    val nativeTestName get() = "$nativeTargetName$testSuffix"
 
     override val shouldEnableGradleMetadataPreview: Boolean = true
 
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt
index 446cc99c745..097cef0cf5b 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSharedMultiplatformModuleBuilder.kt
@@ -23,7 +23,7 @@ class KotlinGradleSharedMultiplatformModuleBuilder : KotlinGradleAbstractMultipl
     private val jsSourceName get() = "$jsTargetName$productionSuffix"
     private val jsTestName get() = "$jsTargetName$testSuffix"
     private val nativeSourceName get() = "$nativeTargetName$productionSuffix"
-    private val nativeTestName get() = "$nativeTargetName$testSuffix"
+    val nativeTestName get() = "$nativeTargetName$testSuffix"
 
     override val shouldEnableGradleMetadataPreview: Boolean = true
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
index c65057d81dd..fe22dc84f13 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
@@ -84,7 +84,7 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
         vararg testClassNames: String,
         metadataInside: Boolean = false,
         performImport: Boolean = true
-    ) {
+    ): Project {
         // TODO: check whether it's necessary to have templates in sources
         // Temporary workaround for duplicated bundled template
         class PrintingFactory : Logger.Factory {
@@ -132,11 +132,12 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
         val buildScriptText = StringUtil.convertLineSeparators(VfsUtilCore.loadText(buildScript))
         println(buildScriptText)
 
-        if (!performImport) return
+        if (!performImport) return project
         doImportProject(project)
         if (testClassNames.isNotEmpty()) {
             doTestProject(project, *testClassNames)
         }
+        return project
     }
 
     private fun File.assertNoEmptyChildren() {
@@ -242,6 +243,14 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
         }
     }
 
+    protected fun runTaskInProject(project: Project, taskName: String) {
+        val settings = GradleExecutionSettings(null, null, DistributionType.DEFAULT_WRAPPED, false)
+        println("Running project task: $taskName")
+        GradleExecutionHelper().execute(project.basePath!!, settings) {
+            it.newBuild().forTasks(taskName).run()
+        }
+    }
+
     override fun setUp() {
         super.setUp()
         val javaHome = IdeaTestUtil.requireRealJdkHome()
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt
index b9e29883fc0..503ac03eb42 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.idea.configuration.KotlinGradleMobileMultiplatformMo
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleMobileSharedMultiplatformModuleBuilder
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleSharedMultiplatformModuleBuilder
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleWebMultiplatformModuleBuilder
+import org.jetbrains.kotlin.konan.target.HostManager
 import org.junit.Test
 
 class GradleMultiplatformWizardTest : AbstractGradleMultiplatformWizardTest() {
@@ -21,24 +22,26 @@ class GradleMultiplatformWizardTest : AbstractGradleMultiplatformWizardTest() {
 
     @Test
     fun testMobileShared() {
-        testImportFromBuilder(
-            KotlinGradleMobileSharedMultiplatformModuleBuilder(),
-            "SampleTests", "SampleTestsJVM", "SampleTestsNative", metadataInside = true
-        )
+        val builder = KotlinGradleMobileSharedMultiplatformModuleBuilder()
+        val project = testImportFromBuilder(builder, "SampleTests", "SampleTestsJVM", metadataInside = true)
+        // Native tests can be run on Mac only
+        if (HostManager.hostIsMac) {
+            runTaskInProject(project, builder.nativeTestName)
+        }
     }
 
     @Test
     fun testNative() {
-        // TODO: add test run here (probably after fix of KT-27599)
-        testImportFromBuilder(KotlinGradleNativeMultiplatformModuleBuilder())
+        val builder = KotlinGradleNativeMultiplatformModuleBuilder()
+        val project = testImportFromBuilder(builder)
+        runTaskInProject(project, builder.nativeTestName)
     }
 
     @Test
     fun testShared() {
-        testImportFromBuilder(
-            KotlinGradleSharedMultiplatformModuleBuilder(),
-            "SampleTests", "SampleTestsJVM", "SampleTestsNative", metadataInside = true
-        )
+        val builder = KotlinGradleSharedMultiplatformModuleBuilder()
+        val project = testImportFromBuilder(builder, "SampleTests", "SampleTestsJVM", "SampleTestsNative", metadataInside = true)
+        runTaskInProject(project, builder.nativeTestName)
     }
 
     @Test
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt.181 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt.181
index 31dd1e800f9..8d82f01dfbb 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt.181
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt.181
@@ -15,7 +15,7 @@ class GradleMultiplatformWizardTest : AbstractGradleMultiplatformWizardTest() {
         // NB: I'm not quite sure this thing really works in 181 (Native is inside)
         testImportFromBuilder(
             KotlinGradleSharedMultiplatformModuleBuilder(),
-            "SampleTests", "SampleTestsJVM", "SampleTestsNative", metadataInside = true
+            "SampleTests", "SampleTestsJVM", metadataInside = true
         )
     }