Fix unwanted fields in test class for Spring #2170 (#2185)

sofurihafe · web-flow · commit 169ad42b48ee · 2023-04-26T00:28:29.000+03:00
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/builders/SpringTestClassModelBuilder.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/builders/SpringTestClassModelBuilder.kt
@@ -101,8 +101,10 @@ class SpringTestClassModelBuilder(val context: CgContext): TestClassModelBuilder
                 }
             }
             is UtCompositeModel -> {
+                // Here we traverse fields only.
+                // Traversing mocks as well will result in wrong models playing
+                // a role of class fields with @Mock annotation.
                 currentModel.fields.values.forEach { collectRecursively(it, allModels) }
-                currentModel.mocks.values.asSequence().flatten().forEach { collectRecursively(it, allModels) }
             }
             is UtAssembleModel -> {
                 currentModel.origin?.let { collectRecursively(it, allModels) }

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,10 @@ class SpringTestClassModelBuilder(val context: CgContext): TestClassModelBuilder`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`is UtCompositeModel -> {`
	`104`	`+ // Here we traverse fields only.`
	`105`	`+ // Traversing mocks as well will result in wrong models playing`
	`106`	`+ // a role of class fields with @Mock annotation.`
`104`	`107`	`currentModel.fields.values.forEach { collectRecursively(it, allModels) }`
`105`		`- currentModel.mocks.values.asSequence().flatten().forEach { collectRecursively(it, allModels) }`
`106`	`108`	`}`
`107`	`109`	`is UtAssembleModel -> {`
`108`	`110`	`currentModel.origin?.let { collectRecursively(it, allModels) }`