Commiteb8ece9

authored

Consider dynamically created mocks when pre minimizing fuzzer output and properly initialize@mock fields (#2569)

* Consider dynamically created mocks when pre minimizing fuzzer output* Clear already initialized field models after constructing class fields

1 parentb775394 commiteb8ece9Copy full SHA for eb8ece9

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ class UtBotSymbolicEngine(`
`516`	`516`	`trieNode= descr.tracer.add(coveredInstructions)`
`517`	`517`
`518`	`518`	`val earlierStateBeforeSize= coverageToMinStateBeforeSize[trieNode]`
`519`		`-val curStateBeforeSize= stateBefore.calculateSize()`
	`519`	`+val curStateBeforeSize=concreteExecutionResult.stateBefore.calculateSize()`
`520`	`520`
`521`	`521`	`if (earlierStateBeforeSize==null\|\| curStateBeforeSize< earlierStateBeforeSize)`
`522`	`522`	`coverageToMinStateBeforeSize[trieNode]= curStateBeforeSize`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ abstract class CgAbstractSpringTestClassConstructor(context: CgContext) :`
`31`	`31`	`fields+= constructClassFields(testClassModel)`
`32`	`32`	`clearUnwantedVariableModels()`
`33`	`33`
	`34`	`+// constructClassFields may mark fields as initialized, while they are in`
	`35`	`+// fact not initialized, so we clearAlreadyInitializedFieldModels()`
	`36`	`+ variableConstructor.clearAlreadyInitializedFieldModels()`
	`37`	`+`
`34`	`38`	`constructAdditionalTestMethods()?.let { methodRegions+= it }`
`35`	`39`
`36`	`40`	`for ((testSetIndex, testSet)in testClassModel.methodTestSets.withIndex()) {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ class CgSpringVariableConstructor(context: CgContext) : CgVariableConstructor(co`
`14`	`14`
`15`	`15`	`privateval fieldManagerFacade=ClassFieldManagerFacade(context)`
`16`	`16`
	`17`	`+funclearAlreadyInitializedFieldModels() {`
	`18`	`+ fieldManagerFacade.clearAlreadyInitializedModels()`
	`19`	`+ }`
	`20`	`+`
`17`	`21`	`overridefungetOrCreateVariable(model:UtModel,name:String?):CgValue {`
`18`	`22`	`val variable= fieldManagerFacade.constructVariableForField(model)`
`19`	`23`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ class ClassFieldManagerFacade(context: CgContext) : CgContextOwner by context {`
`11`	`11`
`12`	`12`	`privateval alreadyInitializedModels= mutableSetOf<UtModelWrapper>()`
`13`	`13`
	`14`	`+funclearAlreadyInitializedModels() {`
	`15`	`+ alreadyInitializedModels.clear()`
	`16`	`+ }`
	`17`	`+`
`14`	`18`	`funconstructVariableForField(model:UtModel):CgValue? {`
`15`	`19`	`relevantFieldManagers.forEach { manager->`
`16`	`20`	`val alreadyCreatedVariable= manager.findCgValueByModel(model, manager.annotatedModels)`

Comments

(0)