From aec87744f2c91c6606d56871f5073f7bc6d2e277 Mon Sep 17 00:00:00 2001 From: Alexander Dudinsky Date: Fri, 7 Aug 2020 12:01:20 +0300 Subject: [PATCH] Run `ImportAndCheckNavigation` tests only vs the master version of plugin Also error "Could not find org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable" was fixed by adding ":native:kotlin-klib-commonizer-embeddable:install" in dependencies for the kotlin-plugin install --- buildSrc/src/main/kotlin/tasks.kt | 3 ++- .../org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 7dba898f96d..2546e6bdaea 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -66,7 +66,8 @@ fun Task.dependsOnKotlinPluginInstall() { ":kotlin-scripting-jvm:install", ":kotlin-scripting-compiler-embeddable:install", ":kotlin-scripting-compiler-impl-embeddable:install", - ":kotlin-test-js-runner:install" + ":kotlin-test-js-runner:install", + ":native:kotlin-klib-commonizer-embeddable:install" ) } diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt index 8ab9d55198b..2c8f56d4446 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.* import com.intellij.psi.util.PsiTreeUtil import com.intellij.testFramework.runInEdtAndGet -import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase +import org.jetbrains.kotlin.idea.codeInsight.gradle.MasterPluginVersionGradleImportingTestCase import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster import org.jetbrains.kotlin.idea.core.util.toPsiFile import org.jetbrains.kotlin.idea.util.application.runReadAction @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions import org.junit.Test -class ImportAndCheckNavigation : MultiplePluginVersionGradleImportingTestCase() { +class ImportAndCheckNavigation : MasterPluginVersionGradleImportingTestCase() { @Test @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)