From e2d68fd2399c7999a402bd1b60e99b413af21212 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Thu, 18 Nov 2021 12:40:04 +0300
Subject: [PATCH] [Native][tests] Make AbstractRunner.AbstractRun to be fun
 interface

---
 .../runner/AbstractLocalProcessRunner.kt      | 20 +++++++++----------
 .../blackboxtest/runner/AbstractRunner.kt     |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractLocalProcessRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractLocalProcessRunner.kt
index 473bf0598d7..cf4a7dc52c5 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractLocalProcessRunner.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractLocalProcessRunner.kt
@@ -14,21 +14,19 @@ internal abstract class AbstractLocalProcessRunner<R> : AbstractRunner<R>() {
 
     protected open fun customizeProcess(process: Process) = Unit
 
-    final override fun buildRun() = object : AbstractRun {
-        override fun run(): RunResult {
-            val startTimeMillis = System.currentTimeMillis()
+    final override fun buildRun() = AbstractRun {
+        val startTimeMillis = System.currentTimeMillis()
 
-            val process = ProcessBuilder(programArgs).directory(executable.executableFile.parentFile).start()
-            customizeProcess(process)
+        val process = ProcessBuilder(programArgs).directory(executable.executableFile.parentFile).start()
+        customizeProcess(process)
 
-            val exitCode = process.waitFor()
-            val finishTimeMillis = System.currentTimeMillis()
+        val exitCode = process.waitFor()
+        val finishTimeMillis = System.currentTimeMillis()
 
-            val stdOut = process.inputStream.bufferedReader().readText()
-            val stdErr = process.errorStream.bufferedReader().readText()
+        val stdOut = process.inputStream.bufferedReader().readText()
+        val stdErr = process.errorStream.bufferedReader().readText()
 
-            return RunResult(exitCode, finishTimeMillis - startTimeMillis, stdOut, stdErr)
-        }
+        RunResult(exitCode, finishTimeMillis - startTimeMillis, stdOut, stdErr)
     }
 
     abstract override fun buildResultHandler(runResult: RunResult): ResultHandler // Narrow returned type.
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractRunner.kt
index b8aab858f25..57dbc556d1c 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractRunner.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/AbstractRunner.kt
@@ -29,7 +29,7 @@ internal abstract class AbstractRunner<R> {
         }
     }
 
-    interface AbstractRun {
+    fun interface AbstractRun {
         fun run(): RunResult
     }