From 65abb5de46489f48ee0ee40c830c982ba1261ed3 Mon Sep 17 00:00:00 2001
From: Alexander Shabalin <alexander.shabalin@jetbrains.com>
Date: Fri, 26 Jan 2024 14:07:20 +0100
Subject: [PATCH] [K/N][tests] Remove now unused LocalTestRunner

---
 .../{LocalTestRunner.kt => ResultHandler.kt}  | 43 -------------------
 .../support/settings/TestProcessSettings.kt   |  4 +-
 2 files changed, 2 insertions(+), 45 deletions(-)
 rename native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/{LocalTestRunner.kt => ResultHandler.kt} (54%)

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt
similarity index 54%
rename from native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestRunner.kt
rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt
index 762066886eb..2008693f806 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestRunner.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/ResultHandler.kt
@@ -7,52 +7,9 @@ package org.jetbrains.kotlin.konan.test.blackbox.support.runner
 
 import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData
 import org.jetbrains.kotlin.konan.test.blackbox.support.TestName
-import org.jetbrains.kotlin.konan.test.blackbox.support.util.TCTestOutputFilter
-import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter
 import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestReport
-import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
 import org.junit.jupiter.api.Assumptions.assumeFalse
 
-internal class LocalTestRunner(private val testRun: TestRun) : AbstractLocalProcessRunner<Unit>(testRun.checks) {
-    override val visibleProcessName get() = "Tested process"
-    override val executable get() = testRun.executable
-
-    override val programArgs = buildList {
-        add(executable.executable.executableFile.path)
-        testRun.runParameters.forEach { it.applyTo(this) }
-    }
-
-    override val outputFilter: TestOutputFilter
-        get() = if (testRun.runParameters.has<TestRunParameter.WithTCTestLogger>()) TCTestOutputFilter else TestOutputFilter.NO_FILTERING
-
-    override fun getLoggedParameters() = LoggedData.TestRunParameters(
-        compilationToolCall = executable.loggedCompilationToolCall,
-        testCaseId = testRun.testCaseId,
-        runArgs = programArgs,
-        runParameters = testRun.runParameters
-    )
-
-    override fun customizeProcess(process: Process) {
-        testRun.runParameters.get<TestRunParameter.WithInputData> {
-            process.outputStream.write(inputDataFile.readBytes())
-            process.outputStream.close()
-        }
-    }
-
-    override fun buildResultHandler(runResult: RunResult) = ResultHandler(
-        runResult = runResult,
-        visibleProcessName = visibleProcessName,
-        checks = testRun.checks,
-        testRun = testRun,
-        loggedParameters = getLoggedParameters()
-    )
-
-    override fun handleUnexpectedFailure(t: Throwable) = fail {
-        LoggedData.TestRunUnexpectedFailure(getLoggedParameters(), t)
-            .withErrorMessage("Test execution failed with unexpected exception.")
-    }
-}
-
 internal class ResultHandler(
     runResult: RunResult,
     visibleProcessName: String,
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt
index f967214fd46..eb50100a460 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.konan.target.Distribution
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.test.blackbox.support.MutedOption
 import org.jetbrains.kotlin.konan.test.blackbox.support.TestKind
-import org.jetbrains.kotlin.konan.test.blackbox.support.runner.LocalTestRunner
+import org.jetbrains.kotlin.konan.test.blackbox.support.runner.RunnerWithExecutor
 import org.jetbrains.kotlin.konan.test.blackbox.support.runner.NoopTestRunner
 import org.jetbrains.kotlin.konan.test.blackbox.support.runner.Runner
 import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
@@ -106,7 +106,7 @@ internal value class CustomKlibs(val klibs: Set<File>) {
 /**
  * Whether tests should be compiled only (true) or compiled and executed (false, the default).
  *
- * TODO: need to reconsider this setting when other [Runner]s than [LocalTestRunner] and [NoopTestRunner] are supported
+ * TODO: need to reconsider this setting when other [Runner]s than [RunnerWithExecutor] and [NoopTestRunner] are supported
  */
 @JvmInline
 internal value class ForcedNoopTestRunner(val value: Boolean)