diff --git a/kotest-framework/kotest-framework-engine/src/jvmTest/kotlin/com/sksamuel/kotest/engine/test/timeout/ContainerTimeoutTest.kt b/kotest-framework/kotest-framework-engine/src/jvmTest/kotlin/com/sksamuel/kotest/engine/test/timeout/ContainerTimeoutTest.kt index 02d2c4532a0..b582c8c9b85 100644 --- a/kotest-framework/kotest-framework-engine/src/jvmTest/kotlin/com/sksamuel/kotest/engine/test/timeout/ContainerTimeoutTest.kt +++ b/kotest-framework/kotest-framework-engine/src/jvmTest/kotlin/com/sksamuel/kotest/engine/test/timeout/ContainerTimeoutTest.kt @@ -18,7 +18,7 @@ class ContainerTimeoutTest : FunSpec() { .launch() collector.tests.keys.map { it.name.testName }.toSet() shouldBe setOf("a") collector.tests.values.map { it.errorOrNull?.message }.toSet() shouldBe setOf( - "Test 'a' did not complete within 10ms", + "Test 'a' did not complete within 100ms", ) } } diff --git a/kotest-runner/kotest-runner-junit5/src/jvmMain/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilter.kt b/kotest-runner/kotest-runner-junit5/src/jvmMain/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilter.kt index 7438eaa4d4a..ff78903f595 100644 --- a/kotest-runner/kotest-runner-junit5/src/jvmMain/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilter.kt +++ b/kotest-runner/kotest-runner-junit5/src/jvmMain/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilter.kt @@ -14,7 +14,7 @@ class GradleClassMethodRegexTestFilter(private val patterns: List) : Tes logger.log { Pair(descriptor.toString(), "Testing against $patterns") } return when { patterns.isEmpty() -> TestFilterResult.Include - patterns.all { match(it, descriptor) } -> TestFilterResult.Include + patterns.any { match(it, descriptor) } -> TestFilterResult.Include else -> TestFilterResult.Exclude(null) } } diff --git a/kotest-runner/kotest-runner-junit5/src/jvmTest/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilterTest.kt b/kotest-runner/kotest-runner-junit5/src/jvmTest/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilterTest.kt index 51bbb829ecb..fc1e54ae091 100644 --- a/kotest-runner/kotest-runner-junit5/src/jvmTest/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilterTest.kt +++ b/kotest-runner/kotest-runner-junit5/src/jvmTest/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilterTest.kt @@ -43,22 +43,22 @@ class GradleClassMethodRegexTestFilterTest : FunSpec({ val test = container.append("nested test") withData( - nameFn = { filters -> "should be INCLUDED when evaluating $filters" }, + nameFn = { filters -> "should be INCLUDED if any of the filters matches when evaluating $filters" }, listOf("\\Qio.kotest.runner.junit.platform.gradle\\E"), listOf("\\Qio.kotest.runner.junit.platform.gradle.\\E.*"), listOf(".*\\Qnner.junit.platform.gradle\\E"), listOf(".*\\Qnner.junit.platform.gradle.\\E.*"), listOf(".*\\Q.junit.platform.gradle\\E"), listOf("\\Qio.kotest.runner.junit.platform.gra\\E.*"), - listOf("\\Qio.kotest.runner.junit\\E"), + listOf(".*\\QNotSpec\\E", "\\Qio.kotest.runner.junit\\E"), ) { filters -> GradleClassMethodRegexTestFilter(filters).filter(spec) shouldBe TestFilterResult.Include } withData( - nameFn = { filters -> "should be EXCLUDED when evaluating $filters" }, + nameFn = { filters -> "should be EXCLUDED if none of the filters matches when evaluating $filters" }, listOf("\\Qio.kotest.runner.junit2\\E"), - listOf("\\Qio.kotest.runner.junit\\E", ".*\\QSpec\\E"), + listOf("\\Qio.kotest.runner.junit2\\E", ".*\\QNotSpec\\E"), ) { filters -> GradleClassMethodRegexTestFilter(filters).filter(spec) shouldBe TestFilterResult.Exclude(null) }