From 0a8f15c745f8b6100bc68c733871c2b41e78bb0c Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 4 Sep 2019 16:37:27 +0900
Subject: [PATCH] Generify Gradle importing tests so they can be used in the
 Ultimate repo

---
 .../gradle/NewMultiplatformKaptProjectImportingTest.kt      | 6 +++---
 .../idea/codeInsight/gradle/GradleImportingTestCase.kt      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
index 1293132524e..95901a559dd 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.roots.*
 import com.intellij.openapi.roots.impl.ModulesOrderEnumerator
-import com.intellij.openapi.util.text.StringUtil
+import com.intellij.util.text.VersionComparatorUtil
 import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
 import org.jetbrains.kotlin.idea.util.sourceRoots
 import org.junit.Test
@@ -18,9 +18,9 @@ import java.io.File
 class NewMultiplatformKaptProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
     override fun isApplicableTest(): Boolean {
         val isOldGradlePlugin = gradleKotlinPluginVersion != MINIMAL_SUPPORTED_VERSION
-                && StringUtil.compareVersionNumbers(gradleKotlinPluginVersion, "1.3.40") < 0
+                && VersionComparatorUtil.compare(gradleKotlinPluginVersion, "1.3.40") < 0
 
-        return !isOldGradlePlugin && !gradleVersion.startsWith("3.")
+        return !isOldGradlePlugin && VersionComparatorUtil.compare(gradleVersion, "4.0") >= 0
     }
 
     @Test
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
index d279a1d6cdf..9fe0397e863 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
@@ -228,7 +228,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
 
     protected open fun testDataDirName(): String = ""
 
-    protected fun testDataDirectory(): File {
+    protected open fun testDataDirectory(): File {
         val baseDir = "${PluginTestCaseBase.getTestDataPathBase()}/gradle/${testDataDirName()}/"
         return File(baseDir, getTestName(true).substringBefore("_"))
     }