From 039090d2bf0248cfd272b1be4b8fa9c61b719b25 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Fri, 13 Dec 2019 10:09:53 +0300 Subject: [PATCH] gradle.kts importing tests: run gradle 6.0.1 only for that test --- .../gradle/AbstractModelBuilderTest.java | 2 +- .../gradle/AbstractModelBuilderTest.java.as36 | 2 +- .../codeInsight/gradle/GradleKtsImportTest.kt | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java index d840186840e..b473aa5f250 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java @@ -49,7 +49,7 @@ import static org.junit.Assume.assumeThat; @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}, {"6.0.1"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.as36 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.as36 index 56915c21545..42fdde3a79e 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.as36 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.as36 @@ -61,7 +61,7 @@ import static org.junit.Assume.assumeThat; @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}, {"6.0.1"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}, {"5.6.4"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt index c7d7e235913..43d149b35ac 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.codeInsight.gradle import com.intellij.openapi.vfs.LocalFileSystem -import org.jetbrains.kotlin.idea.completion.test.KotlinCompletionTestCase import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.applySuggestedScriptConfiguration import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationCacheScope @@ -14,13 +13,25 @@ import org.jetbrains.kotlin.idea.core.script.configuration.utils.areSimilar import org.jetbrains.kotlin.idea.core.script.configuration.utils.getKtFile import org.jetbrains.kotlin.idea.core.script.hasSuggestedScriptConfiguration import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper +import org.jetbrains.kotlin.test.JUnitParameterizedWithIdeaConfigurationRunner +import org.jetbrains.kotlin.test.RunnerFactoryWithMuteInDatabase import org.jetbrains.plugins.gradle.settings.GradleSettings import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.Parameterized +import org.junit.runners.Parameterized.Parameters import java.io.File - +@RunWith(value = JUnitParameterizedWithIdeaConfigurationRunner::class) +@Parameterized.UseParametersRunnerFactory(RunnerFactoryWithMuteInDatabase::class) class GradleKtsImportTest : GradleImportingTestCase() { + companion object { + @JvmStatic + @Parameters(name = "{index}: with Gradle-{0}") + fun data(): Collection> = listOf(arrayOf("6.0.1")) + } + val scriptConfigurationManager get() = ScriptConfigurationManager.getInstance(myProject) val projectDir get() = File(GradleSettings.getInstance(myProject).linkedProjectsSettings.first().externalProjectPath)