[IC] Smoke tests for KMP IC, part 1.5

Refactorings: rework testData to better reflect usages of declarations,
clean up internal test methods.

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

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

@@ -11,8 +11,14 @@ import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.jetbrains.kotlin.gradle.testbase.relativizeTo
 import java.nio.file.Path
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.io.path.appendText
 
+/**
+ * KmpIncrementalITBase is used as a "limited scope" for experimental test utils.
+ * If some of them can be reused widely, consider moving them to KGPBaseTest
+ * or the appropriate util package. //TODO: KT-63876
+ */
 abstract class KmpIncrementalITBase : KGPBaseTest() {
 
     override val defaultBuildOptions: BuildOptions
@@ -38,10 +44,13 @@ abstract class KmpIncrementalITBase : KGPBaseTest() {
         )
     }
 
-    protected open fun TestProject.touchAndGet(subproject: String, srcDir: String, name: String): Path {
+    protected fun TestProject.resolvePath(subproject: String, srcDir: String, name: String): Path {
-        val path = subProject(subproject).kotlinSourcesDir(srcDir).resolve(name)
+        return subProject(subproject).kotlinSourcesDir(srcDir).resolve(name)
-        path.appendText("private val nothingMuch = 24")
+    }
-        return path
+
+    protected fun Path.addPrivateVal(): Path {
+        this@addPrivateVal.appendText("private val nothingMuch${changeCounter.incrementAndGet()} = 24")
+        return this@addPrivateVal
     }
 
     protected open fun BuildResult.assertSuccessOrUTD(allTasks: Set<String>, executedTasks: Set<String>) {
@@ -61,4 +70,8 @@ abstract class KmpIncrementalITBase : KGPBaseTest() {
             assertions()
         }
     }
+
+    companion object {
+        private val changeCounter = AtomicInteger(0)
+    }
 }

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

@@ -10,6 +10,9 @@ import org.jetbrains.kotlin.gradle.mpp.KmpIncrementalITBase
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.junit.jupiter.api.DisplayName
 
+/**
+ * Basic smoke tests assert that the baseline IC is reasonable: if we do a local change, only a local rebuild is performed.
+ */
 @DisplayName("Basic incremental scenarios with KMP - K2")
 @MppGradlePluginTests
 open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
@@ -24,7 +27,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("app", "commonMain", "PlainPublicClass.kt"),
+            incrementalPath = resolvePath("app", "commonMain", "Unused.kt").addPrivateVal(),
             executedTasks = setOf(
                 ":app:compileKotlinJvm",
                 ":app:compileKotlinJs",
@@ -36,7 +39,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          * Step 2: touch app:jvm, no abi change
          */
 
-        val appJvmClassKt = touchAndGet("app", "jvmMain", "PlainPublicClassJvm.kt")
+        val appJvmClassKt = resolvePath("app", "jvmMain", "UnusedJvm.kt").addPrivateVal()
         testCase(
             incrementalPath = null, //TODO: it just doesn't print "Incremental compilation completed", why? (KT-63476)
             executedTasks = setOf(":app:compileKotlinJvm")
@@ -49,7 +52,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("app", "jsMain", "PlainPublicClassJs.kt"),
+            incrementalPath = resolvePath("app", "jsMain", "UnusedJs.kt").addPrivateVal(),
             executedTasks = setOf(":app:compileKotlinJs"),
         )
 
@@ -57,7 +60,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          * Step 4: touch app:native, no abi change
          */
 
-        touchAndGet("app", "nativeMain", "PlainPublicClassNative.kt")
+        resolvePath("app", "nativeMain", "UnusedNative.kt").addPrivateVal()
         testCase(
             incrementalPath = null, // no native incremental compilation - see KT-62824
             executedTasks = setOf(":app:compileKotlinNative"),
@@ -68,7 +71,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("lib", "commonMain", "CommonUtil.kt"),
+            incrementalPath = resolvePath("lib", "commonMain", "UsedInLibPlatformTests.kt").addPrivateVal(),
             executedTasks = mainCompileTasks // TODO: KT-62642 - bad compile avoidance here
         )
 
@@ -76,7 +79,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          * Step 6: touch lib:jvm, no abi change
          */
 
-        val libJvmUtilKt = touchAndGet("lib", "jvmMain", "libJvmPlatformUtil.kt")
+        val libJvmUtilKt = resolvePath("lib", "jvmMain", "UsedInAppJvmAndLibTests.kt").addPrivateVal()
         testCase(
             incrementalPath = null, //TODO: it just doesn't print "Incremental compilation completed", why? (KT-63476)
             executedTasks = setOf(":app:compileKotlinJvm", ":lib:compileKotlinJvm"),
@@ -89,7 +92,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("lib", "jsMain", "libJsPlatformUtil.kt"),
+            incrementalPath = resolvePath("lib", "jsMain", "UsedInAppJsAndLibTests.kt").addPrivateVal(),
             executedTasks = setOf(":app:compileKotlinJs", ":lib:compileKotlinJs"),
         )
 
@@ -97,7 +100,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() {
          * Step 8: touch lib:native, no abi change
          */
 
-        touchAndGet("lib", "nativeMain", "libNativePlatformUtil.kt")
+        resolvePath("lib", "nativeMain", "UsedInAppNativeAndLibTests.kt").addPrivateVal()
         testCase(
             incrementalPath = null,
             executedTasks = setOf(":app:compileKotlinNative", ":lib:compileKotlinNative"),

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

@@ -46,7 +46,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("lib", "commonMain", "CommonUtil.kt"),
+            incrementalPath = resolvePath("lib", "commonMain", "UsedInLibPlatformTests.kt").addPrivateVal(),
             executedTasks = mainCompileTasks,
         )
 
@@ -55,7 +55,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("app", "commonMain", "PlainPublicClass.kt"),
+            incrementalPath = resolvePath("app", "commonMain", "Unused.kt").addPrivateVal(),
             executedTasks = setOf(
                 ":app:compileTestKotlinJvm",
                 ":app:compileTestKotlinNative",
@@ -70,7 +70,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() {
          * Step 3 - touch app/jvm, affect jvm tests in app
          */
 
-        val touchedAppJvm = touchAndGet("app", "jvmMain", "PlainPublicClassJvm.kt")
+        val touchedAppJvm = resolvePath("app", "jvmMain", "UnusedJvm.kt").addPrivateVal()
         testCase(
             incrementalPath = null,
             executedTasks = setOf(
@@ -86,7 +86,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() {
          */
 
         testCase(
-            incrementalPath = touchAndGet("app", "jsMain", "PlainPublicClassJs.kt"),
+            incrementalPath = resolvePath("app", "jsMain", "UnusedJs.kt").addPrivateVal(),
             executedTasks = setOf(
                 ":app:compileTestKotlinJs",
                 ":app:jsTest",
@@ -97,7 +97,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() {
          * Step 5 - touch app/native, affect native tests in app
          */
 
-        touchAndGet("app", "nativeMain", "PlainPublicClassNative.kt")
+        resolvePath("app", "nativeMain", "UnusedNative.kt").addPrivateVal()
         testCase(
             incrementalPath = null,
             executedTasks = setOf(

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

@@ -33,9 +33,9 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() {
             build("assemble")
 
             listOf(
-                kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"),
+                kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"),
-                kotlinSourcesDir("nativeMain").resolve("FooNative.kt"),
+                kotlinSourcesDir("nativeMain").resolve("ActualFunFoo.kt"),
-                kotlinSourcesDir("jsMain").resolve("FooJs.kt")
+                kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt")
             ).forEach {
                 it.replaceFirst("\"foo", "\"bar")
             }
@@ -44,9 +44,9 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() {
                 assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
                 assertIncrementalCompilation(
                     listOf(
-                        kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"),
+                        kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"),
-                        kotlinSourcesDir("jsMain").resolve("FooJs.kt"),
+                        kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt"),
-                        kotlinSourcesDir("commonMain").resolve("Foo.kt")
+                        kotlinSourcesDir("commonMain").resolve("ExpectFunFoo.kt")
                     ).relativizeTo(projectPath)
                 )
             }
@@ -59,8 +59,8 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() {
         nativeProject("expect-actual-fun-or-class-ic", gradleVersion) {
             build("assemble")
 
-            val valueKtPath = kotlinSourcesDir("commonMain").resolve("Value.kt")
+            val unusedKtPath = kotlinSourcesDir("commonMain").resolve("Unused.kt")
-            valueKtPath.replaceFirst(
+            unusedKtPath.replaceFirst(
                 "val secret = 1",
                 "val secret = \"k2\""
             )
@@ -69,10 +69,10 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() {
                 assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
                 assertIncrementalCompilation(
                     listOf(
-                        kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"),
+                        kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"),
-                        kotlinSourcesDir("jsMain").resolve("FooJs.kt"),
+                        kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt"),
-                        kotlinSourcesDir("commonMain").resolve("Foo.kt"),
+                        kotlinSourcesDir("commonMain").resolve("ExpectFunFoo.kt"),
-                        valueKtPath
+                        unusedKtPath
                     ).relativizeTo(projectPath)
                 )
             }
@@ -85,13 +85,17 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() {
         nativeProject("expect-actual-fun-or-class-ic", gradleVersion) {
             build("assemble")
 
-            kotlinSourcesDir("commonMain").resolve("Bar.kt").appendText("val irrelevant = 2")
+            kotlinSourcesDir("commonMain").resolve("ExpectClassBar.kt").appendText("val irrelevant = 2")
 
             build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
                 assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")
-                assertIncrementalCompilation(listOf("commonMain", "jvmMain", "jsMain").map { sourceSet ->
+                assertIncrementalCompilation(
-                    kotlinSourcesDir(sourceSet).resolve("Bar.kt")
+                    listOf(
-                }.relativizeTo(projectPath))
+                        kotlinSourcesDir("jvmMain").resolve("ActualClassBar.kt"),
+                        kotlinSourcesDir("jsMain").resolve("ActualClassBar.kt"),
+                        kotlinSourcesDir("commonMain").resolve("ExpectClassBar.kt")
+                    ).relativizeTo(projectPath)
+                )
             }
         }
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/build.gradle.kts

@@ -4,14 +4,10 @@ plugins {
 
 kotlin {
     jvm()
-    js()
+    js() {
-    <SingleNativeTarget>("native")
-}
-
-kotlin {
-    js {
         nodejs()
     }
+    <SingleNativeTarget>("native")
 
     sourceSets {
         val commonMain by getting {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/CommonUtils.kt

@@ -1 +0,0 @@
-fun sayYes() = "Yes"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/DependsOnLibCommon.kt

@@ -0,0 +1,3 @@
+fun appCommonFunDependingOnLibCommon() {
+    println("you're ${libCommonFunForAppCommon()} years old!")
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDeclaration.kt

@@ -0,0 +1,3 @@
+expect class ExpectActualDetail {
+    val key: String
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDetail.kt

@@ -1,3 +0,0 @@
-expect class Detail {
-    val key: String
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/PlainPublicClass.kt

@@ -1,3 +0,0 @@
-class PlainPublicClass {
-    fun bar() = 234
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/Unused.kt

@@ -0,0 +1,3 @@
+class AppCommonUnusedClass {
+    fun bar() = 234
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/UsedInPlatformMainAndCommonTest.kt

@@ -0,0 +1 @@
+fun appCommonFunForAppPlatformAndAppCommonTest() = "Yes"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TestDependsOnAppCommon.kt

@@ -1,10 +1,10 @@
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class TrivialTest {
+class AppCommonTest {
 
     @Test
     fun sayYesSaysYes() {
-        assertEquals("Yes", sayYes())
+        assertEquals("Yes", appCommonFunForAppPlatformAndAppCommonTest())
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDeclaration.kt

@@ -1,3 +1,3 @@
-actual class Detail {
+actual class ExpectActualDetail {
     actual val key: String = "42"
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnAppCommon.kt

@@ -0,0 +1,3 @@
+class AppJsUnusedClassWithDependencies {
+    val line = appCommonFunForAppPlatformAndAppCommonTest()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibCommon.kt

@@ -0,0 +1,3 @@
+class AppJsUnusedChildClass(length: Int, builder: String) : LibCommonClassForAppPlatform(length, builder) {
+    fun price() = length * builder.length * 300
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibJs.kt

@@ -0,0 +1 @@
+fun appJsUseLibJsPlatformUtil() = libJsPlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/PlainPublicClassJs.kt

@@ -1,3 +0,0 @@
-class PlainPublicClassJs {
-    fun foo() = 234
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/UnusedJs.kt

@@ -0,0 +1,3 @@
+class AppJsUnusedClass {
+    fun foo() = 234
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/useLibJsPlatformUtil.kt

@@ -1 +0,0 @@
-fun useLibJsPlatformUtil() = libJsPlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDeclaration.kt

@@ -1,3 +1,3 @@
-actual class Detail {
+actual class ExpectActualDetail {
     actual val key: String = "422"
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnAppCommon.kt

@@ -0,0 +1,3 @@
+class AppJvmUnusedClassWithDependencies {
+    val line = appCommonFunForAppPlatformAndAppCommonTest()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibCommon.kt

@@ -0,0 +1,3 @@
+class AppJvmUnusedChildClass(length: Int, builder: String) : LibCommonClassForAppPlatform(length, builder) {
+    fun price() = length * builder.length * 300
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibJvm.kt

@@ -0,0 +1 @@
+fun appJvmUseLibJvmPlatformUtil() = libJvmPlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/PlainPublicClassJvm.kt

@@ -1,3 +0,0 @@
-class PlainPublicClassJvm {
-    fun doBar() = 2
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/UnusedJvm.kt

@@ -0,0 +1,3 @@
+class AppJvmUnusedClass {
+    fun doBar() = 2
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/useLibJvmPlatformUtil.kt

@@ -1 +0,0 @@
-fun useLibJvmPlatformUtil() = libJvmPlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDeclaration.kt

@@ -1,3 +1,3 @@
-actual class Detail {
+actual class ExpectActualDetail {
     actual val key: String = "definitely not ios"
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnAppCommon.kt

@@ -0,0 +1,3 @@
+class AppNativeUnusedClassWithDependencies {
+    val line = appCommonFunForAppPlatformAndAppCommonTest()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibCommon.kt

@@ -0,0 +1,3 @@
+class AppNativeUnusedChildClass(length: Int, builder: String) : LibCommonClassForAppPlatform(length, builder) {
+    fun price() = length * builder.length * 300
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibNative.kt

@@ -0,0 +1 @@
+fun appNativeUseLibNativePlatformUtil() = libNativePlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/UnusedNative.kt

@@ -1,3 +1,3 @@
-class PlainPublicClassNative {
+class AppNativeUnusedClass {
     fun queueSomething() = Unit
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/useLibNativePlatformUtil.kt

@@ -1 +0,0 @@
-fun useLibNativePlatformUtil() = libNativePlatformUtil()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/build.gradle.kts

@@ -4,14 +4,10 @@ plugins {
 
 kotlin {
     jvm()
-    js()
+    js() {
-    <SingleNativeTarget>("native")
-}
-
-kotlin {
-    js {
         nodejs()
     }
+    <SingleNativeTarget>("native")
 
     sourceSets {
         val commonTest by getting {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/CommonUtil.kt

@@ -1,3 +0,0 @@
-fun multiplyByTwo(n: Int): Int {
-    return n * 2
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/ExpectCalcFun.kt

@@ -1 +1 @@
-expect fun calc(expression: String): Double
+expect fun expectActualCalc(expression: String): Double

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Unused.kt

@@ -0,0 +1 @@
+private val libCommonUnusedVal = 12

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppCommon.kt

@@ -0,0 +1 @@
+fun libCommonFunForAppCommon() = Double.NaN

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppPlatform.kt

@@ -0,0 +1,5 @@
+open class LibCommonClassForAppPlatform(
+    val length: Int,
+    val builder: String,
+) {
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInLibPlatformTests.kt

@@ -0,0 +1,3 @@
+fun libCommonFunForLibPlatformTests(n: Int): Int {
+    return n * 2
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Value.kt

@@ -1 +0,0 @@
-private val bar = 12

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/ActualCalcFun.kt

@@ -1,3 +1,3 @@
-actual fun calc(expression: String): Double {
+actual fun expectActualCalc(expression: String): Double {
     return Double.NaN
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt

@@ -1,7 +1,7 @@
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class AdvancedTest {
+class LibJsTest {
 
     @Test
     fun jsUtilReturns0() {
@@ -10,6 +10,6 @@ class AdvancedTest {
 
     @Test
     fun commonUtilTest() {
-        assertEquals(2, multiplyByTwo(1))
+        assertEquals(2, libCommonFunForLibPlatformTests(1))
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/ActualCalcFun.kt

@@ -1,3 +1,3 @@
-actual fun calc(expression: String): Double {
+actual fun expectActualCalc(expression: String): Double {
     return expression.toDoubleOrNull()?.let { it * 2 } ?: 0.0
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt

@@ -1,7 +1,7 @@
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class AdvancedTest {
+class LibJvmTest {
 
     @Test
     fun jvmUtilReturns400() {
@@ -10,6 +10,6 @@ class AdvancedTest {
 
     @Test
     fun commonUtilTest() {
-        assertEquals(2, multiplyByTwo(1))
+        assertEquals(2, libCommonFunForLibPlatformTests(1))
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/ActualCalcFun.kt

@@ -1,3 +1,3 @@
-actual fun calc(expression: String): Double {
+actual fun expectActualCalc(expression: String): Double {
     return 15.0
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt

@@ -1,7 +1,7 @@
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class AdvancedTest {
+class LibNativeTest {
 
     @Test
     fun nativeUtilReturns800() {
@@ -10,6 +10,6 @@ class AdvancedTest {
 
     @Test
     fun commonUtilTest() {
-        assertEquals(2, multiplyByTwo(1))
+        assertEquals(2, libCommonFunForLibPlatformTests(1))
     }
 }