From 5e27428bc677cc596028821633b5b00827918bb2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jul 2026 06:18:57 +0000 Subject: [PATCH 1/2] Update dependency io.kotest:kotest-assertions-core-jvm to v6 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a9edd0c..93d930c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ clikt = "5.1.0" gradle-api = "8.11.1" junit-jupiter = "5.11.4" kctfork = "0.7.1" -kotest = "4.6.4" +kotest = "6.2.1" kotlin = "2.2.0" kotlinx-serialization = "1.11.0" lombok = "1.18.46" From 4a2ad9f17d1a0da3f5105f1b9719da9e22af91b9 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 2 Jul 2026 10:10:28 +0200 Subject: [PATCH 2/2] Simplify kotest assertions with shouldContainAll --- .../scip_java/kotlinc/test/AnalyzerTest.kt | 52 ++++++------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt index 35c16bb3..36e94ad5 100644 --- a/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt +++ b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt @@ -3,10 +3,8 @@ package org.scip_code.scip_java.kotlinc.test import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.PluginOption import com.tschuchort.compiletesting.SourceFile -import io.kotest.assertions.assertSoftly import io.kotest.assertions.fail -import io.kotest.assertions.withClue -import io.kotest.matchers.collections.shouldContain +import io.kotest.matchers.collections.shouldContainAll import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe import java.io.File @@ -103,9 +101,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) val symbols = arrayOf( @@ -120,7 +116,7 @@ class AnalyzerTest { signatureText = "public final fun foo(): Unit" }, ) - assertSoftly(document.symbolsList) { withClue(this) { symbols.forEach(::shouldContain) } } + document.symbolsList.shouldContainAll(*symbols) } @Test @@ -189,9 +185,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) } @Test @@ -279,9 +273,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) val symbols = arrayOf( @@ -306,7 +298,7 @@ class AnalyzerTest { signatureText = "public final fun localClassMethod(): Unit" }, ) - assertSoftly(document.symbolsList) { withClue(this) { symbols.forEach(::shouldContain) } } + document.symbolsList.shouldContainAll(*symbols) } @Test @@ -412,9 +404,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) val symbols = arrayOf( @@ -441,7 +431,7 @@ class AnalyzerTest { addOverriddenSymbols("sample/Interface#foo().") }, ) - assertSoftly(document.symbolsList) { withClue(this) { symbols.forEach(::shouldContain) } } + document.symbolsList.shouldContainAll(*symbols) } @Test @@ -627,9 +617,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) val symbols = arrayOf( @@ -663,7 +651,7 @@ class AnalyzerTest { addOverriddenSymbols("sample/Interface#foo().") }, ) - assertSoftly(document.symbolsList) { withClue(this) { symbols.forEach(::shouldContain) } } + document.symbolsList.shouldContainAll(*symbols) } @Test @@ -732,9 +720,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) } @Test @@ -777,9 +763,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) } @Test @@ -1310,9 +1294,7 @@ class AnalyzerTest { }, ) - assertSoftly(document.occurrencesList) { - withClue(document.occurrencesList) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) val symbols = arrayOf( @@ -1323,7 +1305,7 @@ class AnalyzerTest { } ) - assertSoftly(document.symbolsList) { withClue(this) { symbols.forEach(::shouldContain) } } + document.symbolsList.shouldContainAll(*symbols) } @Test @@ -1397,9 +1379,7 @@ class AnalyzerTest { } }, ) - assertSoftly(document.occurrencesList) { - withClue(this) { occurrences.forEach(::shouldContain) } - } + document.occurrencesList.shouldContainAll(*occurrences) val symbols = arrayOf( @@ -1414,7 +1394,7 @@ class AnalyzerTest { signatureText = "public final fun foo(): Unit" }, ) - assertSoftly(document.symbolsList) { withClue(this) { symbols.forEach(::shouldContain) } } + document.symbolsList.shouldContainAll(*symbols) } @Test