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

Fix class name for test suite descriptor.

Browse Source 
Issue #KT-36725 Fixed
Issue #KT-36716 Fixed
Issue #KT-36726 Fixed
This commit is contained in:
Konstantin Tskhovrebov
2020-02-19 18:02:32 +03:00
parent 1dbb3d7c0f
commit 018cfc7df6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy
+1 -1
View File
@@ -17,7 +17,7 @@ class KotlinMppTestLogger {
xml.event(type: testEventType) { xml.event(type: testEventType) {
test(id: testDescriptor.id, parentId: testDescriptor.parent?.id ?: '') { test(id: testDescriptor.id, parentId: testDescriptor.parent?.id ?: '') {
if (testDescriptor) { if (testDescriptor) {
descriptor(name: testDescriptor.displayName ?: '', className: testDescriptor.classDisplayName ?: '') descriptor(name: testDescriptor.displayName ?: '', className: testDescriptor.className ?: '')
} }
if (testEvent) { if (testEvent) {
def message = escapeCdata(testEvent.message) def message = escapeCdata(testEvent.message)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt
+1
View File
@@ -432,6 +432,7 @@ internal open class TCServiceMessagesClient(
descriptor = object : DefaultTestSuiteDescriptor(id, fullName) { descriptor = object : DefaultTestSuiteDescriptor(id, fullName) {
override fun getDisplayName(): String = fullNameWithoutRoot override fun getDisplayName(): String = fullNameWithoutRoot
override fun getClassName(): 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 override fun toString(): String = displayName