Skip to content

Commit c74bf37

Browse files
committed
Use RemovingConstructFailsUtExecutionInstrumentation in all Spring tests
1 parent cb633a4 commit c74bf37

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

utbot-framework/src/main/kotlin/org/utbot/framework/context/utils/ConcreteExecutionContextUtils.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ import org.utbot.framework.context.ConcreteExecutionContext
44
import org.utbot.framework.context.ConcreteExecutionContext.FuzzingContextParams
55
import org.utbot.framework.context.JavaFuzzingContext
66
import org.utbot.fuzzing.JavaValueProvider
7+
import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrumentation
8+
9+
fun ConcreteExecutionContext.transformInstrumentationFactory(
10+
transformer: (UtExecutionInstrumentation.Factory<*>) -> UtExecutionInstrumentation.Factory<*>
11+
) = object : ConcreteExecutionContext by this {
12+
override val instrumentationFactory: UtExecutionInstrumentation.Factory<*> =
13+
transformer(this@transformInstrumentationFactory.instrumentationFactory)
14+
}
715

816
fun ConcreteExecutionContext.transformJavaFuzzingContext(
917
transformer: FuzzingContextParams.(JavaFuzzingContext) -> JavaFuzzingContext

utbot-spring-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringApplicationContextImpl.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.utbot.framework.context.TypeReplacer
1515
import org.utbot.framework.context.custom.CoverageFilteringConcreteExecutionContext
1616
import org.utbot.framework.context.custom.RerunningConcreteExecutionContext
1717
import org.utbot.framework.context.custom.useMocks
18+
import org.utbot.framework.context.utils.transformInstrumentationFactory
1819
import org.utbot.framework.context.utils.transformJavaFuzzingContext
1920
import org.utbot.framework.context.utils.transformValueProvider
2021
import org.utbot.framework.plugin.api.BeanDefinitionData
@@ -35,6 +36,7 @@ import org.utbot.fuzzing.spring.decorators.replaceTypes
3536
import org.utbot.fuzzing.spring.properties
3637
import org.utbot.fuzzing.spring.unit.InjectMockValueProvider
3738
import org.utbot.fuzzing.toFuzzerType
39+
import org.utbot.instrumentation.instrumentation.execution.RemovingConstructFailsUtExecutionInstrumentation
3840

3941
class SpringApplicationContextImpl(
4042
private val delegateContext: ApplicationContext,
@@ -115,6 +117,8 @@ class SpringApplicationContextImpl(
115117
springApplicationContext = this
116118
)
117119
)
120+
}.transformInstrumentationFactory { delegateInstrumentationFactory ->
121+
RemovingConstructFailsUtExecutionInstrumentation.Factory(delegateInstrumentationFactory)
118122
}
119123
}
120124

utbot-spring-framework/src/main/kotlin/org/utbot/framework/context/spring/SpringIntegrationTestConcreteExecutionContext.kt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.utbot.framework.plugin.api.isSuccess
1212
import org.utbot.framework.plugin.api.util.SpringModelUtils
1313
import org.utbot.instrumentation.ConcreteExecutor
1414
import org.utbot.instrumentation.getRelevantSpringRepositories
15-
import org.utbot.instrumentation.instrumentation.execution.RemovingConstructFailsUtExecutionInstrumentation
1615
import org.utbot.instrumentation.instrumentation.execution.UtConcreteExecutionResult
1716
import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrumentation
1817
import org.utbot.instrumentation.instrumentation.spring.SpringUtExecutionInstrumentation
@@ -32,15 +31,13 @@ class SpringIntegrationTestConcreteExecutionContext(
3231
}
3332

3433
override val instrumentationFactory: UtExecutionInstrumentation.Factory<*> =
35-
RemovingConstructFailsUtExecutionInstrumentation.Factory(
36-
SpringUtExecutionInstrumentation.Factory(
37-
delegateContext.instrumentationFactory,
38-
springSettings,
39-
springApplicationContext.beanDefinitions,
40-
buildDirs = classpathWithoutDependencies.split(File.pathSeparator)
41-
.map { File(it).toURI().toURL() }
42-
.toTypedArray(),
43-
)
34+
SpringUtExecutionInstrumentation.Factory(
35+
delegateContext.instrumentationFactory,
36+
springSettings,
37+
springApplicationContext.beanDefinitions,
38+
buildDirs = classpathWithoutDependencies.split(File.pathSeparator)
39+
.map { File(it).toURI().toURL() }
40+
.toTypedArray(),
4441
)
4542

4643
override fun loadContext(

0 commit comments

Comments
 (0)