deps: Update kotest to version 6.0.1

fviernau · fviernau · commit a153739c16a5 · 2025-08-28T09:00:18.000+02:00
Note that the module `kotest-framework-api` does not exist anymore, see [1], and the the module `kotest-framework-datatest` has been merged into `kotest-framework-engine`. But some functions of `kotest-framework-datatest` have been moved to `kotest-assertions-table`. [1]: kotest/kotest#4562 Signed-off-by: Frank Viernau <frank.viernau@gmail.com>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ jruby = "9.4.13.0"
 jslt = "0.1.14"
 jsonSchemaValidator = "1.5.8"
 kaml = "0.93.0"
-kotest = "5.9.1"
+kotest = "6.0.1"
 kotlinPoet = "2.2.0"
 kotlinxCoroutines = "1.10.2"
 kotlinxHtml = "0.12.0"
@@ -131,8 +131,8 @@ jslt = { module = "com.schibsted.spt.data:jslt", version.ref = "jslt" }
 jsonSchemaValidator = { module = "com.networknt:json-schema-validator", version.ref = "jsonSchemaValidator" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-assertions-json = { module = "io.kotest:kotest-assertions-json", version.ref = "kotest" }
+kotest-assertions-table = { module = "io.kotest:kotest-assertions-table", version.ref = "kotest" }
 kotest-extensions-junitXml = { module = "io.kotest:kotest-extensions-junitxml", version.ref = "kotest" }
-kotest-framework-api = { module = "io.kotest:kotest-framework-api", version.ref = "kotest" }
 kotest-framework-datatest = { module = "io.kotest:kotest-framework-datatest", version.ref = "kotest" }
 kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
diff --git a/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt b/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt
@@ -49,7 +49,7 @@ class PostgresProvenanceFileStorageFunTest : WordSpec({
     val postgresListener = PostgresListener()
     lateinit var storage: PostgresProvenanceFileStorage
 
-    register(postgresListener)
+    extension(postgresListener)
 
     beforeEach {
         storage = PostgresProvenanceFileStorage(postgresListener.dataSource, FileArchiverConfiguration.TABLE_NAME)
diff --git a/model/src/test/kotlin/CompatibilityDependencyNavigatorTest.kt b/model/src/test/kotlin/CompatibilityDependencyNavigatorTest.kt
@@ -19,7 +19,7 @@
 
 package org.ossreviewtoolkit.model
 
-import io.kotest.assertions.fail
+import io.kotest.assertions.AssertionErrorBuilder
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.matchers.sequences.shouldContainExactly
 import io.kotest.matchers.shouldBe
@@ -65,7 +65,7 @@ class CompatibilityDependencyNavigatorTest : WordSpec() {
                         navigator.graphNavigator shouldBe instanceOf<DependencyGraphNavigator>()
                     }
 
-                    else -> fail("Unexpected dependency navigator: $navigator.")
+                    else -> AssertionErrorBuilder.fail("Unexpected dependency navigator: $navigator.")
                 }
             }
 
diff --git a/model/src/test/kotlin/utils/DependencyGraphConverterTest.kt b/model/src/test/kotlin/utils/DependencyGraphConverterTest.kt
@@ -19,7 +19,7 @@
 
 package org.ossreviewtoolkit.model.utils
 
-import io.kotest.assertions.fail
+import io.kotest.assertions.AssertionErrorBuilder
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.inspectors.forAll
 import io.kotest.matchers.collections.beEmpty
@@ -226,5 +226,5 @@ private fun Project.createResult(): ProjectAnalyzerResult {
  */
 private fun AnalyzerResult.getProject(id: Identifier): Project {
     val project = projects.find { it.id == id }
-    return project ?: fail("Could not find project with ID $id.")
+    return project ?: AssertionErrorBuilder.fail("Could not find project with ID $id.")
 }
diff --git a/plugins/package-managers/carthage/src/test/kotlin/CarthageTest.kt b/plugins/package-managers/carthage/src/test/kotlin/CarthageTest.kt
@@ -20,10 +20,9 @@
 package org.ossreviewtoolkit.plugins.packagemanagers.carthage
 
 import io.kotest.assertions.throwables.shouldThrow
-import io.kotest.core.Tuple2
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.core.test.TestCase
-import io.kotest.core.test.TestResult
+import io.kotest.engine.test.TestResult
 import io.kotest.matchers.shouldBe
 
 import io.mockk.every
@@ -41,7 +40,7 @@ import org.ossreviewtoolkit.utils.test.USER_DIR
 class CarthageTest : WordSpec() {
     private val carthage = CarthageFactory.create()
 
-    override fun afterTest(f: suspend (Tuple2<TestCase, TestResult>) -> Unit) {
+    override suspend fun afterTest(testCase: TestCase, result: TestResult) {
         unmockkAll()
     }
 
diff --git a/plugins/package-managers/gradle-inspector/build.gradle.kts b/plugins/package-managers/gradle-inspector/build.gradle.kts
@@ -44,6 +44,8 @@ dependencies {
 
     funTestImplementation(projects.plugins.versionControlSystems.gitVersionControlSystem)
     funTestImplementation(testFixtures(projects.analyzer))
+
+    funTestImplementation(libs.kotest.assertions.table)
 }
 
 val processResources = tasks.named<Copy>("processResources") {
diff --git a/plugins/package-managers/gradle/build.gradle.kts b/plugins/package-managers/gradle/build.gradle.kts
@@ -41,6 +41,8 @@ dependencies {
     funTestImplementation(projects.plugins.versionControlSystems.gitVersionControlSystem)
     funTestImplementation(testFixtures(projects.analyzer))
 
+    funTestImplementation(libs.kotest.assertions.table)
+
     testImplementation(projects.utils.spdxUtils)
 
     testImplementation(libs.mockk)
diff --git a/plugins/scanners/fossid/src/test/kotlin/FossIdNamingProviderTest.kt b/plugins/scanners/fossid/src/test/kotlin/FossIdNamingProviderTest.kt
@@ -22,7 +22,7 @@ package org.ossreviewtoolkit.plugins.scanners.fossid
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.core.test.TestCase
-import io.kotest.core.test.TestResult
+import io.kotest.engine.test.TestResult
 import io.kotest.matchers.equals.shouldBeEqual
 import io.kotest.matchers.ints.shouldBeLessThanOrEqual
 
diff --git a/scanner/src/funTest/kotlin/provenance/AbstractNestedProvenanceStorageFunTest.kt b/scanner/src/funTest/kotlin/provenance/AbstractNestedProvenanceStorageFunTest.kt
@@ -34,7 +34,7 @@ abstract class AbstractNestedProvenanceStorageFunTest(vararg listeners: TestList
     protected abstract fun createStorage(): NestedProvenanceStorage
 
     init {
-        register(listeners.asList())
+        extensions(listeners.asList())
 
         beforeEach {
             storage = createStorage()
diff --git a/scanner/src/funTest/kotlin/provenance/AbstractPackageProvenanceStorageFunTest.kt b/scanner/src/funTest/kotlin/provenance/AbstractPackageProvenanceStorageFunTest.kt
@@ -40,7 +40,7 @@ abstract class AbstractPackageProvenanceStorageFunTest(vararg listeners: TestLis
     protected abstract fun createStorage(): PackageProvenanceStorage
 
     init {
-        register(listeners.asList())
+        extensions(listeners.asList())
 
         beforeEach {
             storage = createStorage()
diff --git a/scanner/src/funTest/kotlin/storages/AbstractPackageBasedScanStorageFunTest.kt b/scanner/src/funTest/kotlin/storages/AbstractPackageBasedScanStorageFunTest.kt
@@ -104,7 +104,7 @@ abstract class AbstractPackageBasedScanStorageFunTest(vararg listeners: TestList
     abstract fun createStorage(): AbstractPackageBasedScanStorage
 
     init {
-        register(listeners.asList())
+        extensions(listeners.asList())
 
         beforeEach {
             storage = createStorage()
diff --git a/scanner/src/funTest/kotlin/storages/AbstractProvenanceBasedScanStorageFunTest.kt b/scanner/src/funTest/kotlin/storages/AbstractProvenanceBasedScanStorageFunTest.kt
@@ -52,7 +52,7 @@ abstract class AbstractProvenanceBasedScanStorageFunTest(vararg listeners: TestL
     protected abstract fun createStorage(): ProvenanceBasedScanStorage
 
     init {
-        register(listeners.asList())
+        extensions(listeners.asList())
 
         beforeEach {
             storage = createStorage()
diff --git a/utils/common/src/funTest/kotlin/ArchiveUtilsFunTest.kt b/utils/common/src/funTest/kotlin/ArchiveUtilsFunTest.kt
@@ -46,7 +46,7 @@ class ArchiveUtilsFunTest : WordSpec() {
     private lateinit var outputDir: File
 
     override suspend fun beforeEach(testCase: TestCase) {
-        outputDir = tempdir(testCase.name.testName.replace(' ', '-'))
+        outputDir = tempdir(testCase.name.name.replace(' ', '-'))
     }
 
     init {
diff --git a/utils/ort/src/funTest/kotlin/storage/HttpFileStorageFunTest.kt b/utils/ort/src/funTest/kotlin/storage/HttpFileStorageFunTest.kt
@@ -27,7 +27,7 @@ import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.Spec
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.core.test.TestCase
-import io.kotest.core.test.TestResult
+import io.kotest.engine.test.TestResult
 import io.kotest.matchers.shouldBe
 
 import java.io.IOException
diff --git a/utils/ort/src/funTest/kotlin/storage/S3FileStorageFunTest.kt b/utils/ort/src/funTest/kotlin/storage/S3FileStorageFunTest.kt
@@ -28,7 +28,7 @@ import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.Spec
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.core.test.TestCase
-import io.kotest.core.test.TestResult
+import io.kotest.engine.test.TestResult
 import io.kotest.matchers.shouldBe
 
 import java.net.HttpURLConnection
diff --git a/utils/spdx/build.gradle.kts b/utils/spdx/build.gradle.kts
@@ -44,7 +44,7 @@ dependencies {
     implementation(libs.jackson.module.kotlin)
 
     testImplementation(libs.kotest.assertions.json)
-    testImplementation(libs.kotest.framework.datatest)
+    testImplementation(libs.kotest.framework.engine)
     testImplementation(projects.model)
 }
 
diff --git a/utils/test/build.gradle.kts b/utils/test/build.gradle.kts
@@ -27,7 +27,6 @@ dependencies {
     api(projects.plugins.versionControlSystems.gitVersionControlSystem)
 
     api(libs.kotest.assertions.core)
-    api(libs.kotest.framework.api)
     api(libs.logbackClassic) {
         because("Transitively export this to consumers so they do not have to declare a logger implementation.")
     }
diff --git a/utils/test/src/main/kotlin/Matchers.kt b/utils/test/src/main/kotlin/Matchers.kt
@@ -26,10 +26,10 @@ import com.networknt.schema.InputFormat as NetworkNtInputFormat
 import com.networknt.schema.JsonSchemaFactory
 import com.networknt.schema.SpecVersion
 
+import io.kotest.assertions.eq.EqMatcher
 import io.kotest.matchers.Matcher
 import io.kotest.matchers.MatcherResult
 import io.kotest.matchers.collections.beEmpty
-import io.kotest.matchers.equalityMatcher
 import io.kotest.matchers.neverNullMatcher
 
 import java.io.File
@@ -58,7 +58,7 @@ fun <T, U> transformingCollectionEmptyMatcher(transform: (T) -> Collection<U>):
 /**
  * A matcher for comparing to expected result files, in particular serialized [ProjectAnalyzerResult]s and [OrtResult]s,
  * that displays a unified diff with the given [contextSize] if the results do not match. If the Kotest system property
- * named "kotest.assertions.multi-line-diff" is set to "simple", this just falls back to [equalityMatcher].
+ * named "kotest.assertions.multi-line-diff" is set to "simple", this just falls back to [EqMatcher].
  */
 fun matchExpectedResult(
     expectedResultUrl: URL,
@@ -78,7 +78,7 @@ fun matchExpectedResult(
 /**
  * A matcher for comparing to expected result files, in particular serialized [ProjectAnalyzerResult]s and [OrtResult]s,
  * that displays a unified diff with the given [contextSize] if the results do not match. If the Kotest system property
- * named "kotest.assertions.multi-line-diff" is set to "simple", this just falls back to [equalityMatcher].
+ * named "kotest.assertions.multi-line-diff" is set to "simple", this just falls back to [EqMatcher].
  */
 fun matchExpectedResult(
     expectedResultFile: File,
@@ -89,7 +89,7 @@ fun matchExpectedResult(
     val expected = patchExpectedResult(expectedResultFile.readText(), definitionFile, custom)
 
     val multiLineDiff = System.getProperty("kotest.assertions.multi-line-diff")
-    if (multiLineDiff != "unified") return equalityMatcher(expected)
+    if (multiLineDiff != "unified") return EqMatcher(expected)
 
     return Matcher { actual ->
         val vcsDir = VersionControlSystem.forDirectory(expectedResultFile)!!
diff --git a/utils/test/src/main/kotlin/ProjectConfig.kt b/utils/test/src/main/kotlin/ProjectConfig.kt
@@ -34,7 +34,7 @@ class ProjectConfig : AbstractProjectConfig() {
         OrtProxySelector.install()
     }
 
-    override fun extensions() =
+    override val extensions =
         listOf(
             JunitXmlReporter(
                 includeContainers = false,
diff --git a/utils/test/src/main/resources/kotest.properties b/utils/test/src/main/resources/kotest.properties
@@ -15,7 +15,4 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-kotest.framework.classpath.scanning.autoscan.disable = true
-kotest.framework.classpath.scanning.config.disable = true
 kotest.framework.config.fqn = org.ossreviewtoolkit.utils.test.ProjectConfig
-kotest.framework.discovery.jar.scan.disable = true

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`package org.ossreviewtoolkit.model`
`21`	`21`
`22`		`-import io.kotest.assertions.fail`
	`22`	`+import io.kotest.assertions.AssertionErrorBuilder`
`23`	`23`	`import io.kotest.core.spec.style.WordSpec`
`24`	`24`	`import io.kotest.matchers.sequences.shouldContainExactly`
`25`	`25`	`import io.kotest.matchers.shouldBe`
`@@ -65,7 +65,7 @@ class CompatibilityDependencyNavigatorTest : WordSpec() {`
`65`	`65`	`navigator.graphNavigator shouldBe instanceOf<DependencyGraphNavigator>()`
`66`	`66`	`}`
`67`	`67`
`68`		`- else -> fail("Unexpected dependency navigator: $navigator.")`
	`68`	`+ else -> AssertionErrorBuilder.fail("Unexpected dependency navigator: $navigator.")`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ dependencies {`
`44`	`44`
`45`	`45`	`funTestImplementation(projects.plugins.versionControlSystems.gitVersionControlSystem)`
`46`	`46`	`funTestImplementation(testFixtures(projects.analyzer))`
	`47`	`+`
	`48`	`+ funTestImplementation(libs.kotest.assertions.table)`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`val processResources = tasks.named<Copy>("processResources") {`