Skip to content

Rerun Spring integration tests after minimization with full context reset between tests #2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IlyaMuravjov merged 2 commits into from
Sep 11, 2023
Merged

Rerun Spring integration tests after minimization with full context reset between tests #2574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd21af8
Rerun Spring integration tests on clean context after minimization
IlyaMuravjov Aug 31, 2023
472a971
Construct shallow result models during non-rerun runs
IlyaMuravjov Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Construct shallow result models during non-rerun runs
  • Loading branch information
@IlyaMuravjov
IlyaMuravjov committed Sep 11, 2023
commit 472a97141367887c5b94d5919cba5c59cd26ca60
2 changes: 1 addition & 1 deletion ...in/org/utbot/instrumentation/instrumentation/execution/constructors/UtModelConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class UtModelConstructor(
private val constructedObjects = IdentityHashMap<Any, UtModel>()

companion object {
private const val DEFAULT_MAX_DEPTH = 7L
const val DEFAULT_MAX_DEPTH = 7L

fun createOnlyUserClassesConstructor(
pathsToUserClasses: Set<String>,
Expand Down
9 changes: 8 additions & 1 deletion ...tlin/org/utbot/instrumentation/instrumentation/execution/phases/ModelConstructionPhase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,28 @@ class ModelConstructionPhase(
}
}

private val constructorConfiguration = ConstructorConfiguration()
private lateinit var constructor: UtModelConstructor

class ConstructorConfiguration {
lateinit var cache: IdentityHashMap<Any, UtModel>
lateinit var strategy: UtCompositeModelStrategy
var maxDepth: Long = UtModelConstructor.DEFAULT_MAX_DEPTH
}

fun preconfigureConstructor(block: ConstructorConfiguration.() -> Unit) {
constructorConfiguration.block()
}

fun configureConstructor(block: ConstructorConfiguration.() -> Unit) {
ConstructorConfiguration().run {
constructorConfiguration.run {
block()
constructor = UtModelConstructor(
objectToModelCache = cache,
utModelWithCompositeOriginConstructorFinder = utModelWithCompositeOriginConstructorFinder,
compositeModelStrategy = strategy,
idGenerator = idGenerator,
maxDepth = maxDepth,
)
}
}
Expand Down
3 changes: 3 additions & 0 deletions ...tlin/org/utbot/instrumentation/instrumentation/spring/SpringUtExecutionInstrumentation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ class SpringUtExecutionInstrumentation(

return try {
delegateInstrumentation.invoke(clazz, methodSignature, arguments, parameters) { invokeBasePhases ->
if (!parameters.isRerun)
modelConstructionPhase.preconfigureConstructor { maxDepth = 0 }

phasesWrapper {
// NB! beforeTestMethod() and afterTestMethod() are intentionally called inside phases,
// so they are executed in one thread with method under test
Expand Down