Enable disabled test due to the fix

Author: sofurihafe

utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt

@@ -16,7 +16,7 @@ internal class CustomerExamplesTest: UtValueTestCaseChecker(
     testClass = CustomerExamples::class,
     testCodeGeneration = true,
     pipelines = listOf(
-        TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution, parameterizedModeLastStage = Compilation),
+        TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution),
         TestLastStage(CodegenLanguage.KOTLIN, lastStage = CodeGeneration)
     )
 ) {

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

@@ -1484,9 +1484,12 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                     substituteStaticFields(statics, isParametrized = true)
 
                     // build this instance
-                    thisInstance =
-                        genericExecution.stateBefore.thisInstance?.let {
-                        variableConstructor.getOrCreateVariable(it)
+                    thisInstance = genericExecution.stateBefore.thisInstance?.let {
+                        if (statics.isNotEmpty()) {
+                            currentMethodParameters[CgParameterKind.ThisInstance]
+                        } else {
+                            variableConstructor.getOrCreateVariable(it)
+                        }
                     }
 
                     // build arguments for method under test and parameterized test
@@ -1549,6 +1552,24 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
         val executableUnderTestParameters = testSet.executableId.executable.parameters
 
         return mutableListOf<CgParameterDeclaration>().apply {
+            val statics = genericExecution.stateBefore.statics
+
+            // this instance
+            genericExecution.stateBefore.thisInstance?.let {
+                if (statics.isNotEmpty()) {
+                    val type = wrapTypeIfRequired(it.classId)
+                    val thisInstance = CgParameterDeclaration(
+                        parameter = declareParameter(
+                            type = type,
+                            name = nameGenerator.variableName(type)
+                        ),
+                        isReferenceType = true
+                    )
+                    this += thisInstance
+                    currentMethodParameters[CgParameterKind.ThisInstance] = thisInstance.parameter
+                }
+            }
+
             // arguments
             for (index in genericExecution.stateBefore.parameters.indices) {
                 val argumentName = paramNames[executableUnderTest]?.get(index)
@@ -1571,7 +1592,6 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
                 currentMethodParameters[CgParameterKind.Argument(index)] = argument.parameter
             }
 
-            val statics = genericExecution.stateBefore.statics
             if (statics.isNotEmpty()) {
                 for ((fieldId, model) in statics) {
                     val staticType = wrapTypeIfRequired(model.classId)
@@ -1660,12 +1680,18 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
     private fun createExecutionArguments(testSet: CgMethodTestSet, execution: UtExecution): List<CgExpression> {
         val arguments = mutableListOf<CgExpression>()
 
+        val statics = execution.stateBefore.statics
+        execution.stateBefore.thisInstance?.let {
+            if (statics.isNotEmpty()) {
+                arguments += variableConstructor.getOrCreateVariable(it)
+            }
+        }
+
         for ((paramIndex, paramModel) in execution.stateBefore.parameters.withIndex()) {
             val argumentName = paramNames[testSet.executableId]?.get(paramIndex)
             arguments += variableConstructor.getOrCreateVariable(paramModel, argumentName)
         }
 
-        val statics = execution.stateBefore.statics
         for ((field, model) in statics) {
             arguments += variableConstructor.getOrCreateVariable(model, field.name)
         }

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

@@ -750,6 +750,7 @@ data class CgParameterDeclaration(
  * - exception expected from MUT with the given arguments
  */
 sealed class CgParameterKind {
+    object ThisInstance : CgParameterKind()
     data class Argument(val index: Int) : CgParameterKind()
     data class Statics(val model: UtModel) : CgParameterKind()
     object ExpectedResult : CgParameterKind()