diff --git a/.idea/modules.xml b/.idea/modules.xml index 18b2d5fac67f..0c1ddb8a8a08 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1391,7 +1391,9 @@ - + + + @@ -1506,4 +1508,4 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml b/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml index f73c3aabc573..3493f1f6ccc6 100644 --- a/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml +++ b/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml @@ -55,5 +55,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/all-tests/kotlin.all-tests.iml b/plugins/kotlin/all-tests/kotlin.all-tests.iml index 4f5e7d4ddc5c..c81a39c8fcb0 100644 --- a/plugins/kotlin/all-tests/kotlin.all-tests.iml +++ b/plugins/kotlin/all-tests/kotlin.all-tests.iml @@ -22,7 +22,7 @@ - + @@ -70,5 +70,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml index 3b7ee7823147..9b4391dc944c 100644 --- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml +++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml @@ -41,9 +41,9 @@ - + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml b/plugins/kotlin/gradle/gradle-java/tests.k1/kotlin.gradle.gradle-java.tests.k1.iml similarity index 98% rename from plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml rename to plugins/kotlin/gradle/gradle-java/tests.k1/kotlin.gradle.gradle-java.tests.k1.iml index 29c5c77ca9e4..dcc5b38d7674 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml +++ b/plugins/kotlin/gradle/gradle-java/tests.k1/kotlin.gradle.gradle-java.tests.k1.iml @@ -66,5 +66,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesInIDENamingTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesInIDENamingTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesInIDENamingTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/ide/konan/gradle/GradleNativeLibrariesInIDENamingTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/ide/konan/gradle/TestCaseWithFakeKotlinNative.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/ide/konan/gradle/TestCaseWithFakeKotlinNative.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/ide/konan/gradle/TestCaseWithFakeKotlinNative.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/ide/konan/gradle/TestCaseWithFakeKotlinNative.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt similarity index 74% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt index c0949e2056c9..3b73706f7769 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.codeInsight.gradle @@ -23,8 +23,9 @@ import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions import org.jetbrains.plugins.gradle.util.GradleConstants import org.junit.Ignore import org.junit.Test +import java.io.File -abstract class GradleBuildFileHighlightingTest : KotlinGradleImportingTestCase() { +abstract class GradleBuildFileHighlightingTest : KotlinGradleImportingTestCase() { // TODO: remove once generated analogue is available protected fun withHighLightingFilterChecked(file: VirtualFile, block: () -> Unit) = runBlocking { val psiFile = readAction { @@ -56,6 +57,47 @@ abstract class GradleBuildFileHighlightingTest : KotlinGradleImportingTestCase() } } + + private fun String.relativeToProjectRoot(): String = + substringAfter("${projectRoot.path}/") + + private fun List.relativeToProjectRoot(): List = + map { it.path.relativeToProjectRoot() } + + protected fun List.inHighlightingOrder(): List { + val ktsFiles = filter { "kts" == it.extension } + println("Detected .kts files: ${ktsFiles.relativeToProjectRoot()}") + + val highlightingInstructionsFile = File(testDataDirectory(), "highlighting.instructions") + + return if (highlightingInstructionsFile.exists()) { + val pathToFile = ktsFiles.associateBy { it.path.relativeToProjectRoot() } + val instructions = highlightingInstructionsFile.readLines() + val filesInConfiguredOrder = instructions.mapNotNull { pathToFile[it] } + println("'highlighting.instructions' file detected. Using the following order of files: ${filesInConfiguredOrder.relativeToProjectRoot()}") + filesInConfiguredOrder + } else { + val filesInShuffledOrder = (ktsFiles + ktsFiles).shuffled() + println("'highlighting.instructions' file is missing. Using default (shuffled) files order: ${filesInShuffledOrder.relativeToProjectRoot()}}") + filesInShuffledOrder + } + } + + class SeveralBuildFiles : GradleBuildFileHighlightingTest() { + @TargetVersions("7.6") + @Test + fun testSeveralBuildFiles() { + + val files = configureByFiles().inHighlightingOrder() + importProjectUsingSingeModulePerGradleProject() + + files.forEach { + checkHighlighting(it) + } + + } + } + class ComplexBuildGradleKts : GradleBuildFileHighlightingTest() { @Ignore @TargetVersions("4.8+") diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt similarity index 99% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt index 99e9fc8444de..56a508a0c60d 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.codeInsight.gradle diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/AbstractGradleConfigureProjectByChangingFileTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/AbstractGradleConfigureProjectByChangingFileTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/AbstractGradleConfigureProjectByChangingFileTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/AbstractGradleConfigureProjectByChangingFileTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/GradleConfigureProjectByChangingFileTestGenerated.java b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/GradleConfigureProjectByChangingFileTestGenerated.java similarity index 99% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/GradleConfigureProjectByChangingFileTestGenerated.java rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/GradleConfigureProjectByChangingFileTestGenerated.java index 970ec9c9655c..cceeffa32902 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/GradleConfigureProjectByChangingFileTestGenerated.java +++ b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/GradleConfigureProjectByChangingFileTestGenerated.java @@ -14,7 +14,7 @@ import org.junit.runner.RunWith; * DO NOT MODIFY MANUALLY. */ @SuppressWarnings("all") -@TestRoot("gradle/gradle-java/tests") +@TestRoot("gradle/gradle-java/tests.k1") @TestDataPath("$CONTENT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public abstract class GradleConfigureProjectByChangingFileTestGenerated extends AbstractGradleConfigureProjectByChangingFileTest { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/HasKotlinPluginEnabledGradleTests.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/HasKotlinPluginEnabledGradleTests.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/HasKotlinPluginEnabledGradleTests.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/HasKotlinPluginEnabledGradleTests.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KlibInfoProviderTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KlibInfoProviderTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KlibInfoProviderTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KlibInfoProviderTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KotlinNativeLibraryNameUtilTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KotlinNativeLibraryNameUtilTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KotlinNativeLibraryNameUtilTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/configuration/gradle/klib/KotlinNativeLibraryNameUtilTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/notifications/gradle/LegacyIsResolveModulePerSourceSetNotificationTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/notifications/gradle/LegacyIsResolveModulePerSourceSetNotificationTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/notifications/gradle/LegacyIsResolveModulePerSourceSetNotificationTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/notifications/gradle/LegacyIsResolveModulePerSourceSetNotificationTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/run/gradle/K1GradleProjectRunConfigurationTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/run/gradle/K1GradleProjectRunConfigurationTestCase.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/run/gradle/K1GradleProjectRunConfigurationTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/run/gradle/K1GradleProjectRunConfigurationTestCase.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootDataSerializerTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootDataSerializerTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootDataSerializerTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootDataSerializerTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootIndexTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootIndexTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootIndexTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootIndexTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListenerTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListenerTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListenerTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListenerTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/KotlinDslScriptModelTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFilesTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFilesTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFilesTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/LastModifiedFilesTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/AbstractGradleBuildRootsLocatorTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/AbstractGradleBuildRootsLocatorTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/AbstractGradleBuildRootsLocatorTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/AbstractGradleBuildRootsLocatorTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsLocatorTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsLocatorTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsLocatorTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsLocatorTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/test/events/gradle/KotlinGradleTestNavigationTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/test/events/gradle/KotlinGradleTestNavigationTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/test/events/gradle/KotlinGradleTestNavigationTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/test/events/gradle/KotlinGradleTestNavigationTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleDebuggingIntegrationTest.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleDebuggingIntegrationTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleDebuggingIntegrationTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleDebuggingIntegrationTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleExecutionTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleExecutionTestCase.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleExecutionTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.k1/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleExecutionTestCase.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests.k2/kotlin.gradle.gradle-java.tests.k2.iml b/plugins/kotlin/gradle/gradle-java/tests.k2/kotlin.gradle.gradle-java.tests.k2.iml new file mode 100644 index 000000000000..72a1227059ec --- /dev/null +++ b/plugins/kotlin/gradle/gradle-java/tests.k2/kotlin.gradle.gradle-java.tests.k2.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/tests/KotlinMppTestsDocumentation.md b/plugins/kotlin/gradle/gradle-java/tests.shared/KotlinMppTestsDocumentation.md similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/KotlinMppTestsDocumentation.md rename to plugins/kotlin/gradle/gradle-java/tests.shared/KotlinMppTestsDocumentation.md diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml new file mode 100644 index 000000000000..52545ad2b395 --- /dev/null +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleDaemonAnalyzerTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/GradleDaemonAnalyzerTestCase.kt similarity index 97% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleDaemonAnalyzerTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/GradleDaemonAnalyzerTestCase.kt index 525343d21f1a..825d278d64d8 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/GradleDaemonAnalyzerTestCase.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/GradleDaemonAnalyzerTestCase.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/KotlinGradleSourceSetDataServiceTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/KotlinGradleSourceSetDataServiceTest.kt similarity index 87% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/KotlinGradleSourceSetDataServiceTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/KotlinGradleSourceSetDataServiceTest.kt index bb30ac134489..28e0b6aaafeb 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/KotlinGradleSourceSetDataServiceTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/KotlinGradleSourceSetDataServiceTest.kt @@ -8,8 +8,9 @@ import com.intellij.openapi.externalSystem.model.project.ProjectData import com.intellij.openapi.externalSystem.service.project.ProjectDataManager import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import junit.framework.AssertionFailedError +import org.jetbrains.kotlin.config.IKotlinFacetSettings import org.jetbrains.kotlin.idea.codeInsight.gradle.KotlinGradleImportingTestCase -import org.jetbrains.kotlin.idea.codeInsight.gradle.facetSettings +import org.jetbrains.kotlin.idea.facet.KotlinFacet import org.jetbrains.kotlin.idea.gradle.configuration.KotlinSourceSetData import org.jetbrains.kotlin.idea.gradleJava.configuration.KotlinGradleProjectDataService import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions @@ -17,6 +18,19 @@ import org.jetbrains.plugins.gradle.util.GradleConstants import org.junit.Test import org.junit.jupiter.api.assertDoesNotThrow + +fun KotlinGradleImportingTestCase.facetSettings(moduleName: String): IKotlinFacetSettings { + val facet = KotlinFacet.get(getModule(moduleName)) ?: error("Kotlin facet not found in module $moduleName") + return facet.configuration.settings +} + +val KotlinGradleImportingTestCase.facetSettings: IKotlinFacetSettings + get() = facetSettings("project.main") + +val KotlinGradleImportingTestCase.testFacetSettings: IKotlinFacetSettings + get() = facetSettings("project.test") + + class KotlinGradleSourceSetDataServiceTest : KotlinGradleImportingTestCase() { @Test @TargetVersions("7.6+") diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/PartialGradleImportTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/PartialGradleImportTest.kt similarity index 97% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/PartialGradleImportTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/PartialGradleImportTest.kt index 57c2fc0f505d..b55016ffca6f 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/PartialGradleImportTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/PartialGradleImportTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/ResolveModulesPerSourceSetInMppBuildIssueTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/ResolveModulesPerSourceSetInMppBuildIssueTest.kt similarity index 97% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/ResolveModulesPerSourceSetInMppBuildIssueTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/ResolveModulesPerSourceSetInMppBuildIssueTest.kt index 1ed14ae653e1..d4890854029a 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/ResolveModulesPerSourceSetInMppBuildIssueTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/ResolveModulesPerSourceSetInMppBuildIssueTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle import com.intellij.openapi.actionSystem.DataContext diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt similarity index 99% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt index 7c05038c7166..db079f083690 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle.multiplatformTests import com.intellij.openapi.externalSystem.importing.ImportSpec diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithDescription.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithDescription.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithDescription.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithDescription.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithTarget.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithTarget.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithTarget.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinBeforeAfterTestRuleWithTarget.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinMppTestsJUnit4Runner.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinMppTestsJUnit4Runner.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinMppTestsJUnit4Runner.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinMppTestsJUnit4Runner.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestProperties.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestProperties.kt similarity index 98% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestProperties.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestProperties.kt index ff1d6cedc75a..ad74372101d1 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestProperties.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestProperties.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle.multiplatformTests import org.gradle.util.GradleVersion diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestsResolvableProperty.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestsResolvableProperty.kt similarity index 88% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestsResolvableProperty.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestsResolvableProperty.kt index 0bda11bc2cb3..67190adaff8f 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestsResolvableProperty.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/KotlinTestsResolvableProperty.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle.multiplatformTests import com.intellij.testFramework.UsefulTestCase @@ -17,7 +17,7 @@ interface KotlinTestsResolvableProperty { val defaultValue: String } -fun KotlinTestsResolvableProperty.resolveFromEnvironment(): String { +fun org.jetbrains.kotlin.gradle.multiplatformTests.KotlinTestsResolvableProperty.resolveFromEnvironment(): String { val acronymOrValue = System.getenv()[id.uppercase()] ?: if (!UsefulTestCase.IS_UNDER_TEAMCITY) return defaultValue diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestFeature.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestFeature.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestFeature.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestFeature.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestWithKotlinPluginAndGradleVersions.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestWithKotlinPluginAndGradleVersions.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestWithKotlinPluginAndGradleVersions.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestWithKotlinPluginAndGradleVersions.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestsContext.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestsContext.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestsContext.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/TestsContext.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceModelTestsInfrastructureTests.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceModelTestsInfrastructureTests.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceModelTestsInfrastructureTests.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceModelTestsInfrastructureTests.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceTestDataParsingUnitTests.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceTestDataParsingUnitTests.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceTestDataParsingUnitTests.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/WorkspaceTestDataParsingUnitTests.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/computeTestDataDirectory.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/computeTestDataDirectory.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/computeTestDataDirectory.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/computeTestDataDirectory.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomGradleProperties.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomGradleProperties.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomGradleProperties.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomGradleProperties.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomImportChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomImportChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomImportChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/CustomImportChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/DevModeFeatures.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/DevModeFeatures.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/DevModeFeatures.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/DevModeFeatures.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/LinkedProjectPathsTestsFeature.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/LinkedProjectPathsTestsFeature.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/LinkedProjectPathsTestsFeature.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/LinkedProjectPathsTestsFeature.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/NoErrorEventsDuringImportFeature.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/NoErrorEventsDuringImportFeature.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/NoErrorEventsDuringImportFeature.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/NoErrorEventsDuringImportFeature.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/PublishProjectsTestsFeature.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/PublishProjectsTestsFeature.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/PublishProjectsTestsFeature.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/PublishProjectsTestsFeature.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/AllFilesAreUnderContentRootChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/AllFilesAreUnderContentRootChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/AllFilesAreUnderContentRootChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/AllFilesAreUnderContentRootChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationChecker.kt similarity index 83% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationChecker.kt index d8ef1344af47..51dbee83a849 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationChecker.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationChecker.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers import com.intellij.openapi.editor.LogicalPosition @@ -7,17 +7,14 @@ import com.intellij.psi.search.ProjectScope import com.intellij.testFramework.assertEqualsToFile import com.intellij.testFramework.runInEdtAndGet import org.jetbrains.kotlin.gradle.multiplatformTests.KotlinMppTestsContext -import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope import org.jetbrains.kotlin.gradle.multiplatformTests.TestFeature -import org.jetbrains.kotlin.gradle.multiplatformTests.writeAccess import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde -import org.jetbrains.kotlin.idea.kdoc.findKDoc import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.plugins.gradle.settings.GradleSystemSettings +import org.jetbrains.plugins.gradle.settings.GradleSettings import java.io.File import java.nio.file.Path import kotlin.io.path.relativeTo @@ -26,17 +23,6 @@ class DocumentationCheckerConfig { var downloadSources: Boolean = false } -interface DocumentationCheckerDsl { - private val TestConfigurationDslScope.configuration - get() = writeAccess.getConfiguration(DocumentationChecker) - - var TestConfigurationDslScope.downloadSources: Boolean - get() = configuration.downloadSources - set(value) { - configuration.downloadSources = value - } -} - object DocumentationChecker : TestFeature { private const val EXPECTED_TEST_DATA = "expected-doc.txt" private const val CARET_PLACEHOLDER = "" @@ -88,7 +74,7 @@ object DocumentationChecker : TestFeature { val element = referenceExpression.mainReference.resolve() as KtElement val navigationElement = element.navigationElement as? KtDeclaration ?: error("documentation can be only on KtDeclaration") - val docText = navigationElement.findKDoc { DescriptorToSourceUtilsIde.getAnyDeclaration(testProject, it) }?.contentTag?.getContent() + val docText: String? = null/*navigationElement.findKDoc { DescriptorToSourceUtilsIde.getAnyDeclaration(testProject, it) }?.contentTag?.getContent()*/ return@map """ |$relativePath:$line:$offset |$docText diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationCheckerDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationCheckerDsl.kt new file mode 100644 index 000000000000..d3fe67dc0d64 --- /dev/null +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/DocumentationCheckerDsl.kt @@ -0,0 +1,16 @@ +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers + +import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope +import org.jetbrains.kotlin.gradle.multiplatformTests.writeAccess + +interface DocumentationCheckerDsl { + val TestConfigurationDslScope.configuration + get() = writeAccess.getConfiguration(DocumentationChecker) + + var TestConfigurationDslScope.downloadSources: Boolean + get() = configuration.downloadSources + set(value) { + configuration.downloadSources = value + } +} \ No newline at end of file diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/TestTasksChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/TestTasksChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/TestTasksChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/TestTasksChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/CheckerContentRootType.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/CheckerContentRootType.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/CheckerContentRootType.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/CheckerContentRootType.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecker.kt similarity index 94% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecker.kt index bec8a2774d54..96a162b86d18 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecker.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecker.kt @@ -53,10 +53,10 @@ object ContentRootsChecker : WorkspaceModelChecker { val configuration = testConfiguration.getConfiguration(ContentRootsChecker) val hiddenSourceRoots = listOfNotNull( - "tests".takeIf { configuration.hideTestSourceRoots }, - "resources".takeIf { configuration.hideResourceRoots }, - "android-specific roots".takeIf { configuration.hideAndroidSpecificRoots }, - "generated".takeIf { configuration.hideGeneratedRoots }, + "tests".takeIf { configuration.hideTestSourceRoots }, + "resources".takeIf { configuration.hideResourceRoots }, + "android-specific roots".takeIf { configuration.hideAndroidSpecificRoots }, + "generated".takeIf { configuration.hideGeneratedRoots }, ) return if (hiddenSourceRoots.isEmpty()) diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksDsl.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksDsl.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/ContentRootsChecksDsl.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/SourceFolderCheckerEntity.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/SourceFolderCheckerEntity.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/SourceFolderCheckerEntity.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/contentRoots/SourceFolderCheckerEntity.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksDsl.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksDsl.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecksDsl.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckDsl.kt similarity index 93% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckDsl.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckDsl.kt index c2a44ac3f605..6df055cc38d1 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckDsl.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingCheckDsl.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.hig import com.intellij.lang.annotation.HighlightSeverity import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope +import org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.DocumentationChecker import org.jetbrains.kotlin.gradle.multiplatformTests.writeAccess interface HighlightingCheckDsl { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/highlighting/HighlightingChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksDsl.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksDsl.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/OrderEntriesChecksDsl.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/foldKonanDistribution.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/foldKonanDistribution.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/foldKonanDistribution.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/orderEntries/foldKonanDistribution.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsChecker.kt similarity index 99% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsChecker.kt index 2a0a5eb4d7a2..f35fbba43bf3 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsChecker.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsChecker.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.base.util.allScope import org.jetbrains.kotlin.idea.codeInsight.gradle.combineMultipleFailures import org.jetbrains.kotlin.idea.stubindex.KotlinFunctionShortNameIndex import org.jetbrains.kotlin.idea.test.KotlinTestUtils -import org.jetbrains.kotlin.js.backend.ast.REGULAR_EXTENSION import org.jetbrains.kotlin.name.FqName import kotlin.coroutines.Continuation import kotlin.coroutines.resume diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/ExecuteRunConfigurationsConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationChecksDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationChecksDsl.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationChecksDsl.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationChecksDsl.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsCheckConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsCheckConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsCheckConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsCheckConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/runConfigurations/RunConfigurationsChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecks.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecks.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecks.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecks.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecksConfiguration.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecksConfiguration.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecksConfiguration.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/GeneralWorkspaceChecksConfiguration.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/WorkspaceChecksDsl.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/WorkspaceChecksDsl.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/WorkspaceChecksDsl.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testFeatures/checkers/workspace/WorkspaceChecksDsl.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/AndroidTestsProperties.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/AndroidTestsProperties.kt similarity index 84% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/AndroidTestsProperties.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/AndroidTestsProperties.kt index 46fed6e89b10..4ad3a04838f7 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/AndroidTestsProperties.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/AndroidTestsProperties.kt @@ -3,7 +3,7 @@ package org.jetbrains.kotlin.gradle.multiplatformTests.testProperties import org.jetbrains.kotlin.gradle.multiplatformTests.* -object AndroidGradlePluginVersionTestsProperty : KotlinTestsResolvableProperty { +object AndroidGradlePluginVersionTestsProperty : org.jetbrains.kotlin.gradle.multiplatformTests.KotlinTestsResolvableProperty { override val id: String = "AGP_VERSION" enum class Value(val acronym: String, val version: String) { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/GradleVersionTestsProperty.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/GradleVersionTestsProperty.kt similarity index 87% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/GradleVersionTestsProperty.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/GradleVersionTestsProperty.kt index e203df9cf76e..75e42a9af3d7 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/GradleVersionTestsProperty.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/GradleVersionTestsProperty.kt @@ -3,7 +3,7 @@ package org.jetbrains.kotlin.gradle.multiplatformTests.testProperties import org.jetbrains.kotlin.gradle.multiplatformTests.KotlinTestsResolvableProperty -object GradleVersionTestsProperty : KotlinTestsResolvableProperty { +object GradleVersionTestsProperty : org.jetbrains.kotlin.gradle.multiplatformTests.KotlinTestsResolvableProperty { override val id: String = "gradle_version" enum class Value(val acronym: String, val version: String) { diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/KotlinGradlePluginVersionTestsProperty.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/KotlinGradlePluginVersionTestsProperty.kt similarity index 90% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/KotlinGradlePluginVersionTestsProperty.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/KotlinGradlePluginVersionTestsProperty.kt index 717772100b99..fcf9cf8d7afd 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/KotlinGradlePluginVersionTestsProperty.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/KotlinGradlePluginVersionTestsProperty.kt @@ -6,7 +6,7 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.KotlinGradlePluginVersions // TODO: deduplicate with [org.jetbrains.kotlin.idea.codeInsight.gradle.KotlinGradlePluginVersions] // when the new tests infra becomes enabled by default -object KotlinGradlePluginVersionTestsProperty : KotlinTestsResolvableProperty { +object KotlinGradlePluginVersionTestsProperty : org.jetbrains.kotlin.gradle.multiplatformTests.KotlinTestsResolvableProperty { override val id: String = "KGP_VERSION" @Suppress("unused") // passed using environment variables diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/SimpleProperties.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/SimpleProperties.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/SimpleProperties.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/testProperties/SimpleProperties.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/ExpectedFileSanitation.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/ExpectedFileSanitation.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/ExpectedFileSanitation.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/ExpectedFileSanitation.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/PrinterContext.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/PrinterContext.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/PrinterContext.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/PrinterContext.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/WorkspaceModelChecker.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/WorkspaceModelChecker.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/WorkspaceModelChecker.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/WorkspaceModelChecker.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/applyComments.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/applyComments.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/applyComments.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/applyComments.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/findTestdata.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/findTestdata.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/findTestdata.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/findTestdata.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/parsing.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/parsing.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/parsing.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/parsing.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/rendering.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/rendering.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/rendering.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/rendering.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/reports.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/reports.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/reports.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/reports.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/utils.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/utils.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/utils.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/workspace/utils.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/projectStructureDSL.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/projectStructureDSL.kt similarity index 99% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/projectStructureDSL.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/projectStructureDSL.kt index 44847f0e8cf6..dc741462c9ba 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/projectStructureDSL.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/projectStructureDSL.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.gradle @@ -14,7 +14,6 @@ import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFile import com.intellij.util.PathUtil import org.intellij.lang.annotations.Language -import org.jetbrains.annotations.ApiStatus import org.jetbrains.jps.model.module.JpsModuleSourceRootType import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.ExternalSystemTestRunTask diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AndroidImportingTestRule.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AndroidImportingTestRule.kt similarity index 96% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AndroidImportingTestRule.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AndroidImportingTestRule.kt index b42b2f149dc5..c38438cf5ad3 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AndroidImportingTestRule.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AndroidImportingTestRule.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.codeInsight.gradle import org.gradle.util.GradleVersion diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/BuildGradleModel.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/BuildGradleModel.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/BuildGradleModel.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/BuildGradleModel.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CheckHighlighting.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CheckHighlighting.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CheckHighlighting.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CheckHighlighting.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CombineMultipleFailures.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CombineMultipleFailures.kt similarity index 94% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CombineMultipleFailures.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CombineMultipleFailures.kt index 3fbe7dfdb318..5aeb8c25efb7 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CombineMultipleFailures.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CombineMultipleFailures.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.codeInsight.gradle import org.junit.runners.model.MultipleFailureException diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CommonizerImportAndCheckHighlightingTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CommonizerImportAndCheckHighlightingTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CommonizerImportAndCheckHighlightingTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/CommonizerImportAndCheckHighlightingTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ConversionToKotlinTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ConversionToKotlinTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ConversionToKotlinTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ConversionToKotlinTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorPlatformSpecificTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKotlinTestUtils.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKotlinTestUtils.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKotlinTestUtils.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKotlinTestUtils.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleQuickFixTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleUpdateConfigurationQuickFixTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinAutoConfigTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinAutoConfigTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinAutoConfigTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinAutoConfigTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleBuildNavigationTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleBuildNavigationTest.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleBuildNavigationTest.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleBuildNavigationTest.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleImportingTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleImportingTestCase.kt similarity index 98% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleImportingTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleImportingTestCase.kt index 48f31ec3860c..394b7a17ad42 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleImportingTestCase.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradleImportingTestCase.kt @@ -11,7 +11,6 @@ import com.intellij.openapi.externalSystem.task.TaskCallback import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.fileEditor.impl.LoadTextUtil -import com.intellij.openapi.module.Module import com.intellij.openapi.options.advanced.AdvancedSettings import com.intellij.openapi.options.advanced.AdvancedSettingsImpl import com.intellij.openapi.roots.LibraryOrderEntry @@ -35,6 +34,7 @@ import org.jetbrains.plugins.gradle.importing.GradleImportingTestCase import org.jetbrains.plugins.gradle.service.project.open.createLinkSettings import org.jetbrains.plugins.gradle.settings.GradleSystemSettings import org.jetbrains.plugins.gradle.util.GradleConstants +import com.intellij.openapi.module.Module import org.junit.Assume import org.junit.runners.Parameterized import java.io.ByteArrayInputStream @@ -342,7 +342,16 @@ abstract class KotlinGradleImportingTestCase : GradleImportingTestCase() { const val LATEST_STABLE_GRADLE_PLUGIN_VERSION = "1.3.70" - val SUPPORTED_GRADLE_VERSIONS = arrayOf("5.6.4", "6.0.1", "6.7.1", "7.6") + val SUPPORTED_GRADLE_VERSIONS = arrayOf("5.6.4", "6.0.1", "6.7.1", "7.6", "8.6") + + // https://kotlinlang.org/docs/gradle-configure-project.html#targeting-the-jvm + val GRADLE_TO_KGP_VERSION = mapOf( + "5.6.4" to "1.3.70", + "6.0.1" to "1.3.70", + "6.7.1" to "1.7.22", + "7.6" to "1.9.10", + "8.6" to "1.9.20" + ) @JvmStatic @Suppress("ACCIDENTAL_OVERRIDE") diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinMPPGradleModelAssertions.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinMPPGradleModelAssertions.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinMPPGradleModelAssertions.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinMPPGradleModelAssertions.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt similarity index 97% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt index 21b11ccd2d47..4266178b97e2 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. /** * This TestCase implements possibility to test import with different versions of gradle and different @@ -8,8 +8,6 @@ package org.jetbrains.kotlin.idea.codeInsight.gradle import com.intellij.lang.annotation.HighlightSeverity import com.intellij.openapi.util.Disposer -import com.intellij.openapi.vfs.VfsUtil -import com.intellij.openapi.vfs.VirtualFile import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.ProjectInfo import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfiguration diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/PluginTargetVersionsRule.java b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/PluginTargetVersionsRule.java similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/PluginTargetVersionsRule.java rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/PluginTargetVersionsRule.java diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/run/gradle/KotlinGradleProjectRunConfigurationTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/run/gradle/KotlinGradleProjectRunConfigurationTestCase.kt similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/run/gradle/KotlinGradleProjectRunConfigurationTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/run/gradle/KotlinGradleProjectRunConfigurationTestCase.kt diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleCodeInsightTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleCodeInsightTestCase.kt similarity index 93% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleCodeInsightTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleCodeInsightTestCase.kt index e843f6683473..b8f1aa361914 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleCodeInsightTestCase.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleCodeInsightTestCase.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.testFramework.gradle import com.intellij.testFramework.RunAll diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleProjectTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleProjectTestCase.kt similarity index 95% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleProjectTestCase.kt rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleProjectTestCase.kt index 4782d4edc2cb..102b1176044b 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleProjectTestCase.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/testFramework/gradle/KotlinGradleProjectTestCase.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.testFramework.gradle import com.intellij.testFramework.RunAll diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java similarity index 100% rename from plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java rename to plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java diff --git a/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform-tests.k2.iml b/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform-tests.k2.iml index f87716733aee..2993d4b2f7df 100644 --- a/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform-tests.k2.iml +++ b/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform-tests.k2.iml @@ -22,7 +22,6 @@ - @@ -30,5 +29,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/gradle/multiplatform-tests/intellij.kotlin.gradle.multiplatformTests.iml b/plugins/kotlin/gradle/multiplatform-tests/intellij.kotlin.gradle.multiplatformTests.iml index 921be6c2f305..af10d5561514 100644 --- a/plugins/kotlin/gradle/multiplatform-tests/intellij.kotlin.gradle.multiplatformTests.iml +++ b/plugins/kotlin/gradle/multiplatform-tests/intellij.kotlin.gradle.multiplatformTests.iml @@ -22,7 +22,6 @@ - @@ -36,5 +35,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml b/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml index 070411480b39..75a4a642c604 100644 --- a/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml +++ b/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml @@ -27,7 +27,7 @@ - + @@ -48,5 +48,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt b/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt index 7de99cc7daa7..1ccd37debb19 100644 --- a/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt +++ b/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt @@ -122,7 +122,7 @@ private fun cloneModuleStructure(monorepoRoot: File, communityRoot: File) { */ private fun updateLatestGradlePluginVersion(communityRoot: File, kotlinGradlePluginVersion: String) { val kotlinGradlePluginVersionsKt = communityRoot.resolve( - "plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt" + "plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt" ) updateFile( kotlinGradlePluginVersionsKt, diff --git a/plugins/kotlin/util/test-generator-fe10/kotlin.util.test-generator-fe10.iml b/plugins/kotlin/util/test-generator-fe10/kotlin.util.test-generator-fe10.iml index 6f4ccd4df5c1..0b0529c8bca9 100644 --- a/plugins/kotlin/util/test-generator-fe10/kotlin.util.test-generator-fe10.iml +++ b/plugins/kotlin/util/test-generator-fe10/kotlin.util.test-generator-fe10.iml @@ -20,7 +20,7 @@ - + @@ -40,5 +40,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/util/test-generator-fe10/test/org/jetbrains/kotlin/fe10/testGenerator/Fe10GenerateTests.kt b/plugins/kotlin/util/test-generator-fe10/test/org/jetbrains/kotlin/fe10/testGenerator/Fe10GenerateTests.kt index bc48e9f2c5b3..646d9470ccc6 100644 --- a/plugins/kotlin/util/test-generator-fe10/test/org/jetbrains/kotlin/fe10/testGenerator/Fe10GenerateTests.kt +++ b/plugins/kotlin/util/test-generator-fe10/test/org/jetbrains/kotlin/fe10/testGenerator/Fe10GenerateTests.kt @@ -1105,7 +1105,7 @@ private fun assembleWorkspace(): TWorkspace = workspace { } } - testGroup("gradle/gradle-java/tests", testDataPath = "../../../idea/tests/testData") { + testGroup("gradle/gradle-java/tests.k1", testDataPath = "../../../idea/tests/testData") { testClass { model("configuration/gradle", pattern = DIRECTORY, isRecursive = false, testMethodName = "doTestGradle") model("configuration/gsk", pattern = DIRECTORY, isRecursive = false, testMethodName = "doTestGradle") diff --git a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml index fae36bbfa15d..7458b2f6cf46 100644 --- a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml +++ b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml @@ -39,7 +39,6 @@ - @@ -77,5 +76,7 @@ + + \ No newline at end of file