From 09ff9a65a5e325e970092867a6a4bdb2f3c38ace Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 5 Jun 2019 00:25:56 +0900
Subject: [PATCH] Fix 182 bunch tests, do not perform task tests on older
 platform versions

---
 .../NewMultiplatformProjectImportingTest.kt      | 14 ++++++--------
 .../org/jetbrains/kotlin/gradle/TaskUtils.kt     | 16 ++++++++++++++++
 .../org/jetbrains/kotlin/gradle/TaskUtils.kt.182 | 13 +++++++++++++
 ...ltiplePluginVersionGradleImportingTestCase.kt |  3 +++
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt
 create mode 100644 idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt.182

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
index edd8e1277d8..b09bc7411e5 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
@@ -383,19 +383,17 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
             }
         }
 
-        fun findTasksToRun(file: VirtualFile): List<String> {
-            return GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, myProject)
-                .flatMap { it.tasks }
-                .sorted()
-        }
-
         val commonTestFile = files.find { it.path.contains("commonTest") }!!
         val commonTasks = findTasksToRun(commonTestFile)
-        assertEquals(listOf(":cleanJvmTest", ":jvmTest"), commonTasks)
+        if (commonTasks != null) {
+            assertEquals(listOf(":cleanJvmTest", ":jvmTest"), commonTasks)
+        }
 
         val jvmTestFile = files.find { it.path.contains("jvmTest") }!!
         val jvmTasks = findTasksToRun(jvmTestFile)
-        assertEquals(listOf(":cleanJvmTest", ":jvmTest"), jvmTasks)
+        if (jvmTasks != null) {
+            assertEquals(listOf(":cleanJvmTest", ":jvmTest"), jvmTasks)
+        }
     }
 
     @Test
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt
new file mode 100644
index 00000000000..56a4649562a
--- /dev/null
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestRunConfigurationProducer
+
+fun MultiplePluginVersionGradleImportingTestCase.findTasksToRun(file: VirtualFile): List<String>? {
+    return GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project)
+        .flatMap { it.tasks }
+        .sorted()
+}
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt.182 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt.182
new file mode 100644
index 00000000000..8cda77ac8cf
--- /dev/null
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt.182
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+
+fun MultiplePluginVersionGradleImportingTestCase.findTasksToRun(file: VirtualFile): List<String>? {
+    return null
+}
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
index 447df1ebcbc..51d6801bcfd 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
@@ -9,11 +9,14 @@
  */
 package org.jetbrains.kotlin.idea.codeInsight.gradle
 
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import org.junit.runners.Parameterized
 import java.util.*
 
 abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTestCase() {
+    val project: Project
+        get() = myProject
 
     @JvmField
     @Parameterized.Parameter(1)