Commit d000195

authored

Correct two regressions in Spring codegen (#2247)

1 parent ecd9a4c commit d000195Copy full SHA for d000195

File tree

2 files changed

+19

-11

lines changed

utbot-framework/src/main/kotlin/org/utbot/framework/codegen
- services/framework
  - MockFrameworkManager.kt
- tree
  - CgSpringUnitTestClassConstructor.kt

2 files changed

+19

-11

lines changed

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/MockFrameworkManager.kt‎`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,6 @@ private abstract class StaticMocker(`
`183`	`183`
`184`	`184`	`private class MockitoMocker(context: CgContext) : ObjectMocker(context) {`
`185`	`185`
`186`		`- private val alreadyMockedModels: MutableSet<UtCompositeModel> = Collections.newSetFromMap(IdentityHashMap())`
`187`		`-`
`188`	`186`	`override fun createMock(model: UtCompositeModel, baseName: String): CgVariable {`
`189`	`187`	`val modelClass = getClassOf(model.classId)`
`190`	`188`	`val mockObject = newVar(model.classId, baseName = baseName, isMock = true) { mock(modelClass) }`
`@@ -195,10 +193,6 @@ private class MockitoMocker(context: CgContext) : ObjectMocker(context) {`
`195`	`193`	`}`
`196`	`194`
`197`	`195`	`fun mockForVariable(model: UtCompositeModel, mockObject: CgVariable) {`
`198`		`- if (!alreadyMockedModels.add(model)) {`
`199`		`- return`
`200`		`- }`
`201`		`-`
`202`	`196`	`for ((executable, values) in model.mocks) {`
`203`	`197`	`val matchers = mockitoArgumentMatchersFor(executable)`
`204`	`198`
`@@ -225,7 +219,12 @@ private class MockitoMocker(context: CgContext) : ObjectMocker(context) {`
`225`	`219`	`error("Cannot mock method $executable as it is not accessible from package $testClassPackageName")`
`226`	`220`	`}`
`227`	`221`
`228`		`- val results = values.map { variableConstructor.getOrCreateVariable(it) }.toTypedArray()`
	`222`	`+ val results = values`
	`223`	`+ .map { value ->`
	`224`	`+ // Sometimes we need mocks returning itself, e.g. for StringBuilder.append method`
	`225`	`+ if (value != model) variableConstructor.getOrCreateVariable(value) else mockObject`
	`226`	`+ }`
	`227`	`+ .toTypedArray()`
`229`	`228`	`when`(mockObject[executable](matchers)).thenReturn(executable.returnType, results)
`230`	`229`	`}`
`231`	`230`	`else -> error("Only MethodId was expected to appear in simple mocker but got $executable")`

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgSpringUnitTestClassConstructor.kt‎`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,32 @@ import org.utbot.framework.plugin.api.util.objectClassId`
`21`	`21`
`22`	`22`	`class CgSpringUnitTestClassConstructor(context: CgContext) : CgAbstractSpringTestClassConstructor(context) {`
`23`	`23`
	`24`	`+ private var additionalMethodsRequired: Boolean = false`
	`25`	`+`
`24`	`26`	`private lateinit var mockitoCloseableVariable: CgValue`
`25`	`27`
`26`	`28`	`override fun constructClassFields(testClassModel: SpringTestClassModel): List<CgFieldDeclaration> {`
`27`	`29`	`val fields = mutableListOf<CgFieldDeclaration>()`
`28`		`- val mockedFields = constructFieldsWithAnnotation(testClassModel.thisInstanceDependentMocks, mockClassId)`
`29`	`30`
`30`		`- if (mockedFields.isNotEmpty()) {`
`31`		`- fields += constructFieldsWithAnnotation(testClassModel.thisInstanceModels, injectMocksClassId)`
`32`		`- fields += mockedFields`
	`31`	`+ if (testClassModel.thisInstanceDependentMocks.isNotEmpty()) {`
	`32`	`+ val mockedFields = constructFieldsWithAnnotation(testClassModel.thisInstanceDependentMocks, mockClassId)`
	`33`	`+ val injectingMocksFields = constructFieldsWithAnnotation(testClassModel.thisInstanceModels, injectMocksClassId)`
`33`	`34`
	`35`	`+ fields += injectingMocksFields`
	`36`	`+ fields += mockedFields`
`34`	`37`	`fields += constructMockitoCloseables()`
	`38`	`+`
	`39`	`+ additionalMethodsRequired = true`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`return fields`
`38`	`43`	`}`
`39`	`44`
`40`	`45`	`override fun constructAdditionalMethods(): CgMethodsCluster {`
	`46`	`+ if (!additionalMethodsRequired) {`
	`47`	`+ return CgMethodsCluster(header = null, content = emptyList(),)`
	`48`	`+ }`
	`49`	`+`
`41`	`50`	`importIfNeeded(openMocksMethodId)`
`42`	`51`
`43`	`52`	`val openMocksCall = CgMethodCall(`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d000195

File tree

2 files changed

2 files changed

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/services/framework/MockFrameworkManager.kt‎`

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgSpringUnitTestClassConstructor.kt‎`

0 commit comments