[mpp] Report commonTest with dependsOn similarly to commonMain

^KT-60556

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/diagnosticsRenderingSmoke/expectedOutput.txt

@@ -6,7 +6,7 @@ kotlin.mpp.enableCompatibilityMetadataVariant, kotlin.mpp.hierarchicalStructureS
 Read the details here: https://kotlinlang.org/docs/multiplatform-compatibility-guide.html#deprecate-hmpp-properties
 #diagnostic-end
 
-e: [CommonMainWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets
+e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets
 #diagnostic-end
 
 w: [KotlinDefaultHierarchyFallbackDependsOnUsageDetected | WARNING] The Default Kotlin Hierarchy was not applied to 'project ':subprojectA'':
@@ -20,7 +20,7 @@ to your gradle.properties
 
 
 > Configure project :subprojectB
-e: [CommonMainWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets
+e: [CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets
 #diagnostic-end
 
 w: [KotlinDefaultHierarchyFallbackDependsOnUsageDetected | WARNING] The Default Kotlin Hierarchy was not applied to 'project ':subprojectB'':

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinGradleProjectChecker.kt

@@ -97,7 +97,7 @@ internal interface KotlinGradleProjectChecker {
 
     companion object {
         val ALL_CHECKERS: List<KotlinGradleProjectChecker> = listOf(
-            CommonMainWithDependsOnChecker,
+            CommonMainOrTestWithDependsOnChecker,
             DeprecatedKotlinNativeTargetsChecker,
             MissingNativeStdlibChecker,
             UnusedSourceSetsChecker,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnostics.kt

@@ -35,8 +35,8 @@ object KotlinToolingDiagnostics {
         )
     }
 
-    object CommonMainWithDependsOnDiagnostic : ToolingDiagnosticFactory(ERROR) {
+    object CommonMainOrTestWithDependsOnDiagnostic : ToolingDiagnosticFactory(ERROR) {
-        operator fun invoke() = build("commonMain can't declare dependsOn on other source sets")
+        operator fun invoke(suffix: String) = build("common$suffix can't declare dependsOn on other source sets")
     }
 
     object NativeStdlibIsMissingDiagnostic : ToolingDiagnosticFactory(WARNING) {
@@ -587,4 +587,4 @@ private fun String.indentLines(nSpaces: Int = 4, skipFirstLine: Boolean = true):
             if (skipFirstLine && index == 0) return@joinToString line
             if (line.isNotBlank()) "$spaces$line" else line
         }
-}
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/checkers/CommonMainOrTestWithDependsOnChecker.kt

@@ -6,19 +6,27 @@
 package org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers
 
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
-import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinGradleProjectChecker
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinGradleProjectCheckerContext
+import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
+import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector
 import org.jetbrains.kotlin.gradle.plugin.sources.internal
 
-internal object CommonMainWithDependsOnChecker : KotlinGradleProjectChecker {
+internal object CommonMainOrTestWithDependsOnChecker : KotlinGradleProjectChecker {
     override suspend fun KotlinGradleProjectCheckerContext.runChecks(collector: KotlinToolingDiagnosticsCollector) {
+        fun KotlinSourceSet.registerReporting(suffix: String) {
+            internal.dependsOn.forAll {
+                collector.reportOncePerGradleProject(
+                    project,
+                    KotlinToolingDiagnostics.CommonMainOrTestWithDependsOnDiagnostic(suffix),
+                    key = suffix
+                )
+            }
+        }
         multiplatformExtension?.sourceSets?.all {
-            if (it.name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) {
+            when (it.name) {
-                it.internal.dependsOn.forAll {
+                KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME -> it.registerReporting("Main")
-                    collector.reportOncePerGradleProject(project, KotlinToolingDiagnostics.CommonMainWithDependsOnDiagnostic())
+                KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME -> it.registerReporting("Test")
-                }
             }
         }
     }

libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/MppDiagnosticsFunctionalTest.kt

@@ -14,8 +14,8 @@ import org.junit.Test
 class MppDiagnosticsFunctionalTest {
 
     @Test
-    fun testCommonMainWithDependsOn() {
+    fun testCommonMainOrTestWithDependsOn() {
-        checkDiagnosticsWithMppProject("commonMainWithDependsOn") {
+        checkDiagnosticsWithMppProject("commonMainOrTestWithDependsOn") {
             kotlin {
                 jvm()
                 linuxX64()
@@ -29,6 +29,13 @@ class MppDiagnosticsFunctionalTest {
                         dependsOn(myCustomCommonMain)
                         dependsOn(myCustomCommonMain2) // check that diagnostic isn't duplicated
                     }
+
+                    val myCustomCommonTest = create("myCustomCommonTest")
+                    val myCustomCommonTest2 = create("myCustomCommonTest2")
+                    commonTest {
+                        dependsOn(myCustomCommonTest)
+                        dependsOn(myCustomCommonTest2) // check that diagnostic isn't duplicated
+                    }
                 }
             }
         }

libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/commonMainOrTestWithDependsOn.txt

@@ -0,0 +1,3 @@
+[CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets
+----
+[CommonMainOrTestWithDependsOnDiagnostic | ERROR] commonTest can't declare dependsOn on other source sets

libraries/tools/kotlin-gradle-plugin/src/functionalTest/resources/expectedDiagnostics/commonMainWithDependsOn.txt

@@ -1 +0,0 @@
-[CommonMainWithDependsOnDiagnostic | ERROR] commonMain can't declare dependsOn on other source sets