From d81c1647b7ab53865d73d98a21c0c494bc9c29d1 Mon Sep 17 00:00:00 2001 From: Egor Kulikov Date: Thu, 29 Jun 2023 11:32:31 +0300 Subject: [PATCH] Revert processing some failures in concrete executor. --- .../org/utbot/framework/plugin/api/UtExecutionResult.kt | 2 +- .../src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt index 91483f26dd..74a07c0bd1 100644 --- a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt +++ b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt @@ -77,7 +77,7 @@ class InstrumentedProcessDeathException(cause: Throwable) : cause ) -data class UtConcreteExecutionFailure(override val exception: InstrumentedProcessDeathException) : UtExecutionFailure() +data class UtConcreteExecutionFailure(override val exception: Throwable) : UtExecutionFailure() /** * Represents a failure in instrumented process diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt index 58b6e9e238..405e71996c 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt @@ -285,7 +285,7 @@ class UtBotSymbolicEngine( concreteExecutor.executeConcretely(methodUnderTest, stateBefore, instrumentation, UtSettings.concreteExecutionDefaultTimeoutInInstrumentedProcessMillis) concreteExecutionResult.processedFailure()?.let { failure -> - emit(UtFailedExecution(stateBefore, failure)) + emitFailedConcreteExecutionResult(stateBefore, failure.exception) logger.debug { "Instrumented process failed with exception ${failure.exception} before concrete execution started" } return@measureTime @@ -516,7 +516,7 @@ class UtBotSymbolicEngine( private suspend fun FlowCollector.emitFailedConcreteExecutionResult( stateBefore: EnvironmentModels, - e: InstrumentedProcessDeathException + e: Throwable ) { val failedConcreteExecution = UtFailedExecution( stateBefore = stateBefore, @@ -628,7 +628,7 @@ class UtBotSymbolicEngine( ) concreteExecutionResult.processedFailure()?.let { failure -> - emit(UtFailedExecution(stateBefore, failure)) + emitFailedConcreteExecutionResult(stateBefore, failure.exception) logger.debug { "Instrumented process failed with exception ${failure.exception} before concrete execution started" } return