Skip to content

Commit c2e48d0

Browse files
Vassiliy-KudryashovVassiliy-Kudryashov
authored
Merge branch 'main' into ilya_m/spring-rerun
2 parents 61de2cc + 5ee3695 commit c2e48d0

86 files changed

Lines changed: 3076 additions & 218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ if (pythonIde.split(",").contains(ideType)) {
6666
include("utbot-intellij-python")
6767
include("utbot-python-parser")
6868
include("utbot-python-types")
69+
include("utbot-python-executor")
6970
}
7071

7172
include("utbot-spring-sample")

‎utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/PythonGenerateTestsCommand.kt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class PythonGenerateTestsCommand : CliktCommand(
3939
help = "File with Python code to generate tests for."
4040
)
4141

42+
private fun absSourceFile() = sourceFile.toAbsolutePath()
43+
4244
private val pythonClass by option(
4345
"-c", "--class",
4446
help = "Specify top-level (ordinary, not nested) class under test. " +
@@ -132,7 +134,7 @@ class PythonGenerateTestsCommand : CliktCommand(
132134
Success(
133135
topLevelFunctions
134136
.mapNotNull { parseFunctionDefinition(it) }
135-
.map { PythonMethodHeader(it.name.toString(), sourceFile, null) }
137+
.map { PythonMethodHeader(it.name.toString(), absSourceFile(), null) }
136138
)
137139
else {
138140
val topLevelClassMethods = topLevelClasses
@@ -142,7 +144,7 @@ class PythonGenerateTestsCommand : CliktCommand(
142144
.mapNotNull { parseFunctionDefinition(it) }
143145
.map { function ->
144146
val parsedClassName = PythonClassId(cls.name.toString())
145-
PythonMethodHeader(function.name.toString(), sourceFile, parsedClassName)
147+
PythonMethodHeader(function.name.toString(), absSourceFile(), parsedClassName)
146148
}
147149
}
148150
if (topLevelClassMethods.isNotEmpty()) {
@@ -154,7 +156,7 @@ class PythonGenerateTestsCommand : CliktCommand(
154156
val pythonMethodsOpt = selectedMethods.map { functionName ->
155157
topLevelFunctions
156158
.mapNotNull { parseFunctionDefinition(it) }
157-
.map { PythonMethodHeader(it.name.toString(), sourceFile, null) }
159+
.map { PythonMethodHeader(it.name.toString(), absSourceFile(), null) }
158160
.find { it.name == functionName }
159161
?.let { Success(it) }
160162
?: Fail("Couldn't find top-level function $functionName in the source file.")
@@ -174,7 +176,7 @@ class PythonGenerateTestsCommand : CliktCommand(
174176
val fineMethods = methods
175177
.filter { !forbiddenMethods.contains(it.name.toString()) }
176178
.map {
177-
PythonMethodHeader(it.name.toString(), sourceFile, parsedClassId)
179+
PythonMethodHeader(it.name.toString(), absSourceFile(), parsedClassId)
178180
}
179181
if (fineMethods.isNotEmpty())
180182
Success(fineMethods)
@@ -201,8 +203,8 @@ class PythonGenerateTestsCommand : CliktCommand(
201203

202204
@Suppress("UNCHECKED_CAST")
203205
private fun calculateValues(): Optional<Unit> {
204-
val currentPythonModuleOpt = findCurrentPythonModule(directoriesForSysPath, sourceFile)
205-
sourceFileContent = File(sourceFile).readText()
206+
val currentPythonModuleOpt = findCurrentPythonModule(directoriesForSysPath, absSourceFile())
207+
sourceFileContent = File(absSourceFile()).readText()
206208
val pythonMethodsOpt = bind(currentPythonModuleOpt) { getPythonMethods() }
207209

208210
return bind(pack(currentPythonModuleOpt, pythonMethodsOpt)) {
@@ -232,7 +234,7 @@ class PythonGenerateTestsCommand : CliktCommand(
232234

233235
val config = PythonTestGenerationConfig(
234236
pythonPath = pythonPath,
235-
testFileInformation = TestFileInformation(sourceFile.toAbsolutePath(), sourceFileContent, currentPythonModule.dropInitFile()),
237+
testFileInformation = TestFileInformation(absSourceFile(), sourceFileContent, currentPythonModule.dropInitFile()),
236238
sysPathDirectories = directoriesForSysPath.map { it.toAbsolutePath() } .toSet(),
237239
testedMethods = pythonMethods,
238240
timeout = timeout,

‎utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ class UtBotSymbolicEngine(
516516
trieNode = descr.tracer.add(coveredInstructions)
517517

518518
val earlierStateBeforeSize = coverageToMinStateBeforeSize[trieNode]
519-
val curStateBeforeSize = stateBefore.calculateSize()
519+
val curStateBeforeSize = concreteExecutionResult.stateBefore.calculateSize()
520520

521521
if (earlierStateBeforeSize == null || curStateBeforeSize < earlierStateBeforeSize)
522522
coverageToMinStateBeforeSize[trieNode] = curStateBeforeSize

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ abstract class CgAbstractSpringTestClassConstructor(context: CgContext) :
3131
fields += constructClassFields(testClassModel)
3232
clearUnwantedVariableModels()
3333

34+
// constructClassFields may mark fields as initialized, while they are in
35+
// fact not initialized, so we clearAlreadyInitializedFieldModels()
36+
variableConstructor.clearAlreadyInitializedFieldModels()
37+
3438
constructAdditionalTestMethods()?.let { methodRegions += it }
3539

3640
for ((testSetIndex, testSet) in testClassModel.methodTestSets.withIndex()) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ class CgSpringVariableConstructor(context: CgContext) : CgVariableConstructor(co
1414

1515
private val fieldManagerFacade = ClassFieldManagerFacade(context)
1616

17+
fun clearAlreadyInitializedFieldModels() {
18+
fieldManagerFacade.clearAlreadyInitializedModels()
19+
}
20+
1721
override fun getOrCreateVariable(model: UtModel, name: String?): CgValue {
1822
val variable = fieldManagerFacade.constructVariableForField(model)
1923

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ class ClassFieldManagerFacade(context: CgContext) : CgContextOwner by context {
1111

1212
private val alreadyInitializedModels = mutableSetOf<UtModelWrapper>()
1313

14+
fun clearAlreadyInitializedModels() {
15+
alreadyInitializedModels.clear()
16+
}
17+
1418
fun constructVariableForField(model: UtModel): CgValue? {
1519
relevantFieldManagers.forEach { manager ->
1620
val alreadyCreatedVariable = manager.findCgValueByModel(model, manager.annotatedModels)

‎utbot-framework/src/main/kotlin/org/utbot/fuzzer/FuzzerFunctions.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ private object ConstantsFromIfStatement: ConstantsFinder {
8383
// 1. compare (result = local compare constant)
8484
// 2. if result
8585
if (unit is JAssignStmt) {
86+
// Accepts only those assignments statements that uses compare operation on the right
87+
if (unit.rightOp !is JCmpExpr) {
88+
return emptyList()
89+
}
8690
useBoxes = unit.rightOp.useBoxes.mapNotNull { (it as? ImmediateBox)?.value }
8791
ifStatement = nextDirectUnit(graph, unit) as? JIfStmt
8892
}

‎utbot-python-executor/.gitignore‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
dist/
2+
__pycache__/
3+
build/
4+
develop-eggs/
5+
eggs/
6+
.eggs/
7+
lib/
8+
lib64/
9+
parts/
10+
sdist/
11+
var/
12+
wheels/
13+
share/python-wheels/
14+
*.egg-info/
15+
.installed.cfg
16+
*.egg
17+
MANIFEST
18+
.pytest_cache/
19+
poetry.lock
20+
.env/
21+
.venv/
22+
env/
23+
venv/
24+
.mypy_cache/
25+
.dmypy.json
26+
dmypy.json

‎utbot-python-executor/build.gradle.kts‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
val kotlinLoggingVersion: String? by rootProject
2+
3+
val utbotExecutorVersion = File(project.projectDir, "src/main/resources/utbot_executor_version").readText()
4+
// these two properties --- from GRADLE_USER_HOME/gradle.properties
5+
val pypiToken: String? by project
6+
val pythonInterpreter: String? by project
7+
val utbotExecutorPath = File(project.projectDir, "src/main/python/utbot_executor")
8+
val localUtbotExecutorPath = File(utbotExecutorPath, "dist")
9+
10+
tasks.register("cleanDist") {
11+
group = "python"
12+
delete(localUtbotExecutorPath.canonicalPath)
13+
}
14+
15+
val installPoetry =
16+
if (pythonInterpreter != null) {
17+
tasks.register<Exec>("installPoetry") {
18+
group = "python"
19+
workingDir = utbotExecutorPath
20+
commandLine(pythonInterpreter, "-m", "pip", "install", "poetry")
21+
}
22+
} else {
23+
null
24+
}
25+
26+
val setExecutorVersion =
27+
if (pythonInterpreter != null) {
28+
tasks.register<Exec>("setVersion") {
29+
dependsOn(installPoetry!!)
30+
group = "python"
31+
workingDir = utbotExecutorPath
32+
commandLine(pythonInterpreter, "-m", "poetry", "version", utbotExecutorVersion)
33+
}
34+
} else {
35+
null
36+
}
37+
38+
val buildExecutor =
39+
if (pythonInterpreter != null) {
40+
tasks.register<Exec>("buildUtbotExecutor") {
41+
dependsOn(setExecutorVersion!!)
42+
group = "python"
43+
workingDir = utbotExecutorPath
44+
commandLine(pythonInterpreter, "-m", "poetry", "build")
45+
}
46+
} else {
47+
null
48+
}
49+
50+
if (pythonInterpreter != null && pypiToken != null) {
51+
tasks.register<Exec>("publishUtbotExecutor") {
52+
dependsOn(buildExecutor!!)
53+
group = "python"
54+
workingDir = utbotExecutorPath
55+
commandLine(
56+
pythonInterpreter,
57+
"-m",
58+
"poetry",
59+
"publish",
60+
"-u",
61+
"__token__",
62+
"-p",
63+
pypiToken
64+
)
65+
}
66+
}
67+
68+
val installExecutor =
69+
if (pythonInterpreter != null) {
70+
tasks.register<Exec>("installUtbotExecutor") {
71+
dependsOn(buildExecutor!!)
72+
group = "python"
73+
environment("PIP_FIND_LINKS" to localUtbotExecutorPath.canonicalPath)
74+
commandLine(
75+
pythonInterpreter,
76+
"-m",
77+
"pip",
78+
"install",
79+
"utbot_executor==$utbotExecutorVersion"
80+
)
81+
}
82+
} else {
83+
null
84+
}
85+
86+
val installPytest =
87+
if (pythonInterpreter != null) {
88+
tasks.register<Exec>("installPytest") {
89+
group = "pytest"
90+
workingDir = utbotExecutorPath
91+
commandLine(pythonInterpreter, "-m", "pip", "install", "pytest")
92+
}
93+
} else {
94+
null
95+
}
96+
97+
if (pythonInterpreter != null) {
98+
tasks.register<Exec>("runTests") {
99+
dependsOn(installExecutor!!)
100+
dependsOn(installPytest!!)
101+
group = "pytest"
102+
workingDir = utbotExecutorPath
103+
commandLine(
104+
pythonInterpreter,
105+
"-m",
106+
"pytest",
107+
)
108+
}
109+
}

‎utbot-python-executor/src/main/kotlin/org/utbot/python/UtbotExecutor.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.utbot.python
2+
3+
class UtbotExecutor {
4+
}

0 commit comments

Comments
 (0)