Update test-data for Gradle 7.6 version.

This commit is contained in:
Yahor Berdnikau
2023-02-06 11:36:33 +01:00
committed by Space Team
parent 3c863b5bbf
commit b3e6a3c274
3 changed files with 13 additions and 4 deletions
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.internal.testing package org.jetbrains.kotlin.gradle.internal.testing
import org.gradle.api.internal.tasks.testing.* import org.gradle.api.internal.tasks.testing.*
import org.gradle.api.tasks.testing.TestFailure
import org.gradle.api.tasks.testing.TestOutputEvent import org.gradle.api.tasks.testing.TestOutputEvent
class RecordingTestResultProcessor : TestResultProcessor { class RecordingTestResultProcessor : TestResultProcessor {
@@ -34,8 +35,8 @@ class RecordingTestResultProcessor : TestResultProcessor {
line("${event.destination}[${event.message}] // $testId") line("${event.destination}[${event.message}] // $testId")
} }
override fun failure(testId: Any, result: Throwable) { override fun failure(testId: Any?, result: TestFailure?) {
line("FAILURE $result // $testId") line("FAILURE ${result?.rawFailure} // $testId")
} }
override fun completed(testId: Any, event: TestCompleteEvent) { override fun completed(testId: Any, event: TestCompleteEvent) {
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.gradle.internal.testing.tcsmc
import jetbrains.buildServer.messages.serviceMessages.ServiceMessage import jetbrains.buildServer.messages.serviceMessages.ServiceMessage
import org.gradle.api.internal.tasks.testing.TestResultProcessor import org.gradle.api.internal.tasks.testing.TestResultProcessor
import org.gradle.api.tasks.testing.TestFailure
import org.gradle.internal.operations.OperationIdentifier import org.gradle.internal.operations.OperationIdentifier
import org.jetbrains.kotlin.gradle.internal.testing.RecordingTestResultProcessor import org.jetbrains.kotlin.gradle.internal.testing.RecordingTestResultProcessor
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient
@@ -44,7 +45,14 @@ open class TCServiceMessagesClientTest {
LoggerFactory.getLogger("test"), LoggerFactory.getLogger("test"),
object : MppTestReportHelper { object : MppTestReportHelper {
override fun reportFailure(results: TestResultProcessor, id: Any, failure: KotlinTestFailure, isAssertionFailure: Boolean) { 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 = override fun createDelegatingTestReportProcessor(origin: TestResultProcessor, targetName: String): TestResultProcessor =
@@ -16,7 +16,7 @@ internal val konanHome: File by lazy {
val project = ProjectBuilder val project = ProjectBuilder
.builder() .builder()
.build() .build()
?.run { .run {
project.plugins.apply("kotlin-multiplatform") project.plugins.apply("kotlin-multiplatform")
(project.kotlinExtension as KotlinMultiplatformExtension).apply { (project.kotlinExtension as KotlinMultiplatformExtension).apply {