diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/NativeRunConfigurationTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/NativeRunConfigurationTest.kt deleted file mode 100644 index 1c0605f32ba..00000000000 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/NativeRunConfigurationTest.kt +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.codeInsight.gradle - -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.execution.PsiLocation -import com.intellij.execution.actions.ConfigurationContext -import com.intellij.execution.actions.ConfigurationFromContext -import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.gradle.GradleDaemonAnalyzerTestCase -import org.jetbrains.kotlin.test.TagsTestDataUtil -import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration -import org.junit.Test -import org.junit.runners.Parameterized -import java.net.URL -import java.util.* - -class NativeRunConfigurationTest : GradleImportingTestCase() { - private companion object { - private const val DEFAULT_PLUGIN_VERSION = "1.4-M2" - private val latestPluginVersion by lazy { - PluginVersionDownloader.getLatestDevVersion() ?: DEFAULT_PLUGIN_VERSION - } - - @JvmStatic - @Parameterized.Parameters(name = "{index}: Gradle-{0}, KotlinGradlePlugin-{1}") - fun data(): Collection> = listOf(arrayOf("6.0.1", latestPluginVersion)) - } - - override fun testDataDirName(): String = "nativeRunConfiguration" - - @JvmField - @Parameterized.Parameter(1) - var kotlinGradlePluginVersion: String = DEFAULT_PLUGIN_VERSION - - @Test - fun multiplatformNativeRunGutter() { - doTest() - } - - @Test - fun customEntryPointWithoutRunGutter() { - doTest() - } - - override fun configureByFiles(properties: Map?): List { - val unitedProperties = HashMap(properties ?: emptyMap()) - unitedProperties["kotlin_plugin_version"] = kotlinGradlePluginVersion - return super.configureByFiles(unitedProperties) - } - - private fun doTest() { - val files = importProjectFromTestData() - val project = myTestFixture.project - - org.jetbrains.kotlin.gradle.checkFiles( - files.filter { it.extension == "kt" }, - project, - object : GradleDaemonAnalyzerTestCase( - testLineMarkers = true, - checkWarnings = false, - checkInfos = false, - rootDisposable = testRootDisposable - ) { - override fun renderAdditionalAttributeForTag(tag: TagsTestDataUtil.TagInfo<*>): String? { - val lineMarkerInfo = tag.data as? LineMarkerInfo<*> ?: return null - val gradleRunConfigs = lineMarkerInfo.extractConfigurations().filter { it.configuration is GradleRunConfiguration } - val runConfig = gradleRunConfigs.singleOrNull() // can we have more than one? - - val settings = (runConfig?.configurationSettings?.configuration as? GradleRunConfiguration)?.settings ?: return null - - return "settings=\"${settings}\"" - } - - } - ) - } - - private fun LineMarkerInfo<*>.extractConfigurations(): List { - val location = PsiLocation(element) - val emptyContext = ConfigurationContext.createEmptyContextForLocation(location) - return emptyContext.configurationsFromContext.orEmpty() - } -} - -object PluginVersionDownloader { - fun getLatestEapVersion() = downloadVersions(EAP_URL).lastOrNull() - fun getLatestDevVersion() = downloadVersions(DEV_URL).lastOrNull() - - private fun downloadVersions(url: String): List { - return versionRegexp.findAll(URL(url).readText()) - .map { it.groupValues[1].removeSuffix("/") } - .filter { it.isNotEmpty() && it[0].isDigit() } - .toList() - } - - private const val EAP_URL = "https://dl.bintray.com/kotlin/kotlin-eap/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/" - private const val DEV_URL = "https://dl.bintray.com/kotlin/kotlin-dev/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/" - private val versionRegexp = """href="([^"\\]+)"""".toRegex() -} \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts deleted file mode 100644 index f4f8fae875f..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}") -} -repositories { - maven("https://dl.bintray.com/kotlin/kotlin-eap") - maven("https://dl.bintray.com/kotlin/kotlin-dev") - mavenLocal() -} - -kotlin { - macosX64("macos") { - binaries { - executable { - entryPoint = "sample.foo" - } - } - } - sourceSets { - val macosMain by getting {} - } -} \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/gradle.properties b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/gradle.properties deleted file mode 100644 index ab89dc9dd74..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.import.noCommonSourceSets=true \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts deleted file mode 100644 index e9d561aa042..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - maven("https://dl.bintray.com/kotlin/kotlin-eap") - maven("https://dl.bintray.com/kotlin/kotlin-dev") - mavenLocal() - gradlePluginPortal() - } -} - -rootProject.name = "test" \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/src/macosMain/kotlin/sample/SampleMacos.kt b/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/src/macosMain/kotlin/sample/SampleMacos.kt deleted file mode 100644 index 114a47555eb..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/src/macosMain/kotlin/sample/SampleMacos.kt +++ /dev/null @@ -1,6 +0,0 @@ -package sample - - -fun main() {} - -fun foo() {} diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts deleted file mode 100644 index 28ffe236ffb..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}") -} -repositories { - maven("https://dl.bintray.com/kotlin/kotlin-eap") - maven("https://dl.bintray.com/kotlin/kotlin-dev") - mavenLocal() -} - -kotlin { - macosX64("macos") { - binaries { - executable { - entryPoint = "sample.main" - } - } - } - sourceSets { - commonMain { - dependencies { - implementation(kotlin("stdlib-common")) - } - } - val macosMain by getting { - } - } -} \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts deleted file mode 100644 index e9d561aa042..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - maven("https://dl.bintray.com/kotlin/kotlin-eap") - maven("https://dl.bintray.com/kotlin/kotlin-dev") - mavenLocal() - gradlePluginPortal() - } -} - -rootProject.name = "test" \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/commonMain/kotlin/sample/SampleCommon.kt b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/commonMain/kotlin/sample/SampleCommon.kt deleted file mode 100644 index eb0a5fe1ae9..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/commonMain/kotlin/sample/SampleCommon.kt +++ /dev/null @@ -1,5 +0,0 @@ -package sample - - -fun main() { -} \ No newline at end of file diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/macosMain/kotlin/sample/SampleMacos.kt b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/macosMain/kotlin/sample/SampleMacos.kt deleted file mode 100644 index a1c5de2b34a..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/macosMain/kotlin/sample/SampleMacos.kt +++ /dev/null @@ -1,6 +0,0 @@ -package sample - - -fun main() {} - -fun foo() {} diff --git a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/macosTest/kotlin/sample/SampleTests.kt b/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/macosTest/kotlin/sample/SampleTests.kt deleted file mode 100644 index eb0a5fe1ae9..00000000000 --- a/idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/src/macosTest/kotlin/sample/SampleTests.kt +++ /dev/null @@ -1,5 +0,0 @@ -package sample - - -fun main() { -} \ No newline at end of file