Refactor engine actions

Author: sofurihafe

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/EngineActionsController.kt

@@ -0,0 +1,16 @@
+package org.utbot.framework.plugin.api
+
+import org.utbot.engine.UtBotSymbolicEngine
+
+class EngineActionsController {
+    private val actions: MutableList<(UtBotSymbolicEngine) -> Unit> = mutableListOf()
+
+    fun add(action: (UtBotSymbolicEngine) -> Unit) {
+        actions.add(action)
+    }
+
+    fun apply(symbolicEngine: UtBotSymbolicEngine) {
+        actions.forEach { symbolicEngine.apply(it) }
+        actions.clear()
+    }
+}

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt

@@ -60,10 +60,10 @@ open class TestCaseGenerator(
     private val buildDir: Path,
     private val classpath: String?,
     private val dependencyPaths: String,
-    val engineActions: MutableList<(UtBotSymbolicEngine) -> Unit> = mutableListOf(),
     val isCanceled: () -> Boolean = { false },
     val forceSootReload: Boolean = true
 ) {
+    val engineActions: EngineActionsController = EngineActionsController()
     private val logger: KLogger = KotlinLogging.logger {}
     private val timeoutLogger: KLogger = KotlinLogging.logger(logger.name + ".timeout")
 
@@ -121,9 +121,9 @@ open class TestCaseGenerator(
         chosenClassesToMockAlways: Set<ClassId> = Mocker.javaDefaultClasses.mapTo(mutableSetOf()) { it.id },
         executionTimeEstimator: ExecutionTimeEstimator = ExecutionTimeEstimator(utBotGenerationTimeoutInMillis, 1)
     ): Flow<UtResult> {
-        val engine = createSymbolicEngine(controller, method, mockStrategy, chosenClassesToMockAlways, executionTimeEstimator)
-        engineActions.map { engine.apply(it) }
-        engineActions.clear()
+        val engine =
+            createSymbolicEngine(controller, method, mockStrategy, chosenClassesToMockAlways, executionTimeEstimator)
+            .also { engine -> engineActions.apply(engine) }
         return defaultTestFlow(engine, executionTimeEstimator.userTimeout)
     }
 
@@ -160,10 +160,7 @@ open class TestCaseGenerator(
                             mockStrategy,
                             chosenClassesToMockAlways,
                             executionTimeEstimator
-                        )
-
-                        engineActions.map { engine.apply(it) }
-                        engineActions.clear()
+                        ).also { engine -> engineActions.apply(engine) }
 
                         generate(engine)
                             .catch {

utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt

@@ -29,9 +29,8 @@ class TestSpecificTestCaseGenerator(
     buildDir: Path,
     classpath: String?,
     dependencyPaths: String,
-    engineActions: MutableList<(UtBotSymbolicEngine) -> Unit> = mutableListOf(),
     isCanceled: () -> Boolean = { false },
-): TestCaseGenerator(buildDir, classpath, dependencyPaths, engineActions, isCanceled, forceSootReload = false) {
+): TestCaseGenerator(buildDir, classpath, dependencyPaths, isCanceled, forceSootReload = false) {
 
     private val logger = KotlinLogging.logger {}