azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix running inner classes from console

Browse Source 
#KT-24961 Fixed
This commit is contained in:
Nikolay Krasko
2018-06-20 15:27:42 +03:00
parent cd91cffdeb
commit 35fdfc9f05
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/tasks.kt
+9 -2
View File
@@ -30,7 +30,8 @@ import java.lang.Character.isUpperCase
fun Project.projectTest(taskName: String = "test", body: Test.() -> Unit = {}): Test = getOrCreateTask(taskName) { fun Project.projectTest(taskName: String = "test", body: Test.() -> Unit = {}): Test = getOrCreateTask(taskName) {
doFirst { doFirst {
val patterns = filter.includePatterns + ((filter as? DefaultTestFilter)?.commandLineIncludePatterns ?: emptySet()) val commandLineIncludePatterns = (filter as? DefaultTestFilter)?.commandLineIncludePatterns ?: emptySet()
val patterns = filter.includePatterns + commandLineIncludePatterns
if (patterns.isEmpty() || patterns.any { '*' in it }) return@doFirst if (patterns.isEmpty() || patterns.any { '*' in it }) return@doFirst
patterns.forEach { pattern -> patterns.forEach { pattern ->
var isClassPattern = false var isClassPattern = false
@@ -50,7 +51,13 @@ fun Project.projectTest(taskName: String = "test", body: Test.() -> Unit = {}):
val classFileName = "$classFileNameWithoutExtension.class" val classFileName = "$classFileNameWithoutExtension.class"
if (isClassPattern) { if (isClassPattern) {
filter.includePatterns.add("$pattern$*") val innerClassPattern = "$pattern$*"
if (pattern in commandLineIncludePatterns) {
commandLineIncludePatterns.add(innerClassPattern)
(filter as? DefaultTestFilter)?.setCommandLineIncludePatterns(commandLineIncludePatterns)
} else {
filter.includePatterns.add(innerClassPattern)
}
} }
include { include {