From cb115a40886e17902ba7daa8903f074218dc4091 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Wed, 15 Dec 2021 11:45:05 +0300
Subject: [PATCH] [Build] Extract DefaultTestFilter.commandLineIncludePatterns
 as a property of Test

---
 buildSrc/src/main/kotlin/tasks.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
index 2e1bf40cd12..75e3e3a15c2 100644
--- a/buildSrc/src/main/kotlin/tasks.kt
+++ b/buildSrc/src/main/kotlin/tasks.kt
@@ -115,7 +115,7 @@ fun Project.projectTest(
         doFirst {
             if (jUnitMode == JUnitMode.JUnit5) return@doFirst
 
-            val commandLineIncludePatterns = (filter as? DefaultTestFilter)?.commandLineIncludePatterns?.toMutableList() ?: mutableSetOf()
+            val commandLineIncludePatterns = commandLineIncludePatterns.toMutableSet()
             val patterns = filter.includePatterns + commandLineIncludePatterns
             if (patterns.isEmpty() || patterns.any { '*' in it }) return@doFirst
             patterns.forEach { pattern ->
@@ -232,6 +232,9 @@ fun Project.projectTest(
     }.apply { configure(body) }
 }
 
+val Test.commandLineIncludePatterns: Set<String>
+    get() = (filter as? DefaultTestFilter)?.commandLineIncludePatterns.orEmpty()
+
 private inline fun String.isFirstChar(f: (Char) -> Boolean) = isNotEmpty() && f(first())
 
 inline fun <reified T : Task> Project.getOrCreateTask(taskName: String, noinline body: T.() -> Unit): TaskProvider<T> =