update to kotest 6

hauner · hauner · commit 7db6a53027a7 · 2025-09-05T20:24:23.000+02:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -45,9 +45,9 @@ slf4j = "org.slf4j:slf4j-api:2.0.17"
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
-kotest-bom = "io.kotest:kotest-bom:5.9.1"
+kotest-bom = "io.kotest:kotest-bom:6.0.2"
 kotest-runner = { module = "io.kotest:kotest-runner-junit5" }
-kotest-datatest = { module = "io.kotest:kotest-framework-datatest" }
+kotest-table = { module = "io.kotest:kotest-assertions-table" }
 mockk = "io.mockk:mockk:1.14.5"
 
 diff-utils = "io.github.java-diff-utils:java-diff-utils:4.16"
diff --git a/openapi-processor-core-parser-api/build.gradle.kts b/openapi-processor-core-parser-api/build.gradle.kts
@@ -17,6 +17,5 @@ publishing {
 dependencies {
     testImplementation (platform(libs.kotest.bom))
     testImplementation (libs.kotest.runner)
-    testImplementation (libs.kotest.datatest)
     testImplementation (libs.mockk)
 }
diff --git a/openapi-processor-core-parser-openapi4j/build.gradle.kts b/openapi-processor-core-parser-openapi4j/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
     testImplementation (project(":openapi-processor-test"))
     testImplementation (platform(libs.kotest.bom))
     testImplementation (libs.kotest.runner)
-    testImplementation (libs.kotest.datatest)
     testImplementation (libs.mockk)
     testImplementation (libs.jimfs)
     testImplementation (libs.logback)
diff --git a/openapi-processor-core-parser-swagger/build.gradle.kts b/openapi-processor-core-parser-swagger/build.gradle.kts
@@ -19,7 +19,6 @@ dependencies {
     testImplementation (project(":openapi-processor-test"))
     testImplementation (platform(libs.kotest.bom))
     testImplementation (libs.kotest.runner)
-    testImplementation (libs.kotest.datatest)
     testImplementation (libs.mockk)
     testImplementation (libs.logback)
 
diff --git a/openapi-processor-core/build.gradle.kts b/openapi-processor-core/build.gradle.kts
@@ -95,7 +95,7 @@ dependencies {
     testImplementation (platform(libs.groovy.bom))
     testImplementation (platform(libs.kotest.bom))
     testImplementation (libs.kotest.runner)
-    testImplementation (libs.kotest.datatest)
+    testImplementation (libs.kotest.table)
     testImplementation (libs.mockk)
     testImplementation (libs.spock)
     testImplementation (libs.logback)
@@ -112,7 +112,7 @@ dependencies {
     testIntImplementation (platform(libs.groovy.bom))
     testIntImplementation (platform(libs.kotest.bom))
     testIntImplementation (libs.kotest.runner)
-    testIntImplementation (libs.kotest.datatest)
+    testIntImplementation (libs.kotest.table)
     testIntImplementation (libs.mockk)
     testIntImplementation (libs.spock)
     testIntImplementation (libs.logback)
diff --git a/openapi-processor-core/src/test/kotlin/io/kotest/provided/ProjectConfig.kt b/openapi-processor-core/src/test/kotlin/io/kotest/provided/ProjectConfig.kt
@@ -3,13 +3,13 @@
  * PDX-License-Identifier: Apache-2.0
  */
 
-package io.openapiprocessor.core
+package io.kotest.provided
 
 import io.kotest.core.Tag
-import io.kotest.core.TagExpression
 import io.kotest.core.TestConfiguration
 import io.kotest.core.config.AbstractProjectConfig
 import io.kotest.core.extensions.TagExtension
+import io.kotest.engine.tags.TagExpression
 import io.openapiprocessor.core.support.deleteRecursively
 import java.nio.file.Files
 import java.nio.file.Path
@@ -20,7 +20,6 @@ object NotWindows: Tag()
 object SystemTagExtension: TagExtension {
 
     override fun tags(): TagExpression {
-
         return if(isWindows()) {
             TagExpression.exclude(NotWindows)
         } else {
@@ -38,8 +37,8 @@ object SystemTagExtension: TagExtension {
 /**
  * kotest config
  */
-object KotestConfig: AbstractProjectConfig() {
-    override fun extensions() = listOf(SystemTagExtension)
+object ProjectConfig: AbstractProjectConfig() {
+    override val extensions = listOf(SystemTagExtension)
 }
 
 
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/model/datatypes/MappedDataTypeSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/model/datatypes/MappedDataTypeSpec.kt
@@ -5,12 +5,12 @@
 
 package io.openapiprocessor.core.model.datatypes
 
-import io.kotest.core.spec.style.StringSpec
+import io.kotest.core.spec.style.FreeSpec
 import io.kotest.datatest.withData
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.converter.mapping.TargetType
 
-class MappedDataTypeSpec: StringSpec ({
+class MappedDataTypeSpec: FreeSpec({
     class TypeName (val generics: List<String>, val typeName: String)
 
     withData(
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterTypeSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterTypeSpec.kt
@@ -2,8 +2,8 @@ package io.openapiprocessor.core.processor.mapping.v2
 
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FreeSpec
-import io.kotest.datatest.WithDataTestName
 import io.kotest.datatest.withData
+import io.kotest.engine.names.WithDataTestName
 import io.kotest.matchers.collections.shouldBeEmpty
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.maps.shouldBeEmpty
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/PathSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/PathSpec.kt
@@ -20,8 +20,8 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.data.forAll
 import io.kotest.data.row
 import io.kotest.matchers.shouldBe
-import io.openapiprocessor.core.NotWindows
-import io.openapiprocessor.core.Windows
+import io.kotest.provided.NotWindows
+import io.kotest.provided.Windows
 
 class PathSpec: StringSpec({
 
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/UriSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/UriSpec.kt
@@ -9,8 +9,8 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.data.forAll
 import io.kotest.data.row
 import io.kotest.matchers.shouldBe
-import io.openapiprocessor.core.NotWindows
-import io.openapiprocessor.core.Windows
+import io.kotest.provided.NotWindows
+import io.kotest.provided.Windows
 import java.nio.file.Paths
 
 class UriSpec: StringSpec({
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/DefaultWriterFactorySpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/DefaultWriterFactorySpec.kt
@@ -9,10 +9,10 @@ import io.kotest.assertions.throwables.shouldNotThrowAny
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
+import io.kotest.provided.tempFolder
 import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.converter.options.TargetDirLayout
 import io.openapiprocessor.core.support.text
-import io.openapiprocessor.core.tempFolder
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/ApiWriterSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/ApiWriterSpec.kt
@@ -8,6 +8,7 @@ package io.openapiprocessor.core.writer.java
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.equals.shouldBeEqual
+import io.kotest.provided.tempFolder
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
@@ -18,7 +19,6 @@ import io.openapiprocessor.core.model.Api
 import io.openapiprocessor.core.model.DataTypes
 import io.openapiprocessor.core.model.Resource
 import io.openapiprocessor.core.model.datatypes.*
-import io.openapiprocessor.core.tempFolder
 import io.openapiprocessor.core.writer.SourceFormatter
 import io.openapiprocessor.core.writer.WriterFactory
 import java.io.File
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/BeanValidationSupportedTypesSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/BeanValidationSupportedTypesSpec.kt
@@ -6,8 +6,8 @@
 package io.openapiprocessor.core.writer.java
 
 import io.kotest.core.spec.style.FreeSpec
-import io.kotest.datatest.WithDataTestName
 import io.kotest.datatest.withData
+import io.kotest.engine.names.WithDataTestName
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.model.datatypes.*
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/JavaDocWriterSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/JavaDocWriterSpec.kt
@@ -5,7 +5,7 @@
 
 package io.openapiprocessor.core.writer.java
 
-import io.kotest.core.spec.style.StringSpec
+import io.kotest.core.spec.style.FreeSpec
 import io.kotest.datatest.withData
 import io.kotest.matchers.equals.shouldBeEqual
 import io.kotest.matchers.shouldBe
@@ -22,7 +22,7 @@ import io.openapiprocessor.core.support.datatypes.propertyDataTypeString
 import io.openapiprocessor.core.support.parseApi
 import io.openapiprocessor.core.support.parseOptions
 
-class JavaDocWriterSpec: StringSpec({
+class JavaDocWriterSpec: FreeSpec({
 
     lateinit var writer: JavaDocWriter
 
diff --git a/openapi-processor-core/src/test/resources/kotest.properties b/openapi-processor-core/src/test/resources/kotest.properties
@@ -1,3 +1,3 @@
 kotest.framework.classpath.scanning.config.disable=true
 kotest.framework.classpath.scanning.autoscan.disable=true
-kotest.framework.config.fqn=io.openapiprocessor.core.KotestConfig
+kotest.framework.config.fqn=io.kotest.provided.ProjectConfig

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,5 @@ publishing {`
`17`	`17`	`dependencies {`
`18`	`18`	`testImplementation (platform(libs.kotest.bom))`
`19`	`19`	`testImplementation (libs.kotest.runner)`
`20`		`- testImplementation (libs.kotest.datatest)`
`21`	`20`	`testImplementation (libs.mockk)`
`22`	`21`	`}`