diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt index 051a1c1a9a4..7acd5f399a2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.internal.testing import org.gradle.api.internal.tasks.testing.* +import org.gradle.api.tasks.testing.TestFailure import org.gradle.api.tasks.testing.TestOutputEvent class RecordingTestResultProcessor : TestResultProcessor { @@ -34,8 +35,8 @@ class RecordingTestResultProcessor : TestResultProcessor { line("${event.destination}[${event.message}] // $testId") } - override fun failure(testId: Any, result: Throwable) { - line("FAILURE $result // $testId") + override fun failure(testId: Any?, result: TestFailure?) { + line("FAILURE ${result?.rawFailure} // $testId") } override fun completed(testId: Any, event: TestCompleteEvent) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/tcsmc/TCServiceMessagesClientTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/tcsmc/TCServiceMessagesClientTest.kt index 13f31d87429..9a10b21d816 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/tcsmc/TCServiceMessagesClientTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/tcsmc/TCServiceMessagesClientTest.kt @@ -2,6 +2,7 @@ package org.jetbrains.kotlin.gradle.internal.testing.tcsmc import jetbrains.buildServer.messages.serviceMessages.ServiceMessage import org.gradle.api.internal.tasks.testing.TestResultProcessor +import org.gradle.api.tasks.testing.TestFailure import org.gradle.internal.operations.OperationIdentifier import org.jetbrains.kotlin.gradle.internal.testing.RecordingTestResultProcessor import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient @@ -44,7 +45,14 @@ open class TCServiceMessagesClientTest { LoggerFactory.getLogger("test"), object : MppTestReportHelper { override fun reportFailure(results: TestResultProcessor, id: Any, failure: KotlinTestFailure, isAssertionFailure: Boolean) { - results.failure(id, failure) + results.failure( + id, + if (isAssertionFailure) { + TestFailure.fromTestAssertionFailure(failure, failure.expected, failure.actual) + } else { + TestFailure.fromTestFrameworkFailure(failure) + } + ) } override fun createDelegatingTestReportProcessor(origin: TestResultProcessor, targetName: String): TestResultProcessor = diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/utils/konanHome.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/utils/konanHome.kt index ddca0b9648d..a61c6268620 100644 --- a/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/utils/konanHome.kt +++ b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/utils/konanHome.kt @@ -16,7 +16,7 @@ internal val konanHome: File by lazy { val project = ProjectBuilder .builder() .build() - ?.run { + .run { project.plugins.apply("kotlin-multiplatform") (project.kotlinExtension as KotlinMultiplatformExtension).apply {