[patch] fixing teardown in digger tests

robertfmurdock · Oct 4, 2024 · 40a1874 · 40a1874
1 parent 1b21f60
commit 40a1874
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/command-line-tools/gradle.properties b/command-line-tools/gradle.properties
@@ -0,0 +1,9 @@
+kotlin.code.style=official
+kotlin.tests.individualTaskReports=true
+org.gradle.caching=true
+org.gradle.jvmargs=-Xmx3g
+org.gradle.parallel=true
+org.gradle.configuration-cache.problems=warn
+org.gradle.configuration-cache=true
+org.gradle.configureondemand=false
+org.gradle.kotlin.dsl.allWarningsAsErrors=true
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
@@ -14,6 +14,7 @@ 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.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -35,6 +36,7 @@ interface AllContributionTestSpec : SetupWithOverrides {
         projectDir = createTempDirectory()
     }
 
+    @AfterTest
     fun tearDown() {
         removeDirectory(projectDir)
     }

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
@@ -16,6 +16,7 @@ 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
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -32,6 +33,7 @@ interface CurrentContributionTestSpec : SetupWithOverrides {
         projectDir = createTempDirectory()
     }
 
+    @AfterTest
     fun tearDown() {
         removeDirectory(projectDir)
     }

diff --git a/tools/tagger-test/src/commonMain/kotlin/com/zegreatrob/tools/tagger/TagTestSpec.kt b/tools/tagger-test/src/commonMain/kotlin/com/zegreatrob/tools/tagger/TagTestSpec.kt
@@ -26,6 +26,11 @@ interface TagTestSpec {
         projectDir = createTempDirectory()
     }
 
+    @AfterTest
+    fun deleteProjectDir() {
+        removeDirectory(projectDir)
+    }
+
     @BeforeTest
     fun checkPrerequisites() {
         assertEquals(
@@ -40,11 +45,6 @@ interface TagTestSpec {
         )
     }
 
-    @AfterTest
-    fun deleteProjectDir() {
-        removeDirectory(projectDir)
-    }
-
     fun initializeGitRepo(
         commits: List<String>,
         initialTag: String? = null,