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

[Native][tests] Minor. Refactor AbstractRunner.RunResult

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-24 12:47:24 +03:00
parent 1d721f03b2
commit 3e0761b4fc
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.konan.blackboxtest.support
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.konan.blackboxtest.support.runner.AbstractRunner
import org.jetbrains.kotlin.konan.blackboxtest.support.runner.RunResult
import java.io.File
import kotlin.time.Duration
import kotlin.time.DurationUnit
@@ -109,7 +109,7 @@ internal abstract class LoggedData {
class TestRun(
private val parameters: TestRunParameters,
private val runResult: AbstractRunner.RunResult.Completed
private val runResult: RunResult.Completed
) : LoggedData() {
override fun computeText() = buildString {
appendLine("TEST RUN:")
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt
-6
View File
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.LoggedData
import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals
import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
import kotlin.time.Duration
internal abstract class AbstractRunner<R> {
protected abstract fun buildRun(): AbstractRun
@@ -42,11 +41,6 @@ internal abstract class AbstractRunner<R> {
fun run(): RunResult
}
sealed interface RunResult {
data class Completed(val exitCode: Int, val duration: Duration, val stdOut: String, val stdErr: String) : RunResult
data class TimeoutExceeded(val timeout: Duration) : RunResult
}
abstract inner class ResultHandler(protected val runResult: RunResult.Completed) {
abstract fun getLoggedRun(): LoggedData
abstract fun handle(): R
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt
+13
View File
@@ -0,0 +1,13 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.konan.blackboxtest.support.runner
import kotlin.time.Duration
sealed interface RunResult {
data class Completed(val exitCode: Int, val duration: Duration, val stdOut: String, val stdErr: String) : RunResult
data class TimeoutExceeded(val timeout: Duration) : RunResult
}