Migrate DeterministicBuildIT tests into new test dsl.

^KT-45745 In Progress

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

@@ -5,21 +5,26 @@
 
 package org.jetbrains.kotlin.gradle
 
+import org.gradle.util.GradleVersion
+import org.jetbrains.kotlin.gradle.testbase.*
 import org.jetbrains.kotlin.gradle.util.allJavaFiles
-import org.junit.Test
+import org.junit.jupiter.api.DisplayName
 import java.io.File
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.writeText
 import kotlin.test.assertEquals
 
-/** Tests that the outputs of a build are deterministic. */
+@DisplayName("Tests that the outputs of a build are deterministic")
-class DeterministicBuildIT : BaseGradleIT() {
+@SimpleGradlePluginTests
+@OptIn(ExperimentalPathApi::class)
+class DeterministicBuildIT : KGPBaseTest() {
 
-    @Test
+    @DisplayName("Kapt generate stubs task - KT-40882")
-    fun `test KaptGenerateStubsTask - KT-40882`() = with(
+    @GradleTest
-        Project("simple", directoryPrefix = "kapt2")
+    fun testKaptGenerateStubsTask(gradleVersion: GradleVersion) {
-    ) {
+        project("kapt2/simple", gradleVersion) {
-        setupWorkingDir()
+            javaSourcesDir()
-        projectDir
+                .resolve("Foo.kt")
-            .resolve("src/main/java/Foo.kt")
                 .writeText(
                     """
                     class Foo : Bar {
@@ -33,8 +38,8 @@ class DeterministicBuildIT : BaseGradleIT() {
                     }
                     """.trimIndent()
                 )
-        projectDir
+            javaSourcesDir()
-            .resolve("src/main/java/Bar.kt")
+                .resolve("Bar.kt")
                 .writeText(
                     """
                     interface Bar {
@@ -48,24 +53,28 @@ class DeterministicBuildIT : BaseGradleIT() {
                     """.trimIndent()
                 )
 
-        val buildAndSnapshotStubFiles: () -> Map<File, String> = {
+            fun TestProject.buildAndSnapshotStubFiles(): Map<File, String> {
                 lateinit var stubFiles: Map<File, String>
                 build(":kaptGenerateStubsKotlin") {
-                assertSuccessful()
                     assertTasksExecuted(":kaptGenerateStubsKotlin")
-                stubFiles = fileInWorkingDir("build/tmp/kapt3/stubs").allJavaFiles().map {
+                    stubFiles = projectPath
-                    it to it.readText()
+                        .resolve("build/tmp/kapt3/stubs")
-                }.toMap()
+                        .toFile()
+                        .allJavaFiles()
+                        .associateWith {
+                            it.readText()
                         }
-            stubFiles
+                }
+                return stubFiles
             }
 
             // Run the first build
             val stubFilesAfterFirstBuild = buildAndSnapshotStubFiles()
 
             // Make a change
-        projectDir.resolve("src/main/java/Foo.kt").also {
+            javaSourcesDir()
-            it.writeText(
+                .resolve("Foo.kt")
+                .writeText(
                     """
                     class Foo : Bar {
                         val fooField1 = 1
@@ -77,7 +86,6 @@ class DeterministicBuildIT : BaseGradleIT() {
                     }
                     """.trimIndent()
                 )
-        }
 
             // Run the second build
             val stubFilesAfterSecondBuild = buildAndSnapshotStubFiles()
@@ -91,3 +99,4 @@ class DeterministicBuildIT : BaseGradleIT() {
             }
         }
     }
+}