Skip to content

Lessen thisInstance creation in parameterized test generation #1065

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
merged 5 commits into from
Oct 7, 2022
Merged

Lessen thisInstance creation in parameterized test generation #1065

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94e8f9e
Lessen thisInstance creation in parameterized test generation
sofurihafe Oct 3, 2022
88eabf5
Merge branch 'main' into andrey-t/parameterized-tests-this-instance
EgorkaKulikov Oct 4, 2022
0684d2a
Merge branch 'main' into andrey-t/parameterized-tests-this-instance
EgorkaKulikov Oct 7, 2022
339bd64
Avoid incorrect configuration
EgorkaKulikov Oct 7, 2022
30c35ab
Merge branch 'main' into andrey-t/parameterized-tests-this-instance
EgorkaKulikov Oct 7, 2022
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
21 changes: 3 additions & 18 deletions ...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,9 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
substituteStaticFields(statics, isParametrized = true)

// build this instance
thisInstance = genericExecution.stateBefore.thisInstance?.let { currentMethodParameters[CgParameterKind.ThisInstance] }
thisInstance = genericExecution.stateBefore.thisInstance?.let {
variableConstructor.getOrCreateVariable(it)
}

// build arguments for method under test and parameterized test
for (index in genericExecution.stateBefore.parameters.indices) {
Expand Down Expand Up @@ -1430,20 +1432,6 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
val executableUnderTestParameters = testSet.executableId.executable.parameters

return mutableListOf<CgParameterDeclaration>().apply {
// this instance
val thisInstanceModel = genericExecution.stateBefore.thisInstance
if (thisInstanceModel != null) {
val type = wrapTypeIfRequired(thisInstanceModel.classId)
val thisInstance = CgParameterDeclaration(
parameter = declareParameter(
type = type,
name = nameGenerator.variableName(type)
),
isReferenceType = true
)
this += thisInstance
currentMethodParameters[CgParameterKind.ThisInstance] = thisInstance.parameter
}
// arguments
for (index in genericExecution.stateBefore.parameters.indices) {
val argumentName = paramNames[executableUnderTest]?.get(index)
Expand Down Expand Up @@ -1555,9 +1543,6 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c

private fun createExecutionArguments(testSet: CgMethodTestSet, execution: UtExecution): List<CgExpression> {
val arguments = mutableListOf<CgExpression>()
execution.stateBefore.thisInstance?.let {
arguments += variableConstructor.getOrCreateVariable(it)
}

for ((paramIndex, paramModel) in execution.stateBefore.parameters.withIndex()) {
val argumentName = paramNames[testSet.executableId]?.get(paramIndex)
Expand Down
2 changes: 0 additions & 2 deletions utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,13 +745,11 @@ data class CgParameterDeclaration(

/**
* Test method parameter can be one of the following types:
* - this instance for method under test (MUT)
* - argument of MUT with a certain index
* - result expected from MUT with the given arguments
* - exception expected from MUT with the given arguments
*/
sealed class CgParameterKind {
object ThisInstance : CgParameterKind()
data class Argument(val index: Int) : CgParameterKind()
data class Statics(val model: UtModel) : CgParameterKind()
object ExpectedResult : CgParameterKind()
Expand Down