From 0037e74d3e20a0497da8c3b6c5e6883c85c18c87 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 28 Nov 2019 15:51:16 +0300 Subject: [PATCH] [Gradle, JS] Fix StartsWith filter --- .../tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts b/libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts index ef4fcb70098..d727205987e 100644 --- a/libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts +++ b/libraries/tools/kotlin-test-js-runner/src/KotlinTestsFilter.ts @@ -49,7 +49,7 @@ export function runWithFilter( path.push(name); try { - if (path.length > 1 && everyOfJsOrJavaNames((value) => !filter.mayContainTestsFromSuite(value))) + if (path.length > 0 && everyOfJsOrJavaNames((value) => !filter.mayContainTestsFromSuite(value))) return; runner.suite(name, isIgnored, fn); @@ -105,12 +105,11 @@ export class StartsWithFilter implements KotlinTestsFilter { } isPrefixMatched(fqn: string): boolean { - console.error("fqn", fqn); - return startsWith(fqn + ".", this.prefix); + return startsWith(this.prefix, fqn) + || startsWith(fqn, this.prefix); } mayContainTestsFromSuite(fqn: string): boolean { - console.error("Prefix", this.prefix); return this.isPrefixMatched(fqn); }