Skip to content

Commit 2e82dbd

Browse files
EgorkaKulikovEgorkaKulikov
committed
Fix compilation after rebase
1 parent 1c89bdf commit 2e82dbd

4 files changed

Lines changed: 39 additions & 36 deletions

File tree

‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/CodeGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ open class CodeGenerator(
7777
CodeGeneratorResult(
7878
generatedCode = renderer.toString(),
7979
utilClassKind = UtilClassKind.fromCgContextOrNull(context),
80-
testsGenerationReport = testClassFile.testsGenerationReport
80+
testsGenerationReport = astConstructor.testsGenerationReport
8181
)
8282
}
8383
}

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

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
package org.utbot.framework.codegen.tree
22

33
import org.utbot.framework.UtSettings
4-
import org.utbot.framework.codegen.ParametrizedTestSource
5-
import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
6-
import org.utbot.framework.codegen.model.constructor.TestClassModel
7-
import org.utbot.framework.codegen.model.constructor.builtin.TestClassUtilMethodProvider
8-
import org.utbot.framework.codegen.model.constructor.context.CgContext
9-
import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
10-
import org.utbot.framework.codegen.model.constructor.name.CgNameGenerator
11-
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.clearContextRelatedStorage
12-
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getMethodConstructorBy
13-
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
14-
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
15-
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getTestFrameworkManagerBy
16-
import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
17-
import org.utbot.framework.codegen.model.tree.CgAuxiliaryClass
18-
import org.utbot.framework.codegen.model.tree.CgMethodsCluster
19-
import org.utbot.framework.codegen.model.tree.CgMethod
20-
import org.utbot.framework.codegen.model.tree.CgRegion
21-
import org.utbot.framework.codegen.model.tree.CgSimpleRegion
22-
import org.utbot.framework.codegen.model.tree.CgStaticsRegion
23-
import org.utbot.framework.codegen.model.tree.CgClass
24-
import org.utbot.framework.codegen.model.tree.CgClassFile
25-
import org.utbot.framework.codegen.model.tree.CgRealNestedClassesRegion
26-
import org.utbot.framework.codegen.model.tree.CgTestMethod
27-
import org.utbot.framework.codegen.model.tree.CgTestMethodCluster
28-
import org.utbot.framework.codegen.model.tree.CgTripleSlashMultilineComment
29-
import org.utbot.framework.codegen.model.tree.CgUtilEntity
30-
import org.utbot.framework.codegen.model.tree.CgUtilMethod
31-
import org.utbot.framework.codegen.model.tree.buildClass
32-
import org.utbot.framework.codegen.model.tree.buildClassBody
33-
import org.utbot.framework.codegen.model.tree.buildClassFile
34-
import org.utbot.framework.codegen.model.visitor.importUtilMethodDependencies
4+
import org.utbot.framework.codegen.domain.ParametrizedTestSource
5+
import org.utbot.framework.codegen.domain.builtin.TestClassUtilMethodProvider
6+
import org.utbot.framework.codegen.domain.context.CgContext
7+
import org.utbot.framework.codegen.domain.context.CgContextOwner
8+
import org.utbot.framework.codegen.domain.models.CgAuxiliaryClass
9+
import org.utbot.framework.codegen.domain.models.CgClass
10+
import org.utbot.framework.codegen.domain.models.CgClassFile
11+
import org.utbot.framework.codegen.domain.models.CgMethod
12+
import org.utbot.framework.codegen.domain.models.CgMethodTestSet
13+
import org.utbot.framework.codegen.domain.models.CgMethodsCluster
14+
import org.utbot.framework.codegen.domain.models.CgRealNestedClassesRegion
15+
import org.utbot.framework.codegen.domain.models.CgRegion
16+
import org.utbot.framework.codegen.domain.models.CgSimpleRegion
17+
import org.utbot.framework.codegen.domain.models.CgStaticsRegion
18+
import org.utbot.framework.codegen.domain.models.CgTestMethod
19+
import org.utbot.framework.codegen.domain.models.CgTestMethodCluster
20+
import org.utbot.framework.codegen.domain.models.CgTripleSlashMultilineComment
21+
import org.utbot.framework.codegen.domain.models.CgUtilEntity
22+
import org.utbot.framework.codegen.domain.models.CgUtilMethod
23+
import org.utbot.framework.codegen.domain.models.TestClassModel
24+
import org.utbot.framework.codegen.renderer.importUtilMethodDependencies
25+
import org.utbot.framework.codegen.reports.TestsGenerationReport
26+
import org.utbot.framework.codegen.services.CgNameGenerator
27+
import org.utbot.framework.codegen.services.access.CgCallableAccessManager
28+
import org.utbot.framework.codegen.services.framework.MockFrameworkManager
29+
import org.utbot.framework.codegen.services.framework.TestFrameworkManager
30+
import org.utbot.framework.codegen.tree.CgTestClassConstructor.CgComponents.clearContextRelatedStorage
31+
import org.utbot.framework.codegen.tree.CgTestClassConstructor.CgComponents.getMethodConstructorBy
32+
import org.utbot.framework.codegen.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
33+
import org.utbot.framework.codegen.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
34+
import org.utbot.framework.codegen.tree.CgTestClassConstructor.CgComponents.getTestFrameworkManagerBy
35+
3536
import org.utbot.framework.plugin.api.ClassId
3637
import org.utbot.framework.plugin.api.MethodId
3738
import org.utbot.framework.plugin.api.UtExecutionSuccess

‎utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/PythonCodeGenerator.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,14 @@ class PythonCodeGenerator(
7171
context.withTestClassFileScope {
7272
val testClassModel = TestClassModel(classUnderTest, cgTestSets)
7373
context.collectedImports.addAll(importModules)
74-
val testClassFile = PythonCgTestClassConstructor(context).construct(testClassModel)
7574

75+
val astConstructor = PythonCgTestClassConstructor(context)
7676
val renderer = CgAbstractRenderer.makeRenderer(context)
77+
78+
val testClassFile = astConstructor.construct(testClassModel)
7779
testClassFile.accept(renderer)
7880

79-
CodeGeneratorResult(renderer.toString(), testClassFile.testsGenerationReport)
81+
CodeGeneratorResult(renderer.toString(), astConstructor.testsGenerationReport)
8082
}
8183
}
8284
}

‎utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgTestClassConstructor.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.utbot.python.framework.codegen.model.constructor.tree
22

33
import org.utbot.framework.codegen.domain.models.TestClassModel
44
import org.utbot.framework.codegen.domain.context.CgContext
5-
import org.utbot.framework.codegen.domain.models.CgTestClassFile
5+
import org.utbot.framework.codegen.domain.models.CgClassFile
66
import org.utbot.framework.codegen.tree.CgTestClassConstructor
7-
import org.utbot.framework.codegen.tree.buildTestClassFile
7+
import org.utbot.framework.codegen.tree.buildClassFile
88

99
internal class PythonCgTestClassConstructor(context: CgContext) : CgTestClassConstructor(context) {
1010
override fun construct(testClassModel: TestClassModel): CgClassFile {

0 commit comments

Comments
 (0)