Fix compilation after rebase and decouple Spring tests

IlyaMuravjov · IlyaMuravjov · commit 186a0fb9b7f5 · 2023-07-19T17:53:46.000+03:00
diff --git a/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/autowiring/oneBeanForOneType/ServiceWithInjectedAndNonInjectedFieldTests.kt b/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/autowiring/oneBeanForOneType/ServiceWithInjectedAndNonInjectedFieldTests.kt
@@ -4,19 +4,14 @@ import org.junit.jupiter.api.Test
 import org.utbot.examples.spring.utils.findAllRepositoryCall
 import org.utbot.examples.spring.utils.springAdditionalDependencies
 import org.utbot.examples.spring.utils.springMockStrategy
-import org.utbot.examples.spring.utils.standardSpringTestingConfigurations
-import org.utbot.framework.plugin.api.MockStrategyApi
-import org.utbot.testcheckers.eq
 import org.utbot.testing.DoNotCalculate
-import org.utbot.testing.UtValueTestCaseChecker
 import org.utbot.testing.ignoreExecutionsNumber
 import org.utbot.testing.isException
 import org.utbot.testing.singleMock
 import org.utbot.testing.value
 
-internal class ServiceWithInjectedAndNonInjectedFieldTests: UtValueTestCaseChecker(
+internal class ServiceWithInjectedAndNonInjectedFieldTests : SpringNoConfigUtValueTestCaseChecker(
     testClass = ServiceWithInjectedAndNonInjectedField::class,
-    configurations = standardSpringTestingConfigurations
 ) {
     @Test
     fun testGetOrdersSize() {
diff --git a/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/autowiring/oneBeanForOneType/ServiceWithInjectedFieldTests.kt b/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/autowiring/oneBeanForOneType/ServiceWithInjectedFieldTests.kt
@@ -5,14 +5,11 @@ import org.utbot.examples.spring.utils.findAllRepositoryCall
 import org.utbot.examples.spring.utils.saveRepositoryCall
 import org.utbot.examples.spring.utils.springAdditionalDependencies
 import org.utbot.examples.spring.utils.springMockStrategy
-import org.utbot.examples.spring.utils.standardSpringTestingConfigurations
-import org.utbot.framework.plugin.api.MockStrategyApi
 import org.utbot.testcheckers.eq
 import org.utbot.testing.*
 
-internal class ServiceWithInjectedFieldTests : UtValueTestCaseChecker(
+internal class ServiceWithInjectedFieldTests : SpringNoConfigUtValueTestCaseChecker(
     testClass = ServiceWithInjectedField::class,
-    configurations = standardSpringTestingConfigurations
 ) {
     @Test
     fun testGetOrders() {
diff --git a/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/autowiring/oneBeanForOneType/SpringNoConfigUtValueTestCaseChecker.kt b/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/autowiring/oneBeanForOneType/SpringNoConfigUtValueTestCaseChecker.kt
@@ -0,0 +1,14 @@
+package org.utbot.examples.spring.autowiring.oneBeanForOneType
+
+import org.utbot.examples.spring.utils.standardSpringTestingConfigurations
+import org.utbot.testing.UtValueTestCaseChecker
+import org.utbot.testing.springNoConfigApplicationContext
+import kotlin.reflect.KClass
+
+abstract class SpringNoConfigUtValueTestCaseChecker(
+    testClass: KClass<*>
+) : UtValueTestCaseChecker(
+    testClass,
+    configurations = standardSpringTestingConfigurations,
+    applicationContext = springNoConfigApplicationContext
+)
diff --git a/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/utils/SpringTestingConfiguration.kt b/utbot-spring-test/src/test/kotlin/org/utbot/examples/spring/utils/SpringTestingConfiguration.kt
@@ -5,9 +5,6 @@ import org.springframework.data.repository.PagingAndSortingRepository
 import org.utbot.framework.codegen.domain.ParametrizedTestSource
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.MockStrategyApi
-import org.utbot.framework.plugin.api.SpringApplicationContext
-import org.utbot.framework.plugin.api.SpringSettings
-import org.utbot.framework.plugin.api.SpringTestType
 import org.utbot.testing.SpringConfiguration
 import org.utbot.testing.TestExecution
 
diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/CodeGenerationIntegrationTest.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/CodeGenerationIntegrationTest.kt
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.fail
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor
 import org.utbot.framework.codegen.domain.ParametrizedTestSource
+import org.utbot.framework.context.ApplicationContext
 import java.nio.file.Path
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -31,6 +32,7 @@ abstract class CodeGenerationIntegrationTest(
     private val testClass: KClass<*>,
     private var testCodeGeneration: Boolean = true,
     private val configurationsToTest: List<AbstractConfiguration>,
+    private val applicationContext: ApplicationContext = defaultApplicationContext,
 ) {
     private val testSets: MutableList<UtMethodTestSet> = arrayListOf()
 
@@ -102,7 +104,7 @@ abstract class CodeGenerationIntegrationTest(
                         )
 
                         val pipelineConfig = TestCodeGeneratorPipeline.configurePipeline(configuration)
-                        TestCodeGeneratorPipeline(pipelineConfig).runClassesCodeGenerationTests(classStages)
+                        TestCodeGeneratorPipeline(pipelineConfig, applicationContext).runClassesCodeGenerationTests(classStages)
                     } catch (e: RuntimeException) {
                         logger.warn(e) { "error in test pipeline" }
                         pipelineErrors.add(e.message)
diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/Configurations.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/Configurations.kt
@@ -2,34 +2,56 @@ package org.utbot.testing
 
 import org.utbot.framework.codegen.domain.ParametrizedTestSource
 import org.utbot.framework.codegen.domain.ProjectType
+import org.utbot.framework.context.simple.SimpleApplicationContext
+import org.utbot.framework.context.simple.SimpleMockerContext
+import org.utbot.framework.context.spring.SpringApplicationContextImpl
 import org.utbot.framework.plugin.api.CodegenLanguage
-import org.utbot.framework.plugin.api.SpringApplicationContext
+import org.utbot.framework.plugin.api.MockStrategyApi
 import org.utbot.framework.plugin.api.SpringSettings
 import org.utbot.framework.plugin.api.SpringTestType
 
-abstract class AbstractConfiguration(
-    val projectType: ProjectType,
-    open val language: CodegenLanguage,
-    open val parametrizedTestSource: ParametrizedTestSource,
-    open val lastStage: Stage,
-)
+interface AbstractConfiguration {
+    val projectType: ProjectType
+    val mockStrategy: MockStrategyApi
+    val language: CodegenLanguage
+    val parametrizedTestSource: ParametrizedTestSource
+    val lastStage: Stage
+}
 
 data class Configuration(
     override val language: CodegenLanguage,
     override val parametrizedTestSource: ParametrizedTestSource,
     override val lastStage: Stage,
-): AbstractConfiguration(ProjectType.PureJvm, language, parametrizedTestSource, lastStage)
+): AbstractConfiguration {
+    override val projectType: ProjectType
+        get() = ProjectType.PureJvm
+
+    override val mockStrategy: MockStrategyApi
+        get() = MockStrategyApi.defaultItem
+}
 
 data class SpringConfiguration(
     override val language: CodegenLanguage,
     override val parametrizedTestSource: ParametrizedTestSource,
     override val lastStage: Stage,
-): AbstractConfiguration(ProjectType.Spring, language, parametrizedTestSource, lastStage)
+): AbstractConfiguration {
+    override val projectType: ProjectType
+        get() = ProjectType.Spring
+
+    override val mockStrategy: MockStrategyApi
+        get() = MockStrategyApi.springDefaultItem
+}
 
-val defaultSpringApplicationContext = SpringApplicationContext(
-    mockInstalled = true,
-    staticsMockingIsConfigured = true,
-    shouldUseImplementors = false,
+val defaultApplicationContext = SimpleApplicationContext(
+    SimpleMockerContext(
+        mockFrameworkInstalled = true,
+        staticsMockingIsConfigured = true,
+    )
+)
+
+val springNoConfigApplicationContext = SpringApplicationContextImpl(
+    delegateContext = defaultApplicationContext,
     springTestType = SpringTestType.UNIT_TEST,
-    springSettings = SpringSettings.AbsentSpringSettings(),
-)
+    springSettings = SpringSettings.AbsentSpringSettings,
+    beanDefinitions = emptyList()
+)
diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt
@@ -8,14 +8,13 @@ import org.utbot.common.info
 import org.utbot.framework.codegen.generator.CodeGeneratorResult
 import org.utbot.framework.codegen.domain.ForceStaticMocking
 import org.utbot.framework.codegen.domain.ParametrizedTestSource
-import org.utbot.framework.codegen.domain.ProjectType
 import org.utbot.framework.codegen.domain.StaticsMocking
 import org.utbot.framework.codegen.domain.TestFramework
-import org.utbot.framework.codegen.generator.CodeGenerator
-import org.utbot.framework.codegen.generator.SpringCodeGenerator
+import org.utbot.framework.codegen.generator.CodeGeneratorParams
 import org.utbot.framework.codegen.services.language.CgLanguageAssistant
 import org.utbot.framework.codegen.tree.ututils.UtilClassKind
 import org.utbot.framework.codegen.tree.ututils.UtilClassKind.Companion.UT_UTILS_INSTANCE_NAME
+import org.utbot.framework.context.ApplicationContext
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.description
@@ -27,7 +26,10 @@ import kotlin.reflect.KClass
 
 internal val logger = KotlinLogging.logger {}
 
-class TestCodeGeneratorPipeline(private val testInfrastructureConfiguration: TestInfrastructureConfiguration) {
+class TestCodeGeneratorPipeline(
+    private val testInfrastructureConfiguration: TestInfrastructureConfiguration,
+    private val applicationContext: ApplicationContext
+) {
 
     fun runClassesCodeGenerationTests(classesStages: ClassStages) {
         val pipeline = with(classesStages) {
@@ -252,10 +254,10 @@ class TestCodeGeneratorPipeline(private val testInfrastructureConfiguration: Tes
 
         withUtContext(UtContext(classUnderTest.java.classLoader)) {
             val codeGenerator = with(testInfrastructureConfiguration) {
-                when (projectType) {
-                    ProjectType.Spring -> SpringCodeGenerator(
+                applicationContext.createCodeGenerator(
+                    CodeGeneratorParams(
                         classUnderTest.id,
-                        projectType = ProjectType.Spring,
+                        projectType = projectType,
                         generateUtilClassFile = generateUtilClassFile,
                         paramNames = params,
                         testFramework = testFramework,
@@ -267,25 +269,8 @@ class TestCodeGeneratorPipeline(private val testInfrastructureConfiguration: Tes
                         parameterizedTestSource = parametrizedTestSource,
                         runtimeExceptionTestsBehaviour = runtimeExceptionTestsBehaviour,
                         enableTestsTimeout = enableTestsTimeout,
-                        springCodeGenerationContext = defaultSpringApplicationContext,
                     )
-                    ProjectType.PureJvm -> CodeGenerator(
-                        classUnderTest.id,
-                        projectType = ProjectType.PureJvm,
-                        generateUtilClassFile = generateUtilClassFile,
-                        paramNames = params,
-                        testFramework = testFramework,
-                        staticsMocking = staticsMocking,
-                        forceStaticMocking = forceStaticMocking,
-                        generateWarningsForStaticMocking = false,
-                        codegenLanguage = codegenLanguage,
-                        cgLanguageAssistant = CgLanguageAssistant.getByCodegenLanguage(codegenLanguage),
-                        parameterizedTestSource = parametrizedTestSource,
-                        runtimeExceptionTestsBehaviour = runtimeExceptionTestsBehaviour,
-                        enableTestsTimeout = enableTestsTimeout
-                    )
-                    else -> error("Unsupported project type $projectType in code generator instantiation")
-                }
+                )
             }
             val testClassCustomName = "${classUnderTest.java.simpleName}GeneratedTest"
 
@@ -331,10 +316,7 @@ class TestCodeGeneratorPipeline(private val testInfrastructureConfiguration: Tes
                 testFramework = TestFramework.defaultItem,
                 codegenLanguage = configuration.language,
                 mockFramework = MockFramework.defaultItem,
-                mockStrategy = when (configuration.projectType) {
-                    ProjectType.Spring -> MockStrategyApi.springDefaultItem
-                    else -> MockStrategyApi.defaultItem
-                },
+                mockStrategy = configuration.mockStrategy,
                 staticsMocking = StaticsMocking.defaultItem,
                 parametrizedTestSource = configuration.parametrizedTestSource,
                 forceStaticMocking = ForceStaticMocking.defaultItem,
diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/TestSpecificTestCaseGenerator.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/TestSpecificTestCaseGenerator.kt
@@ -9,11 +9,10 @@ import org.utbot.engine.UtBotSymbolicEngine
 import org.utbot.engine.util.mockListeners.ForceMockListener
 import org.utbot.engine.util.mockListeners.ForceStaticMockListener
 import org.utbot.framework.UtSettings
-import org.utbot.framework.plugin.api.ApplicationContext
+import org.utbot.framework.context.ApplicationContext
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.MockStrategyApi
-import org.utbot.framework.plugin.api.SpringApplicationContext
 import org.utbot.framework.plugin.api.TestCaseGenerator
 import org.utbot.framework.plugin.api.UtError
 import org.utbot.framework.plugin.api.UtExecution
@@ -37,7 +36,7 @@ class TestSpecificTestCaseGenerator(
     engineActions: MutableList<(UtBotSymbolicEngine) -> Unit> = mutableListOf(),
     isCanceled: () -> Boolean = { false },
     private val taintConfigurationProvider: TaintConfigurationProvider? = null,
-    applicationContext: ApplicationContext = ApplicationContext(),
+    applicationContext: ApplicationContext = defaultApplicationContext,
 ): TestCaseGenerator(
     listOf(buildDir),
     classpath,
diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/UtValueTestCaseChecker.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/UtValueTestCaseChecker.kt
@@ -11,11 +11,11 @@ import org.utbot.engine.prettify
 import org.utbot.framework.SummariesGenerationType
 import org.utbot.framework.UtSettings
 import org.utbot.framework.UtSettings.daysLimitForTempFiles
+import org.utbot.framework.context.ApplicationContext
 import org.utbot.framework.coverage.Coverage
 import org.utbot.framework.coverage.counters
 import org.utbot.framework.coverage.methodCoverage
 import org.utbot.framework.coverage.toAtLeast
-import org.utbot.framework.plugin.api.ApplicationContext
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.ExecutableId
 import org.utbot.framework.plugin.api.FieldId
@@ -26,9 +26,6 @@ import org.utbot.framework.plugin.api.MockStrategyApi
 import org.utbot.framework.plugin.api.MockStrategyApi.NO_MOCKS
 import org.utbot.framework.plugin.api.ObjectMockTarget
 import org.utbot.framework.plugin.api.ParameterMockTarget
-import org.utbot.framework.plugin.api.SpringApplicationContext
-import org.utbot.framework.plugin.api.SpringSettings
-import org.utbot.framework.plugin.api.SpringTestType
 import org.utbot.framework.plugin.api.UtCompositeModel
 import org.utbot.framework.plugin.api.UtConcreteValue
 import org.utbot.framework.plugin.api.UtInstrumentation
@@ -66,6 +63,7 @@ abstract class UtValueTestCaseChecker(
     testClass: KClass<*>,
     testCodeGeneration: Boolean = true,
     val configurations: List<AbstractConfiguration> = standardTestingConfigurations,
+    val applicationContext: ApplicationContext = defaultApplicationContext,
 ) : CodeGenerationIntegrationTest(testClass, testCodeGeneration, configurations) {
     // contains already analyzed by the engine methods
     private val analyzedMethods: MutableMap<MethodWithMockStrategy, MethodResult> = mutableMapOf()
@@ -2018,7 +2016,7 @@ abstract class UtValueTestCaseChecker(
                     )
                     val classStages = ClassStages(classUnderTest, stageStatusCheck, listOf(testSet))
 
-                    TestCodeGeneratorPipeline(testInfrastructureConfiguration).runClassesCodeGenerationTests(classStages)
+                    TestCodeGeneratorPipeline(testInfrastructureConfiguration, applicationContext).runClassesCodeGenerationTests(classStages)
                 }
             }
         }
@@ -2163,11 +2161,7 @@ abstract class UtValueTestCaseChecker(
                 buildInfo.buildDir,
                 buildInfo.dependencyPath,
                 System.getProperty("java.class.path"),
-                applicationContext = if (configurations.any { it is SpringConfiguration }) {
-                    defaultSpringApplicationContext
-                } else {
-                    ApplicationContext()
-                }
+                applicationContext = applicationContext
             )
         }
 
