Merge remote-tracking branch 'origin/main' into pelevin/builders-prov…

…iders # Conflicts: # utbot-spring-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringApplicationContextImpl.kt
UnitTestBot · Markoutte · Sep 7, 2023 · Sep 7, 2023 · Sep 7, 2023 · Sep 8, 2023
commit b9de69dba05b12ea3261a1df56de22d78da7a4fe
diff --git a/...mework/src/main/kotlin/org/utbot/framework/context/spring/SpringApplicationContextImpl.kt b/...mework/src/main/kotlin/org/utbot/framework/context/spring/SpringApplicationContextImpl.kt
@@ -75,11 +75,14 @@ class SpringApplicationContextImpl(
                     )
                     .mockAllTypesWithoutSpecificValueProvider()
             }
-            SpringTestType.INTEGRATION_TEST -> SpringIntegrationTestConcreteExecutionContext(
-                delegateConcreteExecutionContext,
-                classpathWithoutDependencies,
-                this
-            )
+            SpringTestType.INTEGRATION_TEST ->
+                RerunningConcreteExecutionContext(
+                    SpringIntegrationTestConcreteExecutionContext(
+                        delegateConcreteExecutionContext,
+                        classpathWithoutDependencies,
+                        springApplicationContext = this
+                    )
+                )
         }.transformValueProvider { it.useNullForPartiallyUnresolvableClasses() }
     }