Refactor: remove graph parameter from Traverser constructor

Author: sergeypospelov

utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt

@@ -266,6 +266,7 @@ import sun.reflect.generics.reflectiveObjects.TypeVariableImpl
 import sun.reflect.generics.reflectiveObjects.WildcardTypeImpl
 import java.lang.reflect.Method
 import java.util.concurrent.atomic.AtomicInteger
+import org.utbot.framework.plugin.api.jimpleBody
 
 private val logger = KotlinLogging.logger {}
 val pathLogger = KotlinLogging.logger(logger.name + ".path")
@@ -317,14 +318,17 @@ private fun pathSelector(graph: InterProceduralUnitGraph, typeRegistry: TypeRegi
 class Traverser(
     private val controller: EngineController,
     private val methodUnderTest: UtMethod<*>,
-    private val graph: ExceptionalUnitGraph,
     classpath: String,
     dependencyPaths: String,
     mockStrategy: MockStrategy = NO_MOCKS,
     chosenClassesToMockAlways: Set<ClassId>,
     private val solverTimeoutInMillis: Int = checkSolverTimeoutMillis
 ) : UtContextInitializer() {
 
+    private val graph = jimpleBody(methodUnderTest).also {
+        logger.trace { "JIMPLE for $methodUnderTest:\n$this" }
+    }.graph()
+
     private val methodUnderAnalysisStmts: Set<Stmt> = graph.stmts.toSet()
     private val visitedStmts: MutableSet<Stmt> = mutableSetOf()
     private val globalGraph = InterProceduralUnitGraph(graph)

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

@@ -48,7 +48,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.yield
 import mu.KotlinLogging
-import org.utbot.engine.*
 import soot.Scene
 import soot.jimple.JimpleBody
 import soot.toolkits.graph.ExceptionalUnitGraph
@@ -202,12 +201,9 @@ object UtBotTestCaseGenerator : TestCaseGenerator {
     ): Traverser {
         // TODO: create classLoader from buildDir/classpath and migrate from UtMethod to MethodId?
         logger.debug("Starting symbolic execution for $method  --$mockStrategy--")
-        val graph = graph(method)
-
         return Traverser(
             controller,
             method,
-            graph,
             classpathForEngine,
             dependencyPaths = dependencyPaths,
             mockStrategy = apiToModel(mockStrategy),
@@ -419,31 +415,22 @@ object UtBotTestCaseGenerator : TestCaseGenerator {
             else -> error("Cannot map API Mock Strategy model to Engine model: $mockStrategyApi")
         }
 
-    private fun graph(method: UtMethod<*>): ExceptionalUnitGraph {
-        val className = method.clazz.java.name
-        val clazz = Scene.v().classes.singleOrNull { it.name == className }
-            ?: error("No such $className found in the Scene")
-        val signature = method.callable.signature
-        val sootMethod = clazz.methods.singleOrNull { it.pureJavaSignature == signature }
-            ?: error("No such $signature found")
-        if (!sootMethod.canRetrieveBody()) {
-            error("No method body for $sootMethod found")
-        }
-        val methodBody = sootMethod.jimpleBody()
-        val graph = methodBody.graph()
-
-        logger.trace { "JIMPLE for $method:\n${methodBody}" }
+}
 
-        return graph
-    }
+fun graph(method: UtMethod<*>): ExceptionalUnitGraph {
+    val methodBody = jimpleBody(method)
+    return methodBody.graph()
+}
 
-    fun jimpleBody(method: UtMethod<*>): JimpleBody {
-        val clazz = Scene.v().classes.single { it.name == method.clazz.java.name }
-        val signature = method.callable.signature
-        val sootMethod = clazz.methods.single { it.pureJavaSignature == signature }
+fun jimpleBody(method: UtMethod<*>): JimpleBody {
+    val className = method.clazz.java.name
+    val clazz = Scene.v().classes.singleOrNull { it.name == className }
+        ?: error("No such $className found in the Scene")
+    val signature = method.callable.signature
+    val sootMethod = clazz.methods.singleOrNull { it.pureJavaSignature == signature }
+        ?: error("No such $signature found")
 
-        return sootMethod.jimpleBody()
-    }
+    return sootMethod.jimpleBody()
 }
 
 fun JimpleBody.graph() = ExceptionalUnitGraph(this)

utbot-framework/src/test/kotlin/org/utbot/examples/AbstractTestCaseGeneratorTest.kt

@@ -68,6 +68,7 @@ import kotlin.reflect.KFunction5
 import mu.KotlinLogging
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.utbot.framework.PathSelectorType
+import org.utbot.framework.plugin.api.jimpleBody
 
 val logger = KotlinLogging.logger {}
 
@@ -2343,7 +2344,7 @@ abstract class AbstractTestCaseGeneratorTest(
                 walk(utMethod, mockStrategy, additionalDependenciesClassPath)
             }
             testCase.summarize(searchDirectory)
-            val valueTestCase = testCase.toValueTestCase(UtBotTestCaseGenerator.jimpleBody(utMethod))
+            val valueTestCase = testCase.toValueTestCase(jimpleBody(utMethod))
 
             assertTrue(testCase.errors.isEmpty()) {
                 "We have errors: ${
@@ -2478,7 +2479,7 @@ abstract class AbstractTestCaseGeneratorTest(
         additionalDependenciesClassPath: String = ""
     ): MethodResult {
         val testCase = executions(method, mockStrategy, additionalDependenciesClassPath)
-        val jimpleBody = UtBotTestCaseGenerator.jimpleBody(method)
+        val jimpleBody = jimpleBody(method)
         val methodCoverage = methodCoverage(
             method,
             testCase.toValueTestCase(jimpleBody).executions,