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

Gradle, tests runner: use OperationIdentifier object as id (not long)

Browse Source 
#KT-31448 Fixed
#KT-30691 Fixed
This commit is contained in:
Sergey Rostov
2019-06-09 16:26:05 +03:00
parent 991e60c9e4
commit 84b87a22e6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt
+7 -4
View File
@@ -32,12 +32,12 @@ internal open class TCServiceMessagesClient(
val settings: TCServiceMessagesClientSettings, val settings: TCServiceMessagesClientSettings,
val log: Logger val log: Logger
) : ServiceMessageParserCallback { ) : ServiceMessageParserCallback {
lateinit var rootOperationId: Any lateinit var rootOperationId: OperationIdentifier
inline fun root(operation: OperationIdentifier, actions: () -> Unit) { inline fun root(operation: OperationIdentifier, actions: () -> Unit) {
rootOperationId = operation.id rootOperationId = operation
RootNode(operation.id).open { RootNode(operation).open {
actions() actions()
} }
} }
@@ -351,10 +351,12 @@ internal open class TCServiceMessagesClient(
abstract fun requireReportingNode(): TestDescriptorInternal abstract fun requireReportingNode(): TestDescriptorInternal
} }
inner class RootNode(val ownerBuildOperationId: Any) : GroupNode(null, settings.rootNodeName) { inner class RootNode(val ownerBuildOperationId: OperationIdentifier) : GroupNode(null, settings.rootNodeName) {
override val descriptor: TestDescriptorInternal = object : DefaultTestSuiteDescriptor(settings.rootNodeName, localId) { override val descriptor: TestDescriptorInternal = object : DefaultTestSuiteDescriptor(settings.rootNodeName, localId) {
override fun getOwnerBuildOperationId(): Any? = this@RootNode.ownerBuildOperationId override fun getOwnerBuildOperationId(): Any? = this@RootNode.ownerBuildOperationId
override fun getParent(): TestDescriptorInternal? = null override fun getParent(): TestDescriptorInternal? = null
override fun isRoot(): Boolean = true
override fun toString(): String = name
} }
override fun requireReportingNode(): TestDescriptorInternal = descriptor override fun requireReportingNode(): TestDescriptorInternal = descriptor
@@ -401,6 +403,7 @@ internal open class TCServiceMessagesClient(
override fun getDisplayName(): String = fullNameWithoutRoot override fun getDisplayName(): String = fullNameWithoutRoot
override fun getOwnerBuildOperationId(): Any? = rootOperationId override fun getOwnerBuildOperationId(): Any? = rootOperationId
override fun getParent(): TestDescriptorInternal = reportingParent.descriptor override fun getParent(): TestDescriptorInternal = reportingParent.descriptor
override fun toString(): String = displayName
} }
shouldReportComplete = true shouldReportComplete = true