diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt index 10453790e44..b5cdbd2b25b 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt @@ -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:") diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt index 20c63832e03..ad9dcb49bdd 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt @@ -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 { protected abstract fun buildRun(): AbstractRun @@ -42,11 +41,6 @@ internal abstract class AbstractRunner { 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 diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt new file mode 100644 index 00000000000..b66a9887595 --- /dev/null +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt @@ -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 +}