From 018cfc7df6cd08453e6e93e17737db7a85e0b4a0 Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Wed, 19 Feb 2020 18:02:32 +0300 Subject: [PATCH] Fix class name for test suite descriptor. Issue #KT-36725 Fixed Issue #KT-36716 Fixed Issue #KT-36726 Fixed --- .../kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy | 2 +- .../kotlin/gradle/internal/testing/TCServiceMessagesClient.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy b/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy index d4d64c7bfdd..67c5d003c6f 100644 --- a/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy +++ b/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy @@ -17,7 +17,7 @@ class KotlinMppTestLogger { xml.event(type: testEventType) { test(id: testDescriptor.id, parentId: testDescriptor.parent?.id ?: '') { if (testDescriptor) { - descriptor(name: testDescriptor.displayName ?: '', className: testDescriptor.classDisplayName ?: '') + descriptor(name: testDescriptor.displayName ?: '', className: testDescriptor.className ?: '') } if (testEvent) { def message = escapeCdata(testEvent.message) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt index 5136ff6eee4..fb76ed8a24f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt @@ -432,6 +432,7 @@ internal open class TCServiceMessagesClient( descriptor = object : DefaultTestSuiteDescriptor(id, fullName) { override fun getDisplayName(): String = fullNameWithoutRoot + override fun getClassName(): String? = fullNameWithoutRoot override fun getOwnerBuildOperationId(): Any? = rootOperationId override fun getParent(): TestDescriptorInternal = reportingParent.descriptor override fun toString(): String = displayName