Skip to content

Fix creation of variables for class fields #2713

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
EgorkaKulikov merged 1 commit into from
Dec 11, 2023
Merged

Fix creation of variables for class fields #2713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions .../main/kotlin/org/utbot/framework/codegen/tree/fieldmanager/CgAbstractClassFieldManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,21 @@ abstract class CgAbstractClassFieldManager(context: CgContext) :

val baseVarName = constructBaseVarName(model)

// `withNameScope` is used to avoid saving names for sub-models of model
/*
* `withNameScope` is used to avoid saving names for sub-models of model.
*
* Different models from different executions may have the same id.
* Therefore, when creating a variable for a new class field and using existing `currentTestSetId` and `currentExecutionId`,
* field`s `model.wrap()` may match one of the values in `annotatedModels`.
* To avoid false matches when creating a variable for a new class field, `withTestSetIdScope(-1)` and `withExecutionIdScope(-1)` are used.
*/
val createdVariable = withNameScope {
variableConstructor.getOrCreateVariable(model, baseVarName) as? CgVariable
?: error("`CgVariable` cannot be constructed from a $model model")
withTestSetIdScope(-1) {
withExecutionIdScope(-1) {
variableConstructor.getOrCreateVariable(model, baseVarName) as? CgVariable
?: error("`CgVariable` cannot be constructed from a $model model")
}
}
}
existingVariableNames.add(createdVariable.name)

Expand Down