Replace Class<*> with ClassId in the CodeGenerator constructor (#659)

Author: EgorkaKulikov

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

@@ -29,6 +29,7 @@ import org.utbot.framework.plugin.api.TreatOverflowAsError
 import org.utbot.framework.plugin.api.TestCaseGenerator
 import org.utbot.framework.plugin.api.UtMethod
 import org.utbot.framework.plugin.api.UtMethodTestSet
+import org.utbot.framework.plugin.api.util.id
 import org.utbot.summary.summarize
 import java.io.File
 import java.lang.reflect.Method
@@ -205,7 +206,7 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
  forceStaticMocking == ForceStaticMocking.FORCE && staticsMocking is NoStaticMocking
  return CodeGenerator(
  testFramework = testFrameworkByName(testFramework),
- classUnderTest = classUnderTest.java,
+ classUnderTest = classUnderTest.id,
  codegenLanguage = codegenLanguage,
  staticsMocking = staticsMocking,
  forceStaticMocking = forceStaticMocking,

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

@@ -84,7 +84,7 @@ object UtBotJavaApi {
 
  return withUtContext(utContext) {
  val codeGenerator = CodeGenerator(
- classUnderTest = classUnderTest,
+ classUnderTest = classUnderTest.id,
  testFramework = testFramework,
  mockFramework = mockFramework,
  codegenLanguage = codegenLanguage,

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

@@ -1,6 +1,5 @@
 package org.utbot.framework.codegen.model
 
-import org.utbot.common.packageName
 import org.utbot.framework.codegen.ForceStaticMocking
 import org.utbot.framework.codegen.HangingTestsTimeout
 import org.utbot.framework.codegen.ParametrizedTestSource
@@ -13,14 +12,14 @@ import org.utbot.framework.codegen.model.constructor.tree.TestsGenerationReport
 import org.utbot.framework.codegen.model.tree.CgTestClassFile
 import org.utbot.framework.codegen.model.visitor.CgAbstractRenderer
 import org.utbot.framework.plugin.api.CgMethodTestSet
+import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.MockFramework
 import org.utbot.framework.plugin.api.UtMethodTestSet
-import org.utbot.framework.plugin.api.util.id
 
 class CodeGenerator(
- private val classUnderTest: Class<*>,
+ private val classUnderTest: ClassId,
  paramNames: MutableMap<ExecutableId, List<String>> = mutableMapOf(),
  testFramework: TestFramework = TestFramework.defaultItem,
  mockFramework: MockFramework? = MockFramework.defaultItem,
@@ -35,7 +34,7 @@ class CodeGenerator(
  testClassPackageName: String = classUnderTest.packageName,
 ) {
  private var context: CgContext = CgContext(
- classUnderTest = classUnderTest.id,
+ classUnderTest = classUnderTest,
  paramNames = paramNames,
  testFramework = testFramework,
  mockFramework = mockFramework ?: MockFramework.MOCKITO,

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

@@ -5,6 +5,7 @@ import org.utbot.framework.codegen.NoStaticMocking
 import org.utbot.framework.codegen.model.CodeGenerator
 import org.utbot.framework.plugin.api.TestCaseGenerator
 import org.utbot.framework.plugin.api.UtMethodTestSet
+import org.utbot.framework.plugin.api.util.id
 import org.utbot.sarif.SarifReport
 import org.utbot.sarif.SourceFindingStrategy
 import org.utbot.summary.summarize
@@ -70,7 +71,7 @@ class GenerateTestsAndSarifReportFacade(
  val isForceStaticMocking = sarifProperties.forceStaticMocking == ForceStaticMocking.FORCE
 
  return CodeGenerator(
- classUnderTest = targetClass.classUnderTest.java,
+ classUnderTest = targetClass.classUnderTest.id,
  testFramework = sarifProperties.testFramework,
  mockFramework = sarifProperties.mockFramework,
  staticsMocking = sarifProperties.staticsMocking,

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

@@ -16,6 +16,7 @@ import org.utbot.framework.plugin.api.MockStrategyApi
 import org.utbot.framework.plugin.api.UtMethodTestSet
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.description
+import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.withUtContext
 import kotlin.reflect.KClass
 
@@ -220,7 +221,7 @@ class TestCodeGeneratorPipeline(private val testFrameworkConfiguration: TestFram
 
  val codeGenerator = with(testFrameworkConfiguration) {
  CodeGenerator(
- classUnderTest.java,
+ classUnderTest.id,
  paramNames = params,
  testFramework = testFramework,
  staticsMocking = staticsMocking,

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

@@ -59,6 +59,7 @@ import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.UtMethodTestSet
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.executableId
+import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.withUtContext
 import org.utbot.framework.util.Conflict
 import org.utbot.intellij.plugin.generator.CodeGenerationController.Target.*
@@ -265,7 +266,7 @@ object CodeGenerationController {
  .runReadActionInSmartMode(Computable { findMethodParamNames(classUnderTest, classMethods) })
 
  val codeGenerator = CodeGenerator(
- classUnderTest = classUnderTest.java,
+ classUnderTest = classUnderTest.id,
  paramNames = paramNames.toMutableMap(),
  testFramework = model.testFramework,
  mockFramework = model.mockFramework,

utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt

@@ -210,7 +210,7 @@ fun runGeneration(
  val statsForClass = StatsForClass()
 
  val codeGenerator = CodeGenerator(
- cut.classId.jClass,
+ cut.classId,
  testFramework = junitByVersion(junitVersion),
  staticsMocking = staticsMocking,
  forceStaticMocking = forceStaticMocking,