Group contexts in packages by their kind (simple and Spring)

Author: IlyaMuravjov

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

@@ -19,7 +19,7 @@ import kotlinx.collections.immutable.persistentListOf
 import org.utbot.common.nameOfPackage
 import org.utbot.engine.types.OBJECT_TYPE
 import org.utbot.engine.util.mockListeners.MockListenerController
-import org.utbot.framework.context.mocker.MockerContext
+import org.utbot.framework.context.MockerContext
 import org.utbot.framework.plugin.api.util.isInaccessibleViaReflection
 import soot.BooleanType
 import soot.RefType

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

@@ -34,7 +34,7 @@ import org.utbot.framework.UtSettings.pathSelectorType
 import org.utbot.framework.UtSettings.processUnknownStatesDuringConcreteExecution
 import org.utbot.framework.UtSettings.useDebugVisualization
 import org.utbot.framework.context.ApplicationContext
-import org.utbot.framework.context.SpringApplicationContext
+import org.utbot.framework.context.spring.SpringApplicationContext
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.Step
 import org.utbot.framework.plugin.api.util.*

utbot-framework/src/main/kotlin/org/utbot/framework/context/ApplicationContext.kt

@@ -1,6 +1,5 @@
 package org.utbot.framework.context
 
-import org.utbot.framework.context.mocker.MockerContext
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodeGenerationContext
 import org.utbot.framework.plugin.api.TypeReplacementMode

utbot-framework/src/main/kotlin/org/utbot/framework/context/mocker/MockerContext.kt renamed to utbot-framework/src/main/kotlin/org/utbot/framework/context/MockerContext.kt

@@ -1,4 +1,4 @@
-package org.utbot.framework.context.mocker
+package org.utbot.framework.context
 
 interface MockerContext {
     /**

utbot-framework/src/main/kotlin/org/utbot/framework/context/SimpleApplicationContext.kt renamed to utbot-framework/src/main/kotlin/org/utbot/framework/context/simple/SimpleApplicationContext.kt

@@ -1,7 +1,8 @@
-package org.utbot.framework.context
+package org.utbot.framework.context.simple
 
 import org.utbot.framework.UtSettings
-import org.utbot.framework.context.mocker.MockerContext
+import org.utbot.framework.context.ApplicationContext
+import org.utbot.framework.context.MockerContext
 import org.utbot.framework.isFromTrustedLibrary
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.TypeReplacementMode

utbot-framework/src/main/kotlin/org/utbot/framework/context/mocker/SimpleMockerContext.kt renamed to utbot-framework/src/main/kotlin/org/utbot/framework/context/simple/SimpleMockerContext.kt

@@ -1,4 +1,6 @@
-package org.utbot.framework.context.mocker
+package org.utbot.framework.context.simple
+
+import org.utbot.framework.context.MockerContext
 
 class SimpleMockerContext(
     override val mockFrameworkInstalled: Boolean,

utbot-framework/src/main/kotlin/org/utbot/framework/context/SpringApplicationContext.kt renamed to utbot-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringApplicationContext.kt

@@ -1,8 +1,9 @@
-package org.utbot.framework.context
+package org.utbot.framework.context.spring
 
 import mu.KotlinLogging
 import org.utbot.common.isAbstract
 import org.utbot.common.isStatic
+import org.utbot.framework.context.ApplicationContext
 import org.utbot.framework.plugin.api.BeanDefinitionData
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.SpringCodeGenerationContext

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt

@@ -26,8 +26,9 @@ import org.utbot.framework.UtSettings.disableCoroutinesDebug
 import org.utbot.framework.UtSettings.utBotGenerationTimeoutInMillis
 import org.utbot.framework.UtSettings.warmupConcreteExecution
 import org.utbot.framework.context.ApplicationContext
-import org.utbot.framework.context.SimpleApplicationContext
-import org.utbot.framework.context.SpringApplicationContext
+import org.utbot.framework.context.simple.SimpleApplicationContext
+import org.utbot.framework.context.simple.SimpleMockerContext
+import org.utbot.framework.context.spring.SpringApplicationContext
 import org.utbot.framework.plugin.api.utils.checkFrameworkDependencies
 import org.utbot.framework.minimization.minimizeTestCase
 import org.utbot.framework.plugin.api.util.SpringModelUtils.entityClassIds

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

@@ -48,10 +48,9 @@ import org.utbot.framework.CancellationStrategyType.NONE
 import org.utbot.framework.CancellationStrategyType.SAVE_PROCESSED_RESULTS
 import org.utbot.framework.UtSettings
 import org.utbot.framework.codegen.domain.ProjectType.*
-import org.utbot.framework.context.ApplicationContext
-import org.utbot.framework.context.SimpleApplicationContext
-import org.utbot.framework.context.SpringApplicationContext
-import org.utbot.framework.context.mocker.SimpleMockerContext
+import org.utbot.framework.context.simple.SimpleApplicationContext
+import org.utbot.framework.context.spring.SpringApplicationContext
+import org.utbot.framework.context.simple.SimpleMockerContext
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.SpringSettings.*
 import org.utbot.framework.plugin.api.SpringConfiguration.*

utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt

@@ -16,9 +16,9 @@ import org.utbot.framework.codegen.generator.SpringCodeGenerator
 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.SimpleApplicationContext
-import org.utbot.framework.context.SpringApplicationContext
-import org.utbot.framework.context.mocker.SimpleMockerContext
+import org.utbot.framework.context.simple.SimpleApplicationContext
+import org.utbot.framework.context.spring.SpringApplicationContext
+import org.utbot.framework.context.simple.SimpleMockerContext
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.description