From 200d92c287da89a5844119fde292643c0101554b Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Wed, 17 Nov 2021 11:44:12 +0300
Subject: [PATCH] [Native][tests] Handle unexpected errors during test run

---
 .../kotlin/konan/blackboxtest/LoggedData.kt   | 32 +++++++++++--------
 .../blackboxtest/runner/AbstractRunner.kt     | 14 ++++++--
 .../blackboxtest/runner/LocalTestRunner.kt    | 24 ++++++++++----
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LoggedData.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LoggedData.kt
index e21dc9bec60..ba1a33d8ff8 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LoggedData.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LoggedData.kt
@@ -70,20 +70,7 @@ internal abstract class LoggedData {
         }
     }
 
-    class CompilerCallUnexpectedFailure(
-        private val parameters: CompilerParameters,
-        private val throwable: Throwable
-    ) : LoggedData() {
-        override fun computeText() = buildString {
-            appendLine("UNEXPECTED FAILURE IN COMPILER:")
-            appendLine("$throwable")
-            appendLine()
-            appendLine("STACK TRACE:")
-            appendLine(throwable.stackTraceToString())
-            appendLine()
-            appendLine(parameters)
-        }
-    }
+    class CompilerCallUnexpectedFailure(parameters: CompilerParameters, throwable: Throwable) : UnexpectedFailure(parameters, throwable)
 
     class TestRunParameters(
         private val compilerCall: CompilerCall,
@@ -135,6 +122,23 @@ internal abstract class LoggedData {
         }
     }
 
+    class TestRunUnexpectedFailure(parameters: TestRunParameters, throwable: Throwable) : UnexpectedFailure(parameters, throwable)
+
+    abstract class UnexpectedFailure(
+        private val parameters: LoggedData,
+        private val throwable: Throwable
+    ) : LoggedData() {
+        override fun computeText() = buildString {
+            appendLine("ERROR MESSAGE:")
+            appendLine("${throwable.message}")
+            appendLine()
+            appendLine("STACK TRACE:")
+            appendLine(throwable.stackTraceToString().trimEnd())
+            appendLine()
+            appendLine(parameters)
+        }
+    }
+
     companion object {
         @JvmStatic
         protected fun StringBuilder.appendList(header: String, list: Iterable<Any?>): StringBuilder {
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 05b5ededc34..b8aab858f25 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
@@ -8,17 +8,25 @@ package org.jetbrains.kotlin.konan.blackboxtest.runner
 import org.jetbrains.kotlin.konan.blackboxtest.LoggedData
 import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals
 import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
+import java.lang.AssertionError
 
 internal abstract class AbstractRunner<R> {
     protected abstract fun buildRun(): AbstractRun
     protected abstract fun buildResultHandler(runResult: RunResult): ResultHandler
+    protected abstract fun handleUnexpectedFailure(t: Throwable): Nothing
 
-    fun run(): R {
+    fun run(): R = try {
         val run = buildRun()
         val runResult = run.run()
-
         val resultHandler = buildResultHandler(runResult)
-        return resultHandler.handle()
+        resultHandler.handle()
+    } catch (t: Throwable) {
+        if (t is AssertionError)
+            throw t
+        else {
+            // An unexpected failure.
+            handleUnexpectedFailure(t)
+        }
     }
 
     interface AbstractRun {
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/LocalTestRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/LocalTestRunner.kt
index e17b9b0c6ce..5d4c9c440a5 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/LocalTestRunner.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/runner/LocalTestRunner.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.LoggedData
 import org.jetbrains.kotlin.konan.blackboxtest.TestRun
 import org.jetbrains.kotlin.konan.blackboxtest.TestRunParameter
 import org.jetbrains.kotlin.konan.blackboxtest.get
+import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
 
 internal class LocalTestRunner(private val testRun: TestRun) : AbstractLocalProcessRunner<Unit>() {
     override val visibleProcessName get() = "Tested process"
@@ -20,12 +21,13 @@ internal class LocalTestRunner(private val testRun: TestRun) : AbstractLocalProc
         testRun.runParameters.forEach { it.applyTo(this) }
     }
 
-    private fun getLoggedParameters() = LoggedData.TestRunParameters(
-        compilerCall = executable.loggedCompilerCall,
-        origin = testRun.origin,
-        runArgs = programArgs,
-        runParameters = testRun.runParameters
-    )
+    private val loggedParameters: LoggedData.TestRunParameters
+        get() = LoggedData.TestRunParameters(
+            compilerCall = executable.loggedCompilerCall,
+            origin = testRun.origin,
+            runArgs = programArgs,
+            runParameters = testRun.runParameters
+        )
 
     override fun customizeProcess(process: Process) {
         testRun.runParameters.get<TestRunParameter.WithInputData> {
@@ -36,8 +38,16 @@ internal class LocalTestRunner(private val testRun: TestRun) : AbstractLocalProc
 
     override fun buildResultHandler(runResult: RunResult) = ResultHandler(runResult)
 
+    override fun handleUnexpectedFailure(t: Throwable) = fail {
+        buildString {
+            appendLine("Test execution failed with unexpected exception.")
+            appendLine()
+            appendLine(LoggedData.TestRunUnexpectedFailure(loggedParameters, t))
+        }
+    }
+
     inner class ResultHandler(runResult: RunResult) : AbstractLocalProcessRunner<Unit>.ResultHandler(runResult) {
-        override fun getLoggedRun() = LoggedData.TestRun(getLoggedParameters(), exitCode, stdOut, stdErr, durationMillis)
+        override fun getLoggedRun() = LoggedData.TestRun(loggedParameters, exitCode, stdOut, stdErr, durationMillis)
 
         override fun doHandle() {
             if (testRun.runParameters.has<TestRunParameter.WithGTestLogger>()) {