Skip to content

Commit d965a21

Browse files
Avoid fully qualified names rendering in mockedConstruction #2175 (#2176)
1 parent 0047d17 commit d965a21

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import org.utbot.framework.codegen.tree.CgStatementConstructor
4848
import org.utbot.framework.codegen.tree.CgStatementConstructorImpl
4949
import org.utbot.framework.codegen.tree.CgVariableConstructor
5050
import org.utbot.framework.codegen.tree.hasAmbiguousOverloadsOf
51+
import org.utbot.framework.codegen.tree.importIfNeeded
5152
import org.utbot.framework.codegen.util.isAccessibleFrom
5253
import org.utbot.framework.plugin.api.ClassId
5354
import org.utbot.framework.plugin.api.ConstructorId
@@ -287,6 +288,10 @@ private class MockitoStaticMocker(context: CgContext, private val mocker: Object
287288
nameGenerator.variableName(MOCKED_CONSTRUCTION_NAME),
288289
mockConstructionInitializer.mockConstructionCall
289290
)
291+
292+
importIfNeeded(MockitoStaticMocking.mockedConstructionClassId)
293+
importIfNeeded(classId)
294+
290295
resources += mockedConstructionDeclaration
291296
+CgAssignment(mockedConstructionDeclaration.variable, mockConstructionInitializer.mockConstructionCall)
292297
mockedStaticConstructions += classId
@@ -351,6 +356,9 @@ private class MockitoStaticMocker(context: CgContext, private val mocker: Object
351356
).also {
352357
resources += it
353358
+CgAssignment(it.variable, classMockStaticCall)
359+
360+
importIfNeeded(MockitoStaticMocking.mockedStaticClassId)
361+
importIfNeeded(classId)
354362
}
355363
}
356364

@@ -367,10 +375,6 @@ private class MockitoStaticMocker(context: CgContext, private val mocker: Object
367375
isMock = true
368376
)
369377
)
370-
val contextParameter = variableConstructor.declareParameter(
371-
mockedConstructionContextClassId,
372-
nameGenerator.variableName("context")
373-
)
374378

375379
val mockAnswerStatements = mutableMapOf<Int, List<CgStatement>>()
376380

@@ -425,12 +429,20 @@ private class MockitoStaticMocker(context: CgContext, private val mocker: Object
425429
listOf(switchCase, CgStatementExecutableCall(mockClassCounter[atomicIntegerGetAndIncrement]()))
426430
}
427431

432+
val contextParameter = variableConstructor.declareParameter(
433+
mockedConstructionContextClassId,
434+
nameGenerator.variableName("context")
435+
)
436+
428437
val answersBlock = CgAnonymousFunction(
429438
voidClassId,
430439
listOf(mockParameter, contextParameter).map { CgParameterDeclaration(it, isVararg = false) },
431440
mockConstructionBody
432441
)
433442

443+
importIfNeeded(mockedConstructionContextClassId)
444+
importIfNeeded(classId)
445+
434446
return MockConstructionBlock(
435447
mockitoClassId[MockitoStaticMocking.mockConstructionMethodId](clazz, answersBlock),
436448
!atMostOneBranchOrAllEmpty

0 commit comments

Comments
 (0)