alright, digger tests now run in both js and jvm mode

robertfmurdock · Oct 3, 2024 · 9266316 · 9266316
1 parent 6401862
commit 9266316
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 62 deletions.
diff --git a/...gger-cli/src/commonTest/kotlin/com/zegreatrob/tools/digger/cli/AllContributionDataTest.kt b/...gger-cli/src/commonTest/kotlin/com/zegreatrob/tools/digger/cli/AllContributionDataTest.kt
@@ -1,28 +1,21 @@
 package com.zegreatrob.tools.digger.cli
 
 import com.github.ajalt.clikt.testing.test
-import com.zegreatrob.tools.cli.createTempDirectory
 import com.zegreatrob.tools.cli.readFromFile
-import com.zegreatrob.tools.cli.removeDirectory
 import com.zegreatrob.tools.digger.AllContributionTestSpec
+import kotlin.test.BeforeTest
 
 class AllContributionDataTest : AllContributionTestSpec {
 
     override lateinit var projectDir: String
 
     override val addFileNames: Set<String> = emptySet()
-    private lateinit var outputFile: String
     private lateinit var arguments: List<String>
+    private val outputFile: String get() = "$projectDir/temp-file.json"
 
-    @kotlin.test.BeforeTest
+    @BeforeTest
     fun setup() {
-        projectDir = createTempDirectory()
         arguments = emptyList()
-        outputFile = "$projectDir/temp-file.json"
-    }
-
-    fun tearDown() {
-        removeDirectory(projectDir)
     }
 
     override fun setupWithDefaults() {

diff --git a/...-cli/src/commonTest/kotlin/com/zegreatrob/tools/digger/cli/CurrentContributionDataTest.kt b/...-cli/src/commonTest/kotlin/com/zegreatrob/tools/digger/cli/CurrentContributionDataTest.kt
@@ -1,33 +1,23 @@
 package com.zegreatrob.tools.digger.cli
 
 import com.github.ajalt.clikt.testing.test
-import com.zegreatrob.tools.cli.createTempDirectory
 import com.zegreatrob.tools.cli.readFromFile
-import com.zegreatrob.tools.cli.removeDirectory
 import com.zegreatrob.tools.digger.CurrentContributionTestSpec
 import kotlin.test.BeforeTest
 import kotlin.test.assertEquals
 
 class CurrentContributionDataTest : CurrentContributionTestSpec {
 
     override lateinit var projectDir: String
-
-    private lateinit var outputFile: String
-
+    private val outputFile: String get() = "$projectDir/temp-file.json"
     override val addFileNames: Set<String> = emptySet()
-
     private lateinit var arguments: List<String>
 
     @BeforeTest
     fun setup() {
-        projectDir = createTempDirectory()
         arguments = emptyList()
-        outputFile = "$projectDir/temp-file.json"
     }
 
-    fun tearDown() {
-        removeDirectory(projectDir)
-    }
     override fun setupWithDefaults() {
         arguments += "--output-file=$outputFile"
         arguments += projectDir

diff --git a/tools/digger-plugin/build.gradle.kts b/tools/digger-plugin/build.gradle.kts
@@ -53,8 +53,10 @@ tasks {
         dependsOn(testing.suites.named("functionalTest"))
     }
     publish { finalizedBy("::closeAndReleaseSonatypeStagingRepository") }
-    named<Test>("test") {
+    withType(Test::class) {
         useJUnitPlatform()
+        environment("GIT_CONFIG_GLOBAL", "/dev/null")
+        environment("GIT_CONFIG_SYSTEM", "/dev/null")
     }
     formatKotlinMain {
         exclude { spec -> spec.file.absolutePath.contains("generated-sources") }

diff --git a/...in/src/functionalTest/kotlin/com/zegreatrob/tools/digger/AllContributionFunctionalTest.kt b/...in/src/functionalTest/kotlin/com/zegreatrob/tools/digger/AllContributionFunctionalTest.kt
@@ -1,24 +1,28 @@
 package com.zegreatrob.tools.digger
 
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.jupiter.api.io.TempDir
 import java.io.File
 
 class AllContributionFunctionalTest : AllContributionTestSpec {
-    @field:TempDir
-    override lateinit var projectDir: File
+    override lateinit var projectDir: String
 
-    private val buildFile by lazy { projectDir.resolve("build.gradle.kts") }
-    private val allOutput by lazy { projectDir.resolve("build/digger/all.json") }
-    private val settingsFile by lazy { projectDir.resolve("settings.gradle") }
-    private val ignoreFile by lazy { projectDir.resolve(".gitignore") }
+    private val buildFile by lazy { "$projectDir/build.gradle.kts" }
+    private val allOutput by lazy { "$projectDir/build/digger/all.json" }
+    private val settingsFile by lazy { "$projectDir/settings.gradle" }
+    private val ignoreFile by lazy { "$projectDir/.gitignore" }
 
-    override val addFileNames by lazy { setOf(settingsFile.name, buildFile.name, ignoreFile.name) }
+    override val addFileNames by lazy {
+        setOf(
+            settingsFile.split("/").last(),
+            buildFile.split("/").last(),
+            ignoreFile.split("/").last(),
+        )
+    }
 
     override fun setupWithDefaults() {
-        settingsFile.writeText("")
-        ignoreFile.writeText(".gradle")
-        buildFile.writeText(
+        File(settingsFile).writeText("")
+        File(ignoreFile).writeText(".gradle")
+        File(buildFile).writeText(
             """
             plugins {
                 id("com.zegreatrob.tools.digger")
@@ -37,9 +41,9 @@ class AllContributionFunctionalTest : AllContributionTestSpec {
         easeRegex: String?,
         tagRegex: String?,
     ) {
-        settingsFile.writeText("")
-        ignoreFile.writeText(".gradle")
-        buildFile.writeText(
+        File(settingsFile).writeText("")
+        File(ignoreFile).writeText(".gradle")
+        File(buildFile).writeText(
             """
             plugins {
                 id("com.zegreatrob.tools.digger")
@@ -63,8 +67,8 @@ class AllContributionFunctionalTest : AllContributionTestSpec {
             .forwardOutput()
             .withPluginClasspath()
             .withArguments("allContributionData", "-q")
-            .withProjectDir(projectDir)
+            .withProjectDir(File(projectDir))
             .build()
-        return allOutput.readText()
+        return File(allOutput).readText()
     }
 }
diff --git a/...rc/functionalTest/kotlin/com/zegreatrob/tools/digger/CurrentContributionFunctionalTest.kt b/...rc/functionalTest/kotlin/com/zegreatrob/tools/digger/CurrentContributionFunctionalTest.kt
@@ -1,23 +1,27 @@
 package com.zegreatrob.tools.digger
 
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.jupiter.api.io.TempDir
 import java.io.File
 
 class CurrentContributionFunctionalTest : CurrentContributionTestSpec {
-    @field:TempDir
-    override lateinit var projectDir: File
+    override lateinit var projectDir: String
 
-    private val buildFile by lazy { projectDir.resolve("build.gradle.kts") }
-    private val settingsFile by lazy { projectDir.resolve("settings.gradle") }
-    private val ignoreFile by lazy { projectDir.resolve(".gitignore") }
+    private val buildFile by lazy { "$projectDir/build.gradle.kts" }
+    private val settingsFile by lazy { "$projectDir/settings.gradle" }
+    private val ignoreFile by lazy { "$projectDir/.gitignore" }
 
-    override val addFileNames by lazy { setOf(settingsFile.name, buildFile.name, ignoreFile.name) }
+    override val addFileNames by lazy {
+        setOf(
+            settingsFile.split("/").last(),
+            buildFile.split("/").last(),
+            ignoreFile.split("/").last(),
+        )
+    }
 
     override fun setupWithDefaults() {
-        settingsFile.writeText("")
-        ignoreFile.writeText(".gradle")
-        buildFile.writeText(
+        File(settingsFile).writeText("")
+        File(ignoreFile).writeText(".gradle")
+        File(buildFile).writeText(
             """
             plugins {
                 id("com.zegreatrob.tools.digger")
@@ -36,9 +40,9 @@ class CurrentContributionFunctionalTest : CurrentContributionTestSpec {
         easeRegex: String?,
         tagRegex: String?,
     ) {
-        settingsFile.writeText("")
-        ignoreFile.writeText(".gradle")
-        buildFile.writeText(
+        File(settingsFile).writeText("")
+        File(ignoreFile).writeText(".gradle")
+        File(buildFile).writeText(
             """
             plugins {
                 id("com.zegreatrob.tools.digger")
@@ -58,13 +62,13 @@ class CurrentContributionFunctionalTest : CurrentContributionTestSpec {
     }
 
     override fun runCurrentContributionData(): String {
-        val currentOutput by lazy { projectDir.resolve("build/digger/current.json") }
+        val currentOutput by lazy { "$projectDir/build/digger/current.json" }
         GradleRunner.create()
             .forwardOutput()
             .withPluginClasspath()
             .withArguments("currentContributionData", "-q")
-            .withProjectDir(projectDir)
+            .withProjectDir(File(projectDir))
             .build()
-        return currentOutput.readText()
+        return File(currentOutput).readText()
     }
 }
diff --git a/tools/digger-test/build.gradle.kts b/tools/digger-test/build.gradle.kts
@@ -3,7 +3,9 @@ plugins {
 }
 
 kotlin {
-    jvm { withJava() }
+    jvm {
+        withJava()
+    }
     js(IR) { nodejs() }
 }
 
@@ -16,5 +18,10 @@ dependencies {
     "jvmMainImplementation"(kotlin("test-junit5", embeddedKotlinVersion))
     "jvmMainImplementation"("org.junit.jupiter:junit-jupiter-api")
     "jvmMainImplementation"("org.junit.jupiter:junit-jupiter-engine")
+}
 
+tasks {
+    withType(Test::class) {
+        useJUnitPlatform()
+    }
 }
diff --git a/.../digger-test/src/commonMain/kotlin/com/zegreatrob/tools/digger/AllContributionTestSpec.kt b/.../digger-test/src/commonMain/kotlin/com/zegreatrob/tools/digger/AllContributionTestSpec.kt
@@ -5,13 +5,16 @@ import com.zegreatrob.tools.adapter.git.TagRef
 import com.zegreatrob.tools.digger.model.Contribution
 import com.zegreatrob.tools.test.git.addCommitWithMessage
 import com.zegreatrob.tools.test.git.addTag
+import com.zegreatrob.tools.test.git.createTempDirectory
 import com.zegreatrob.tools.test.git.defaultAuthors
 import com.zegreatrob.tools.test.git.delayLongEnoughToAffectGitDate
 import com.zegreatrob.tools.test.git.ffOnlyInBranch
 import com.zegreatrob.tools.test.git.initializeGitRepo
 import com.zegreatrob.tools.test.git.mergeInBranch
+import com.zegreatrob.tools.test.git.removeDirectory
 import com.zegreatrob.tools.test.git.switchToNewBranch
 import kotlinx.coroutines.test.runTest
+import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -27,6 +30,15 @@ interface AllContributionTestSpec : SetupWithOverrides {
         commits = commits,
     )
 
+    @BeforeTest
+    fun setupProjectDir() {
+        projectDir = createTempDirectory()
+    }
+
+    fun tearDown() {
+        removeDirectory(projectDir)
+    }
+
     @Test
     fun willIncludeAllTagSegments() {
         setupWithDefaults()

diff --git a/...ger-test/src/commonMain/kotlin/com/zegreatrob/tools/digger/CurrentContributionTestSpec.kt b/...ger-test/src/commonMain/kotlin/com/zegreatrob/tools/digger/CurrentContributionTestSpec.kt
@@ -6,11 +6,13 @@ import com.zegreatrob.tools.digger.json.ContributionParser.parseContribution
 import com.zegreatrob.tools.digger.model.Contribution
 import com.zegreatrob.tools.test.git.addCommitWithMessage
 import com.zegreatrob.tools.test.git.addTag
+import com.zegreatrob.tools.test.git.createTempDirectory
 import com.zegreatrob.tools.test.git.defaultAuthors
 import com.zegreatrob.tools.test.git.delayLongEnoughToAffectGitDate
 import com.zegreatrob.tools.test.git.getEnvironmentVariable
 import com.zegreatrob.tools.test.git.initializeGitRepo
 import com.zegreatrob.tools.test.git.mergeInBranch
+import com.zegreatrob.tools.test.git.removeDirectory
 import com.zegreatrob.tools.test.git.sleep
 import com.zegreatrob.tools.test.git.switchToNewBranch
 import kotlinx.coroutines.test.runTest
@@ -25,6 +27,15 @@ interface CurrentContributionTestSpec : SetupWithOverrides {
     fun setupWithDefaults()
     fun runCurrentContributionData(): String
 
+    @BeforeTest
+    fun setupProjectDir() {
+        projectDir = createTempDirectory()
+    }
+
+    fun tearDown() {
+        removeDirectory(projectDir)
+    }
+
     @BeforeTest
     fun checkPrerequisites() {
         assertEquals(

diff --git a/tools/git-adapter/src/jvmTest/kotlin/com/zegreatrob/tools/adapter/git/GitAdapterTest.kt b/tools/git-adapter/src/jvmTest/kotlin/com/zegreatrob/tools/adapter/git/GitAdapterTest.kt
@@ -3,6 +3,7 @@ package com.zegreatrob.tools.adapter.git
 import com.zegreatrob.tools.test.git.addCommitWithMessage
 import com.zegreatrob.tools.test.git.delayLongEnoughToAffectGitDate
 import com.zegreatrob.tools.test.git.initializeGitRepo
+import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.io.TempDir
 import java.io.File
@@ -27,7 +28,7 @@ class GitAdapterTest {
     )
 
     @Test
-    fun `will include all tag segments from newest to oldest`() {
+    fun `will include all tag segments from newest to oldest`() = runTest {
         val gitAdapter = initializeGitRepo(commits = listOf("here's a message"))
         gitAdapter.config("user.name", "Test")
         gitAdapter.config("user.email", "Test")

diff --git a/...greatrob/tools/cli/CreateTempDirectory.kt → ...rob/tools/test/git/CreateTempDirectory.kt b/...greatrob/tools/cli/CreateTempDirectory.kt → ...rob/tools/test/git/CreateTempDirectory.kt
@@ -1,3 +1,3 @@
-package com.zegreatrob.tools.cli
+package com.zegreatrob.tools.test.git
 
 expect fun createTempDirectory(): String
diff --git a/...m/zegreatrob/tools/cli/RemoveDirectory.kt → ...reatrob/tools/test/git/RemoveDirectory.kt b/...m/zegreatrob/tools/cli/RemoveDirectory.kt → ...reatrob/tools/test/git/RemoveDirectory.kt
@@ -1,3 +1,3 @@
-package com.zegreatrob.tools.cli
+package com.zegreatrob.tools.test.git
 
 expect fun removeDirectory(directoryPath: String)
diff --git a/...atrob/tools/cli/CreateTempDirectory.js.kt → .../tools/test/git/CreateTempDirectory.js.kt b/...atrob/tools/cli/CreateTempDirectory.js.kt → .../tools/test/git/CreateTempDirectory.js.kt
@@ -1,4 +1,4 @@
-package com.zegreatrob.tools.cli
+package com.zegreatrob.tools.test.git
 
 private val fs = js("require('node:fs')")
 private val path = js("require('node:path')")

diff --git a/...egreatrob/tools/cli/RemoveDirectory.js.kt → ...trob/tools/test/git/RemoveDirectory.js.kt b/...egreatrob/tools/cli/RemoveDirectory.js.kt → ...trob/tools/test/git/RemoveDirectory.js.kt
@@ -1,4 +1,4 @@
-package com.zegreatrob.tools.cli
+package com.zegreatrob.tools.test.git
 
 import kotlin.js.json
 

diff --git a/...trob/tools/cli/CreateTempDirectory.jvm.kt → ...tools/test/git/CreateTempDirectory.jvm.kt b/...trob/tools/cli/CreateTempDirectory.jvm.kt → ...tools/test/git/CreateTempDirectory.jvm.kt
@@ -1,4 +1,4 @@
-package com.zegreatrob.tools.cli
+package com.zegreatrob.tools.test.git
 
 import java.nio.file.Files
 import kotlin.io.path.absolutePathString

diff --git a/...greatrob/tools/cli/RemoveDirectory.jvm.kt → ...rob/tools/test/git/RemoveDirectory.jvm.kt b/...greatrob/tools/cli/RemoveDirectory.jvm.kt → ...rob/tools/test/git/RemoveDirectory.jvm.kt
@@ -1,4 +1,4 @@
-package com.zegreatrob.tools.cli
+package com.zegreatrob.tools.test.git
 
 import java.nio.file.Files
 import java.nio.file.Paths