0.6.1

JesusMcCloud · JesusMcCloud · commit f51c4c7d30e0 · 2025-12-02T17:46:15.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 0.x
 
+### 0.6.1
+* Add missing TestExecutionScope to data-driven test leaves
 
 ### 0.6.0 Breaking FreeSpec Fixture Generation
 * Support fixture generation for suites in addition to tests
diff --git a/datatest/src/commonMain/kotlin/at/asitplus/test/Data.kt b/datatest/src/commonMain/kotlin/at/asitplus/test/Data.kt
@@ -2,6 +2,7 @@ package at.asitplus.testballoon
 
 import at.asitplus.catchingUnwrapped
 import de.infix.testBalloon.framework.core.TestConfig
+import de.infix.testBalloon.framework.core.TestExecutionScope
 import de.infix.testBalloon.framework.core.TestSuite
 
 /**
@@ -56,7 +57,7 @@ internal fun <Data> TestSuite.withDataInternal(
     compact: Boolean,
     maxLength: Int,
     displayNameMaxLength: Int,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) {
     if (compact) {
         val (compactName, map) = map.peekTypeNameAndReplay { it.second }
diff --git a/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.iterable.kt b/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.iterable.kt
@@ -1,6 +1,7 @@
 package at.asitplus.testballoon
 
 import de.infix.testBalloon.framework.core.TestConfig
+import de.infix.testBalloon.framework.core.TestExecutionScope
 import de.infix.testBalloon.framework.core.TestSuite
 
 
@@ -17,7 +18,7 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(
     data.asSequence().map { it.toPrettyString() to it },
     testConfig,
@@ -47,7 +48,7 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(
     data.asSequence().map { nameFn(it) to it },
     testConfig,
diff --git a/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.map.kt b/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.map.kt
@@ -1,6 +1,7 @@
 package at.asitplus.testballoon
 
 import de.infix.testBalloon.framework.core.TestConfig
+import de.infix.testBalloon.framework.core.TestExecutionScope
 import de.infix.testBalloon.framework.core.TestSuite
 
 
@@ -21,7 +22,7 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(
     map.asSequence().map { (k, v) -> k to v },
     testConfig,
diff --git a/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.seuqence.kt b/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.seuqence.kt
@@ -1,6 +1,7 @@
 package at.asitplus.testballoon
 
 import de.infix.testBalloon.framework.core.TestConfig
+import de.infix.testBalloon.framework.core.TestExecutionScope
 import de.infix.testBalloon.framework.core.TestSuite
 
 
@@ -20,7 +21,7 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(data.map { it.toPrettyString() to it }, testConfig, compact, maxLength, displayNameMaxLength, action)
 
 /**
@@ -42,6 +43,6 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(data.map { nameFn(it) to it }, testConfig, compact, maxLength, displayNameMaxLength, action)
 
diff --git a/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.vararg.kt b/datatest/src/commonMain/kotlin/at/asitplus/test/Terminal.vararg.kt
@@ -1,6 +1,7 @@
 package at.asitplus.testballoon
 
 import de.infix.testBalloon.framework.core.TestConfig
+import de.infix.testBalloon.framework.core.TestExecutionScope
 import de.infix.testBalloon.framework.core.TestSuite
 
 /**
@@ -21,7 +22,7 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(
     parameters.asSequence().map { it.toPrettyString() to it },
     testConfig,
@@ -52,7 +53,7 @@ fun <Data> TestSuite.withData(
     maxLength: Int = DataTest.defaultTestNameMaxLength,
     displayNameMaxLength: Int = DataTest.defaultDisplayNameMaxLength,
     testConfig: TestConfig = TestConfig,
-    action: suspend (Data) -> Unit
+    action: suspend TestExecutionScope.(Data) -> Unit
 ) = withDataInternal(
     parameters.asSequence().map { nameFn(it) to it },
     testConfig,
diff --git a/datatest/src/commonTest/kotlin/DataTest.kt b/datatest/src/commonTest/kotlin/DataTest.kt
@@ -17,6 +17,7 @@ val aDataDrivenSuite by testSuite {
         withData(number.toString(), "one",null, null, null, "two", "three", "four", compact = true) { word ->
             number shouldBe number
             word shouldBe "three"
+
         }
     }
 
diff --git a/freespec/src/commonMain/kotlin/at/asitplus/test/FreeSpec.kt b/freespec/src/commonMain/kotlin/at/asitplus/test/FreeSpec.kt
@@ -61,8 +61,8 @@ operator fun String.invoke(
  */
 data class ConfiguredSuite(
     val parent: TestSuite,
-     val maxLength: Int = FreeSpec.defaultTestNameMaxLength,
-     val displayNameMaxLength: Int = FreeSpec.defaultDisplayNameMaxLength,
+    val maxLength: Int = FreeSpec.defaultTestNameMaxLength,
+    val displayNameMaxLength: Int = FreeSpec.defaultDisplayNameMaxLength,
     val displayName: String,
     val testName: String,
     val config: TestConfig
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx10g -Dfile.encoding=UTF-8 -Xms200m
 kotlin.daemon.jvm.options=-Xmx10G -Xms200m
 kotlin.daemon.jvmargs=-Xmx10g -Xms200m
-artifactVersion = 0.6.0
+artifactVersion = 0.6.1
 jdk.version=17
 android.minSdk=21
 android.compileSdk=34

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ val aDataDrivenSuite by testSuite {`
`17`	`17`	`withData(number.toString(), "one",null, null, null, "two", "three", "four", compact = true) { word ->`
`18`	`18`	`number shouldBe number`
`19`	`19`	`word shouldBe "three"`
	`20`	`+`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`