Additional renamings

Author: sergeypospelov

utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt

@@ -104,14 +104,14 @@ class BunchTestGeneratorCommand : GenerateTestsAbstractCommand(
 
                 val testClassName = "${classUnderTest.simpleName}Test"
 
-                val testCases = generateTestCases(
+                val testSets = generateTestSets(
                     targetMethods,
                     searchDirectory = workingDirectory,
                     chosenClassesToMockAlways = (Mocker.defaultSuperClassesToMockAlwaysNames + classesToMockAlways)
                         .mapTo(mutableSetOf()) { ClassId(it) }
                 )
 
-                val testClassBody = generateTest(classUnderTest, testClassName, testCases)
+                val testClassBody = generateTest(classUnderTest, testClassName, testSets)
 
                 val outputArgAsFile = File(output ?: "")
                 if (!outputArgAsFile.exists()) {

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt

@@ -153,7 +153,7 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
     protected fun loadClassBySpecifiedFqn(classFqn: String): KClass<*> =
         classLoader.loadClass(classFqn).kotlin
 
-    protected fun generateTestCases(
+    protected fun generateTestSets(
         targetMethods: List<UtMethod<*>>,
         sourceCodeFile: Path? = null,
         searchDirectory: Path,

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt

@@ -102,20 +102,20 @@ class GenerateTestsCommand :
 
                 val testClassName = output?.toPath()?.toFile()?.nameWithoutExtension
                     ?: "${classUnderTest.simpleName}Test"
-                val testCases = generateTestCases(
+                val testSets = generateTestSets(
                     targetMethods,
                     Paths.get(sourceCodeFile),
                     searchDirectory = workingDirectory,
                     chosenClassesToMockAlways = (Mocker.defaultSuperClassesToMockAlwaysNames + classesToMockAlways)
                         .mapTo(mutableSetOf()) { ClassId(it) }
                 )
-                val testClassBody = generateTest(classUnderTest, testClassName, testCases)
+                val testClassBody = generateTest(classUnderTest, testClassName, testSets)
 
                 if (printToStdOut) {
                     logger.info { testClassBody }
                 }
                 if (sarifReport != null) {
-                    generateReport(targetClassFqn, testCases, testClassBody)
+                    generateReport(targetClassFqn, testSets, testClassBody)
                 }
                 saveToFile(testClassBody, output)
             }

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

@@ -158,7 +158,15 @@ data class GraphResult(
     val constraints: Set<UtBoolExpression> = emptySet()
 ) : InvokeResult()
 
-data class Environment(var method: SootMethod, var state: ExecutionState)
+class Environment(
+    var method: SootMethod,
+    var state: ExecutionState
+) {
+    val solver by state::solver
+    val memory by state::memory
+    val localVariableMemory by state::localVariableMemory
+
+}
 
 data class Step(
     val stmt: Stmt,

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

@@ -215,14 +215,14 @@ class Traverser(
     // TODO: move this and other mutable fields to [TraversalContext]
     lateinit var environment: Environment
     private val solver: UtSolver
-        get() = environment.state.solver
+        get() = environment.solver
 
     // TODO HACK violation of encapsulation
     val memory: Memory
-        get() = environment.state.memory
+        get() = environment.memory
 
     private val localVariableMemory: LocalVariableMemory
-        get() = environment.state.localVariableMemory
+        get() = environment.localVariableMemory
 
     //HACK (long strings)
     internal var softMaxArraySize = 40

utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt

@@ -108,7 +108,7 @@ object UtBotJavaApi {
      */
     @JvmStatic
     @JvmOverloads
-    fun generateTestCases(
+    fun generateTestSets(
         methodsForAutomaticGeneration: List<TestMethodInfo>,
         classUnderTest: Class<*>,
         classpath: String,
@@ -146,7 +146,7 @@ object UtBotJavaApi {
     /**
      * Generates test cases using only fuzzing workflow.
      *
-     * @see [generateTestCases]
+     * @see [generateTestSets]
      */
     @JvmStatic
     @JvmOverloads

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt

@@ -50,9 +50,9 @@ internal class CgTestClassConstructor(val context: CgContext) :
                 id = currentTestClass
                 body = buildTestClassBody {
                     cgDataProviderMethods.clear()
-                    for (testCase in testSets) {
-                        updateCurrentExecutable(testCase.method)
-                        val currentMethodUnderTestRegions = construct(testCase)
+                    for (testSet in testSets) {
+                        updateCurrentExecutable(testSet.method)
+                        val currentMethodUnderTestRegions = construct(testSet)
                         val executableUnderTestCluster = CgExecutableUnderTestCluster(
                             "Test suites for executable $currentExecutable",
                             currentMethodUnderTestRegions

utbot-framework/src/main/kotlin/org/utbot/framework/coverage/CoverageCalculator.kt

@@ -140,8 +140,8 @@ class MemoryClassLoader : ClassLoader() {
     }
 }
 
-fun classCoverage(testCases: List<UtMethodValueTestSet<*>>): Coverage =
-    testCases.map { methodCoverageWithJaCoCo(it.method, it.executions) }.toClassCoverage()
+fun classCoverage(testSets: List<UtMethodValueTestSet<*>>): Coverage =
+    testSets.map { methodCoverageWithJaCoCo(it.method, it.executions) }.toClassCoverage()
 
 fun methodCoverageWithJaCoCo(utMethod: UtMethod<*>, executions: List<UtValueExecution<*>>): Coverage {
     val methodSignature = utMethod.callable.signature

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt

@@ -32,11 +32,11 @@ class GenerateTestsAndSarifReportFacade(
     ) {
         initializeEngine(runtimeClasspath, workingDirectory)
 
-        val testCases = generateTestCases(targetClass, workingDirectory)
-        val testClassBody = generateTestCode(targetClass, testCases)
+        val testSets = generateTestSets(targetClass, workingDirectory)
+        val testClassBody = generateTestCode(targetClass, testSets)
         targetClass.testsCodeFile.writeText(testClassBody)
 
-        generateReport(targetClass, testCases, testClassBody, sourceFindingStrategy)
+        generateReport(targetClass, testSets, testClassBody, sourceFindingStrategy)
     }
 
     companion object {
@@ -69,7 +69,7 @@ class GenerateTestsAndSarifReportFacade(
         TestCaseGenerator.init(workingDirectory, classPath, dependencyPaths)
     }
 
-    private fun generateTestCases(targetClass: TargetClassWrapper, workingDirectory: Path): List<UtMethodTestSet> =
+    private fun generateTestSets(targetClass: TargetClassWrapper, workingDirectory: Path): List<UtMethodTestSet> =
         TestCaseGenerator.generate(
             targetClass.targetMethods,
             sarifProperties.mockStrategy,

utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt

@@ -70,11 +70,11 @@ class SarifReport(
         val sarifResults = mutableListOf<SarifResult>()
         val sarifRules = mutableSetOf<SarifRule>()
 
-        for (testCase in testSets) {
-            for (execution in testCase.executions) {
+        for (testSet in testSets) {
+            for (execution in testSet.executions) {
                 if (shouldProcessExecutionResult(execution.result)) {
                     val (sarifResult, sarifRule) = processUncheckedException(
-                        method = testCase.method,
+                        method = testSet.method,
                         utExecution = execution,
                         uncheckedException = execution.result as UtExecutionFailure
                     )