From 7a4cb04035848945f07ccad97ec83a13a82679fb Mon Sep 17 00:00:00 2001 From: Kirill Shishin Date: Thu, 6 Jul 2023 18:56:59 +0300 Subject: [PATCH] Correct field modifiers and locate setUp and tearDown methods under test methods --- .../org/utbot/framework/codegen/domain/models/CgElement.kt | 2 +- .../codegen/tree/CgAbstractSpringTestClassConstructor.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/CgElement.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/CgElement.kt index f0e45d4b63..522dffd3eb 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/CgElement.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/domain/models/CgElement.kt @@ -173,7 +173,7 @@ class CgFieldDeclaration( val ownerClassId: ClassId, val declaration: CgDeclaration, val annotation: CgAnnotation? = null, - val visibility: VisibilityModifier = VisibilityModifier.PUBLIC, + val visibility: VisibilityModifier = VisibilityModifier.PRIVATE, ) : CgElement /** diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgAbstractSpringTestClassConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgAbstractSpringTestClassConstructor.kt index 4e7f4761b8..287f18f915 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgAbstractSpringTestClassConstructor.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgAbstractSpringTestClassConstructor.kt @@ -37,8 +37,6 @@ abstract class CgAbstractSpringTestClassConstructor(context: CgContext): fields += constructClassFields(testClassModel) clearUnwantedVariableModels() - methodRegions += constructAdditionalMethods() - for ((testSetIndex, testSet) in testClassModel.methodTestSets.withIndex()) { updateCurrentExecutable(testSet.executableId) withTestSetIdScope(testSetIndex) { @@ -51,6 +49,8 @@ abstract class CgAbstractSpringTestClassConstructor(context: CgContext): } } + methodRegions += constructAdditionalMethods() + if (currentTestClass == outerMostTestClass) { val utilEntities = collectUtilEntities() // If utilMethodProvider is TestClassUtilMethodProvider, then util entities should be declared