Fix a bug with param names

Author: EgorkaKulikov

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

@@ -21,7 +21,7 @@ import org.utbot.framework.plugin.api.util.id
 
 class CodeGenerator(
     private val classUnderTest: Class<*>,
-    params: MutableMap<ExecutableId, List<String>> = mutableMapOf(),
+    paramNames: MutableMap<ExecutableId, List<String>> = mutableMapOf(),
     testFramework: TestFramework = TestFramework.defaultItem,
     mockFramework: MockFramework? = MockFramework.defaultItem,
     staticsMocking: StaticsMocking = StaticsMocking.defaultItem,
@@ -36,7 +36,7 @@ class CodeGenerator(
 ) {
     private var context: CgContext = CgContext(
         classUnderTest = classUnderTest.id,
-        paramNames = params,
+        paramNames = paramNames,
         testFramework = testFramework,
         mockFramework = mockFramework ?: MockFramework.MOCKITO,
         codegenLanguage = codegenLanguage,

utbot-framework/src/test/kotlin/org/utbot/framework/codegen/TestCodeGeneratorPipeline.kt

@@ -7,7 +7,6 @@ import org.utbot.common.bracket
 import org.utbot.common.info
 import org.utbot.common.packageName
 import org.utbot.examples.TestFrameworkConfiguration
-import org.utbot.examples.conflictTriggers
 import org.utbot.framework.codegen.ExecutionStatus.SUCCESS
 import org.utbot.framework.codegen.model.CodeGenerator
 import org.utbot.framework.plugin.api.CodegenLanguage
@@ -222,7 +221,7 @@ class TestCodeGeneratorPipeline(private val testFrameworkConfiguration: TestFram
         val codeGenerator = with(testFrameworkConfiguration) {
             CodeGenerator(
                 classUnderTest.java,
-                params = params,
+                paramNames = params,
                 testFramework = testFramework,
                 staticsMocking = staticsMocking,
                 forceStaticMocking = forceStaticMocking,

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt

@@ -101,7 +101,7 @@ object CodeGenerationController {
                 val file = testClass.containingFile
                 runWriteCommandAction(model.project, "Generate tests with UtBot", null, {
                     try {
-                        generateCodeAndReport(testClass, file, testSets, model, latch, reports)
+                        generateCodeAndReport(srcClass, testClass, file, testSets, model, latch, reports)
                     } catch (e: IncorrectOperationException) {
                         showCreatingClassError(model.project, createTestClassName(srcClass))
                     }
@@ -251,31 +251,27 @@ object CodeGenerationController {
     }
 
     private fun generateCodeAndReport(
+        srcClass: PsiClass,
         testClass: PsiClass,
         file: PsiFile,
         testSets: List<UtMethodTestSet>,
         model: GenerateTestsModel,
         reportsCountDown: CountDownLatch,
         reports: MutableList<TestsGenerationReport>,
     ) {
-        val selectedMethods = TestIntegrationUtils.extractClassMethods(testClass, false)
-        val testFramework = model.testFramework
-        val mockito = model.mockFramework
-        val staticsMocking = model.staticsMocking
-
         val classUnderTest = testSets.first().method.clazz
-
-        val params = DumbService.getInstance(model.project)
-            .runReadActionInSmartMode(Computable { findMethodParams(classUnderTest, selectedMethods) })
+        val classMethods = TestIntegrationUtils.extractClassMethods(srcClass, false)
+        val paramNames = DumbService.getInstance(model.project)
+            .runReadActionInSmartMode(Computable { findMethodParamNames(classUnderTest, classMethods) })
 
         val codeGenerator = CodeGenerator(
                 classUnderTest = classUnderTest.java,
-                params = params.toMutableMap(),
-                testFramework = testFramework,
-                mockFramework = mockito,
+                paramNames = paramNames.toMutableMap(),
+                testFramework = model.testFramework,
+                mockFramework = model.mockFramework,
                 codegenLanguage = model.codegenLanguage,
                 parameterizedTestSource = model.parametrizedTestSource,
-                staticsMocking = staticsMocking,
+                staticsMocking = model.staticsMocking,
                 forceStaticMocking = model.forceStaticMocking,
                 generateWarningsForStaticMocking = model.generateWarningsForStaticMocking,
                 runtimeExceptionTestsBehaviour = model.runtimeExceptionTestsBehaviour,
@@ -348,7 +344,7 @@ object CodeGenerationController {
         }
     }
 
-    private fun findMethodParams(clazz: KClass<*>, methods: List<MemberInfo>): Map<ExecutableId, List<String>> {
+    private fun findMethodParamNames(clazz: KClass<*>, methods: List<MemberInfo>): Map<ExecutableId, List<String>> {
         val bySignature = methods.associate { it.signature() to it.paramNames() }
         return clazz.functions
             .mapNotNull { method -> bySignature[method.signature()]?.let { params -> method.executableId to params } }