[IC][MPP] Upgrade tests for incremental scenarios with expect-actual

Existing tests were k1-only in CI. Simplified test project, added
assertions for native. Switched to the new test Dsl.

^KT-61845 duplicates KT-61590
^KT-56963 in progress

Merge-request: KT-MR-12651
Merged-by: Evgenii Mazhukin <evgenii.mazhukin@jetbrains.com>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AssociatedCompilationIT.kt

@@ -9,15 +9,14 @@ import org.gradle.api.logging.LogLevel
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.jetbrains.kotlin.gradle.util.replaceFirst
-import org.jetbrains.kotlin.gradle.util.replaceText
 import org.junit.jupiter.api.DisplayName
 
 @DisplayName("Incremental scenarios with associated compilation")
+@JvmGradlePluginTests
 class AssociatedCompilationIT : KGPBaseTest() {
     override val defaultBuildOptions: BuildOptions
         get() = super.defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)
 
-    @JvmGradlePluginTests
     @DisplayName("Rebuild forced if associated compilation changes")
     @GradleTest
     fun testRebuildOnAssociatedCompilationChange(gradleVersion: GradleVersion) {
@@ -38,7 +37,6 @@ class AssociatedCompilationIT : KGPBaseTest() {
         }
     }
 
-    @JvmGradlePluginTests
     @DisplayName("Rebuild after used internal ABI change in associated compilation")
     @GradleTest
     fun testRebuildOnUsedApiChangeInAssociatedCompilation(gradleVersion: GradleVersion) {
@@ -55,7 +53,6 @@ class AssociatedCompilationIT : KGPBaseTest() {
         }
     }
 
-    @JvmGradlePluginTests
     @DisplayName("No rebuild after private ABI change in associated compilation")
     @GradleTest
     fun testNoRebuildOnPrivateChangeInAssociatedCompilation(gradleVersion: GradleVersion) {
@@ -71,7 +68,6 @@ class AssociatedCompilationIT : KGPBaseTest() {
         }
     }
 
-    @JvmGradlePluginTests
     @DisplayName("No rebuild after unused ABI change in associated compilation")
     @GradleTest
     fun testNoRebuildOnUnusedInternalChangeInAssociatedCompilation(gradleVersion: GradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt

@@ -1372,46 +1372,6 @@ open class NewMultiplatformIT : BaseGradleIT() {
         }
     }
 
-    @Test
-    fun testIncrementalCompilation() = with(Project("new-mpp-jvm-js-ic", gradleVersion)) {
-        setupWorkingDir()
-
-        build("build") {
-            assertSuccessful()
-        }
-
-        val libCommonClassKt = projectDir.getFileByName("LibCommonClass.kt")
-        val libCommonClassJsKt = projectDir.getFileByName("LibCommonClassJs.kt")
-        libCommonClassJsKt.modify { it.checkedReplace("platform = \"js\"", "platform = \"Kotlin/JS\"") }
-
-        val libCommonClassJvmKt = projectDir.getFileByName("LibCommonClassJvm.kt")
-        libCommonClassJvmKt.modify { it.checkedReplace("platform = \"jvm\"", "platform = \"Kotlin/JVM\"") }
-        build("build") {
-            assertSuccessful()
-            assertCompiledKotlinSources(project.relativize(libCommonClassKt, libCommonClassJsKt, libCommonClassJvmKt))
-        }
-
-        val libJvmPlatformUtilKt = projectDir.getFileByName("libJvmPlatformUtil.kt")
-        libJvmPlatformUtilKt.modify {
-            it.checkedReplace("fun libJvmPlatformUtil", "inline fun libJvmPlatformUtil")
-        }
-        build("build") {
-            assertSuccessful()
-            val useLibJvmPlatformUtilKt = projectDir.getFileByName("useLibJvmPlatformUtil.kt")
-            assertCompiledKotlinSources(project.relativize(libJvmPlatformUtilKt, useLibJvmPlatformUtilKt))
-        }
-
-        val libJsPlatformUtilKt = projectDir.getFileByName("libJsPlatformUtil.kt")
-        libJsPlatformUtilKt.modify {
-            it.checkedReplace("fun libJsPlatformUtil", "inline fun libJsPlatformUtil")
-        }
-        build("build") {
-            assertSuccessful()
-            val useLibJsPlatformUtilKt = projectDir.getFileByName("useLibJsPlatformUtil.kt")
-            assertCompiledKotlinSources(project.relativize(libJsPlatformUtilKt, useLibJsPlatformUtilKt))
-        }
-    }
-
     @Test
     fun testPomRewritingInSinglePlatformProject() = with(Project("kt-27059-pom-rewriting")) {
         setupWorkingDir()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/ExpectActualIncrementalCompilationIT.kt

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.mpp
+
+import org.gradle.api.logging.LogLevel
+import org.gradle.util.GradleVersion
+import org.jetbrains.kotlin.gradle.testbase.*
+import org.jetbrains.kotlin.gradle.util.replaceFirst
+import org.junit.jupiter.api.DisplayName
+import kotlin.io.path.appendText
+
+@DisplayName("Incremental scenarios with expect/actual - K2")
+@MppGradlePluginTests
+open class ExpectActualIncrementalCompilationIT : KGPBaseTest() {
+    override val defaultBuildOptions: BuildOptions
+        get() = super.defaultBuildOptions.copyEnsuringK2()
+
+    @DisplayName("Base test case - local change, local recompilation")
+    @GradleTest
+    fun testStrictlyLocalChange(gradleVersion: GradleVersion) {
+        nativeProject("expect-actual-fun-or-class-ic", gradleVersion) {
+            build("assemble")
+
+            val valueKtPath = kotlinSourcesDir("commonMain").resolve("Value.kt")
+            valueKtPath.appendText("val irrelevant = 2")
+
+            build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
+                assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
+                assertIncrementalCompilation(listOf(valueKtPath).relativizeTo(projectPath))
+            }
+        }
+    }
+
+    @DisplayName("File with actual declaration needs recompiling")
+    @GradleTest
+    fun testRecompilationOfActualFun(gradleVersion: GradleVersion) {
+        nativeProject("expect-actual-fun-or-class-ic", gradleVersion) {
+            build("assemble")
+
+            listOf(
+                kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"),
+                kotlinSourcesDir("nativeMain").resolve("FooNative.kt"),
+                kotlinSourcesDir("jsMain").resolve("FooJs.kt")
+            ).forEach {
+                it.replaceFirst("\"foo", "\"bar")
+            }
+
+            build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
+                assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
+                assertIncrementalCompilation(
+                    listOf(
+                        kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"),
+                        kotlinSourcesDir("jsMain").resolve("FooJs.kt"),
+                        kotlinSourcesDir("commonMain").resolve("Foo.kt")
+                    ).relativizeTo(projectPath)
+                )
+            }
+        }
+    }
+
+    @DisplayName("File with expect declaration needs recompiling indirectly")
+    @GradleTest
+    fun testRecompilationOfExpectFun(gradleVersion: GradleVersion) {
+        nativeProject("expect-actual-fun-or-class-ic", gradleVersion) {
+            build("assemble")
+
+            val valueKtPath = kotlinSourcesDir("commonMain").resolve("Value.kt")
+            valueKtPath.replaceFirst(
+                "val secret = 1",
+                "val secret = \"k2\""
+            )
+
+            build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
+                assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
+                assertIncrementalCompilation(
+                    listOf(
+                        kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"),
+                        kotlinSourcesDir("jsMain").resolve("FooJs.kt"),
+                        kotlinSourcesDir("commonMain").resolve("Foo.kt"),
+                        valueKtPath
+                    ).relativizeTo(projectPath)
+                )
+            }
+        }
+    }
+
+    @DisplayName("File with expect class declaration needs recompiling")
+    @GradleTest
+    fun testRecompilationOfExpectClass(gradleVersion: GradleVersion) {
+        nativeProject("expect-actual-fun-or-class-ic", gradleVersion) {
+            build("assemble")
+
+            kotlinSourcesDir("commonMain").resolve("Bar.kt").appendText("val irrelevant = 2")
+
+            build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
+                assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
+                assertIncrementalCompilation(listOf("commonMain", "jvmMain", "jsMain").map { sourceSet ->
+                    kotlinSourcesDir(sourceSet).resolve("Bar.kt")
+                }.relativizeTo(projectPath))
+            }
+        }
+    }
+}
+
+@DisplayName("Incremental scenarios with expect/actual - K1")
+class ExpectActualIncrementalCompilationK1IT : ExpectActualIncrementalCompilationIT() {
+    override val defaultBuildOptions: BuildOptions
+        get() = super.defaultBuildOptions.copyEnsuringK1()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    kotlin("multiplatform")
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+kotlin {
+    jvm()
+    js(IR) { browser { } }
+    <SingleNativeTarget>("native")
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Bar.kt

@@ -0,0 +1,3 @@
+expect class Bar {
+    val version: Int
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Foo.kt

@@ -0,0 +1,3 @@
+expect fun foo(): Any
+
+fun fooImpl() = secret

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Value.kt

@@ -0,0 +1 @@
+val secret = 1

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/Bar.kt

@@ -0,0 +1,3 @@
+actual class Bar {
+    actual val version: Int = 2
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/FooJs.kt

@@ -0,0 +1 @@
+actual fun foo(): Any = "fooJs"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/Bar.kt

@@ -0,0 +1,3 @@
+actual class Bar {
+    actual val version: Int = 3
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/FooJvm.kt

@@ -0,0 +1 @@
+actual fun foo(): Any = "fooJvm"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/Bar.kt

@@ -0,0 +1,3 @@
+actual class Bar {
+    actual val version: Int = 1
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/FooNative.kt

@@ -0,0 +1 @@
+actual fun foo(): Any = "fooNative"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/build.gradle

@@ -1,7 +0,0 @@
-apply from: "$rootDir/configure-targets.gradle"
-
-kotlin.sourceSets.commonMain {
-    dependencies {
-        implementation project(":lib")
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/commonMain/kotlin/AppCommonClass.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-expect class AppCommonClass {
-    val platform: String
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/commonMain/kotlin/AppCommonDummy.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-class AppCommonDummy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/jsMain/kotlin/AppCommonClassJs.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-actual class AppCommonClass {
-    actual val platform = "js"
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/jsMain/kotlin/AppJsDummy.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-class AppJsDummy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/jsMain/kotlin/useLibJsPlatformUtil.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-fun useLibJsPlatformUtil() = libJsPlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/jvmMain/kotlin/AppCommonClassJvm.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-actual class AppCommonClass {
-    actual val platform = "jvm"
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/jvmMain/kotlin/AppJvmDummy.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-class AppJvmDummy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/src/jvmMain/kotlin/useLibJvmPlatformUtil.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-fun useLibJvmPlatformUtil() = libJvmPlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/build.gradle

@@ -1,16 +0,0 @@
-buildscript {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-	}
-	dependencies {
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-	}
-}
-
-subprojects {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-	}
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/configure-targets.gradle

@@ -1,24 +0,0 @@
-apply plugin: "kotlin-multiplatform"
-
-kotlin {
-    jvm {}
-    js(IR) {}
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib-common'
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib-js'
-            }
-        }
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/build.gradle

@@ -1 +0,0 @@
-apply from: "$rootDir/configure-targets.gradle"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/commonMain/kotlin/LibCommonClass.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-expect class LibCommonClass {
-    val platform: String
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/commonMain/kotlin/LibCommonDummy.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-class LibCommonDummy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/jsMain/kotlin/LibCommonClassJs.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-actual class LibCommonClass {
-    actual val platform = "js"
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/jsMain/kotlin/LibJsDummy.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-class LibJsDummy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/jsMain/kotlin/libJsPlatformUtil.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-fun libJsPlatformUtil(): Int = 0

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/jvmMain/kotlin/LibCommonClassJvm.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-actual class LibCommonClass {
-    actual val platform = "jvm"
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/jvmMain/kotlin/LibJvmDummy.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-class LibJvmDummy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/src/jvmMain/kotlin/libJvmPlatformUtil.kt

@@ -1,6 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-fun libJvmPlatformUtil(): Int = 0

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/settings.gradle

@@ -1 +0,0 @@
-include ':app', ':lib'