fix CompositeBuildExampleTest

Kotlin · Sep 5, 2024 · 21aa530 · 21aa530
1 parent 7830483
commit 21aa530
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/...egration-tests/gradle-examples/src/testCompositeBuild/kotlin/CompositeBuildExampleTest.kt b/...egration-tests/gradle-examples/src/testCompositeBuild/kotlin/CompositeBuildExampleTest.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
-package dev.adamko.dokkatoo.tests.examples
+package org.jetbrains.dokka.it.gradle.examples
 
 import io.kotest.assertions.withClue
 import io.kotest.matchers.shouldBe
@@ -19,7 +19,12 @@ import kotlin.io.path.*
 
 class CompositeBuildExampleTest {
 
-    val exampleProject = initProject(projectTestTempDir)
+    private val exampleProject = initProject(projectTestTempDir)
+
+    @Test
+    fun `check name`() {
+        exampleProjectDir.name shouldBe "composite-build-example"
+    }
 
     @Nested
     @DisplayName("verify generated HTML")
@@ -30,7 +35,6 @@ class CompositeBuildExampleTest {
                 .addArguments(
                     "clean",
                     ":build",
-                    "--stacktrace",
                 )
                 .forwardOutput()
                 .build {
@@ -145,7 +149,7 @@ class CompositeBuildExampleTest {
         ): GradleProjectTest {
 
             return GradleProjectTest(destinationDir).apply {
-                projectDir.deleteRecursively()
+                //projectDir.deleteRecursively()
                 exampleProjectDir.copyToRecursively(projectDir, overwrite = true, followLinks = false)
 
                 gradleProperties {

diff --git a/dokka-runners/dokka-gradle-plugin/src/testFixtures/kotlin/gradleRunnerUtils.kt b/dokka-runners/dokka-gradle-plugin/src/testFixtures/kotlin/gradleRunnerUtils.kt
@@ -38,34 +38,6 @@ inline fun GradleRunner.buildAndFail(
 
 fun GradleRunner.updateGradleProperties(
     arguments: GradleProjectTest.GradleProperties,
-): GradleRunner {
-    val gradlePropertiesFile = projectDir.resolve("gradle.properties").apply {
-        if (!exists()) {
-            parentFile.mkdirs()
-            createNewFile()
-        }
-    }
-
-    val gradleProperties = Properties()
-        .loadFile(gradlePropertiesFile)
-        .entries.associate { it.key.toString() to it.value.toString() }.toMutableMap()
-
-    arguments.toGradleProperties().forEach { (k, v) ->
-        gradleProperties[k] = v
-    }
-
-    gradlePropertiesFile.writeText(
-        gradleProperties
-            .entries
-            .sortedBy { it.key }
-            .joinToString("\n", postfix = "\n") { (k, v) -> "$k=$v" }
-    )
-
-    return this
-}
-
-fun GradleRunner.updateGradlePropertiesV2(
-    arguments: GradleProjectTest.GradleProperties,
 ): GradleRunner {
     projectDir.walk()
         .filter { it.name == "settings.gradle.kts" || it.name == "settings.gradle" }