Skip to content

Commit e8b13db

Browse files
sergeypospelovsergeypospelov
committed
Additional renamings
1 parent ba1ac51 commit e8b13db

File tree

17 files changed

+80
-72
lines changed

17 files changed

+80
-72
lines changed

‎utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ class BunchTestGeneratorCommand : GenerateTestsAbstractCommand(
104104

105105
val testClassName = "${classUnderTest.simpleName}Test"
106106

107-
val testCases = generateTestCases(
107+
val testSets = generateTestSets(
108108
targetMethods,
109109
searchDirectory = workingDirectory,
110110
chosenClassesToMockAlways = (Mocker.defaultSuperClassesToMockAlwaysNames + classesToMockAlways)
111111
.mapTo(mutableSetOf()) { ClassId(it) }
112112
)
113113

114-
val testClassBody = generateTest(classUnderTest, testClassName, testCases)
114+
val testClassBody = generateTest(classUnderTest, testClassName, testSets)
115115

116116
val outputArgAsFile = File(output ?: "")
117117
if (!outputArgAsFile.exists()) {

‎utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) :
153153
protected fun loadClassBySpecifiedFqn(classFqn: String): KClass<*> =
154154
classLoader.loadClass(classFqn).kotlin
155155

156-
protected fun generateTestCases(
156+
protected fun generateTestSets(
157157
targetMethods: List<UtMethod<*>>,
158158
sourceCodeFile: Path? = null,
159159
searchDirectory: Path,

‎utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,20 +102,20 @@ class GenerateTestsCommand :
102102

103103
val testClassName = output?.toPath()?.toFile()?.nameWithoutExtension
104104
?: "${classUnderTest.simpleName}Test"
105-
val testCases = generateTestCases(
105+
val testSets = generateTestSets(
106106
targetMethods,
107107
Paths.get(sourceCodeFile),
108108
searchDirectory = workingDirectory,
109109
chosenClassesToMockAlways = (Mocker.defaultSuperClassesToMockAlwaysNames + classesToMockAlways)
110110
.mapTo(mutableSetOf()) { ClassId(it) }
111111
)
112-
val testClassBody = generateTest(classUnderTest, testClassName, testCases)
112+
val testClassBody = generateTest(classUnderTest, testClassName, testSets)
113113

114114
if (printToStdOut) {
115115
logger.info { testClassBody }
116116
}
117117
if (sarifReport != null) {
118-
generateReport(targetClassFqn, testCases, testClassBody)
118+
generateReport(targetClassFqn, testSets, testClassBody)
119119
}
120120
saveToFile(testClassBody, output)
121121
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,15 @@ data class GraphResult(
158158
val constraints: Set<UtBoolExpression> = emptySet()
159159
) : InvokeResult()
160160

161-
data class Environment(var method: SootMethod, var state: ExecutionState)
161+
class Environment(
162+
var method: SootMethod,
163+
var state: ExecutionState
164+
) {
165+
val solver by state::solver
166+
val memory by state::memory
167+
val localVariableMemory by state::localVariableMemory
168+
169+
}
162170

163171
data class Step(
164172
val stmt: Stmt,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ class Traverser(
215215
// TODO: move this and other mutable fields to [TraversalContext]
216216
lateinit var environment: Environment
217217
private val solver: UtSolver
218-
get() = environment.state.solver
218+
get() = environment.solver
219219

220220
// TODO HACK violation of encapsulation
221221
val memory: Memory
222-
get() = environment.state.memory
222+
get() = environment.memory
223223

224224
private val localVariableMemory: LocalVariableMemory
225-
get() = environment.state.localVariableMemory
225+
get() = environment.localVariableMemory
226226

227227
//HACK (long strings)
228228
internal var softMaxArraySize = 40

‎utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ object UtBotJavaApi {
102102
}
103103

104104
/**
105-
* Generates test cases using default workflow.
105+
* Generates test sets using default workflow.
106106
*
107-
* @see [fuzzingTestCases]
107+
* @see [fuzzingTestSets]
108108
*/
109109
@JvmStatic
110110
@JvmOverloads
111-
fun generateTestCases(
111+
fun generateTestSets(
112112
methodsForAutomaticGeneration: List<TestMethodInfo>,
113113
classUnderTest: Class<*>,
114114
classpath: String,
@@ -146,11 +146,11 @@ object UtBotJavaApi {
146146
/**
147147
* Generates test cases using only fuzzing workflow.
148148
*
149-
* @see [generateTestCases]
149+
* @see [generateTestSets]
150150
*/
151151
@JvmStatic
152152
@JvmOverloads
153-
fun fuzzingTestCases(
153+
fun fuzzingTestSets(
154154
methodsForAutomaticGeneration: List<TestMethodInfo>,
155155
classUnderTest: Class<*>,
156156
classpath: String,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal class CgTestClassConstructor(val context: CgContext) :
4141
private val testsGenerationReport: TestsGenerationReport = TestsGenerationReport()
4242

4343
/**
44-
* Given a list of test cases constructs CgTestClass
44+
* Given a list of test sets constructs CgTestClass
4545
*/
4646
fun construct(testSets: Collection<UtMethodTestSet>): CgTestClassFile {
4747
return buildTestClassFile {
@@ -50,9 +50,9 @@ internal class CgTestClassConstructor(val context: CgContext) :
5050
id = currentTestClass
5151
body = buildTestClassBody {
5252
cgDataProviderMethods.clear()
53-
for (testCase in testSets) {
54-
updateCurrentExecutable(testCase.method)
55-
val currentMethodUnderTestRegions = construct(testCase)
53+
for (testSet in testSets) {
54+
updateCurrentExecutable(testSet.method)
55+
val currentMethodUnderTestRegions = construct(testSet)
5656
val executableUnderTestCluster = CgExecutableUnderTestCluster(
5757
"Test suites for executable $currentExecutable",
5858
currentMethodUnderTestRegions

‎utbot-framework/src/main/kotlin/org/utbot/framework/coverage/CoverageCalculator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ class MemoryClassLoader : ClassLoader() {
140140
}
141141
}
142142

143-
fun classCoverage(testCases: List<UtMethodValueTestSet<*>>): Coverage =
144-
testCases.map { methodCoverageWithJaCoCo(it.method, it.executions) }.toClassCoverage()
143+
fun classCoverage(testSets: List<UtMethodValueTestSet<*>>): Coverage =
144+
testSets.map { methodCoverageWithJaCoCo(it.method, it.executions) }.toClassCoverage()
145145

146146
fun methodCoverageWithJaCoCo(utMethod: UtMethod<*>, executions: List<UtValueExecution<*>>): Coverage {
147147
val methodSignature = utMethod.callable.signature

‎utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ class GenerateTestsAndSarifReportFacade(
3232
) {
3333
initializeEngine(runtimeClasspath, workingDirectory)
3434

35-
val testCases = generateTestCases(targetClass, workingDirectory)
36-
val testClassBody = generateTestCode(targetClass, testCases)
35+
val testSets = generateTestSets(targetClass, workingDirectory)
36+
val testClassBody = generateTestCode(targetClass, testSets)
3737
targetClass.testsCodeFile.writeText(testClassBody)
3838

39-
generateReport(targetClass, testCases, testClassBody, sourceFindingStrategy)
39+
generateReport(targetClass, testSets, testClassBody, sourceFindingStrategy)
4040
}
4141

4242
companion object {
@@ -69,7 +69,7 @@ class GenerateTestsAndSarifReportFacade(
6969
TestCaseGenerator.init(workingDirectory, classPath, dependencyPaths)
7070
}
7171

72-
private fun generateTestCases(targetClass: TargetClassWrapper, workingDirectory: Path): List<UtMethodTestSet> =
72+
private fun generateTestSets(targetClass: TargetClassWrapper, workingDirectory: Path): List<UtMethodTestSet> =
7373
TestCaseGenerator.generate(
7474
targetClass.targetMethods,
7575
sarifProperties.mockStrategy,

‎utbot-framework/src/main/kotlin/org/utbot/sarif/SarifReport.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ class SarifReport(
7070
val sarifResults = mutableListOf<SarifResult>()
7171
val sarifRules = mutableSetOf<SarifRule>()
7272

73-
for (testCase in testSets) {
74-
for (execution in testCase.executions) {
73+
for (testSet in testSets) {
74+
for (execution in testSet.executions) {
7575
if (shouldProcessExecutionResult(execution.result)) {
7676
val (sarifResult, sarifRule) = processUncheckedException(
77-
method = testCase.method,
77+
method = testSet.method,
7878
utExecution = execution,
7979
uncheckedException = execution.result as UtExecutionFailure
8080
)

‎utbot-framework/src/test/java/org/utbot/examples/manual/UtBotJavaApiTest.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void testMultiMethodClass() {
148148
thirdMethodUnderTest,
149149
thirdMethodState);
150150

151-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
151+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
152152
Arrays.asList(firstTestMethodInfo, secondTestMethodInfo, thirdTestMethodInfo),
153153
MultiMethodExample.class,
154154
classpath,
@@ -220,7 +220,7 @@ public void testCustomPackage() {
220220
Class.class
221221
);
222222

223-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
223+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
224224
Collections.singletonList(
225225
new TestMethodInfo(
226226
methodUnderTest,
@@ -319,7 +319,7 @@ public void testOnObjectWithAssignedArrayField() {
319319
AssignedArray.class
320320
);
321321

322-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
322+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
323323
Collections.singletonList(
324324
new TestMethodInfo(
325325
methodUnderTest,
@@ -405,7 +405,7 @@ public void testClassRef() {
405405
Class.class
406406
);
407407

408-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
408+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
409409
Collections.singletonList(
410410
new TestMethodInfo(
411411
methodUnderTest,
@@ -510,7 +510,7 @@ public void testObjectWithPublicFields() {
510510
DirectAccess.class
511511
);
512512

513-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
513+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
514514
Collections.singletonList(
515515
new TestMethodInfo(
516516
methodUnderTest,
@@ -613,7 +613,7 @@ public void testObjectWithPublicFieldsWithAssembleModel() {
613613
DirectAccess.class
614614
);
615615

616-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
616+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
617617
Collections.singletonList(
618618
new TestMethodInfo(
619619
methodUnderTest,
@@ -702,7 +702,7 @@ public void testOnObjectWithArrayOfPrimitiveArrays() {
702702
ArrayOfPrimitiveArrays.class
703703
);
704704

705-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
705+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
706706
Collections.singletonList(
707707
new TestMethodInfo(
708708
methodUnderTest,
@@ -797,7 +797,7 @@ public void testProvided3() {
797797
B.class
798798
);
799799

800-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
800+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
801801
Collections.singletonList(
802802
new TestMethodInfo(
803803
methodUnderTest,
@@ -869,7 +869,7 @@ public void testCustomAssertion() {
869869
int.class
870870
);
871871

872-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
872+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
873873
Collections.singletonList(
874874
new TestMethodInfo(
875875
methodUnderTest,
@@ -981,7 +981,7 @@ public void testProvided3Reused() {
981981
int.class
982982
);
983983

984-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
984+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
985985
Collections.singletonList(
986986
new TestMethodInfo(
987987
methodUnderTest,
@@ -1054,7 +1054,7 @@ public void testProvided3Reused() {
10541054
String.class
10551055
);
10561056

1057-
List<UtMethodTestSet> testSets1 = UtBotJavaApi.generateTestCases(
1057+
List<UtMethodTestSet> testSets1 = UtBotJavaApi.generateTestSets(
10581058
Collections.singletonList(
10591059
new TestMethodInfo(
10601060
methodUnderTest2,
@@ -1119,7 +1119,7 @@ public void testProvided1() {
11191119
int.class, int.class, String.class
11201120
);
11211121

1122-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
1122+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
11231123
Collections.singletonList(
11241124
new TestMethodInfo(
11251125
methodUnderTest,
@@ -1195,7 +1195,7 @@ public void testOnObjectWithArrayOfComplexArrays() {
11951195
ArrayOfComplexArrays.class
11961196
);
11971197

1198-
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestCases(
1198+
List<UtMethodTestSet> testSets = UtBotJavaApi.generateTestSets(
11991199
Collections.singletonList(
12001200
new TestMethodInfo(
12011201
methodUnderTest,
@@ -1273,7 +1273,7 @@ public void testFuzzingSimple() {
12731273
TestMethodInfo methodInfo = new TestMethodInfo(
12741274
methodUnderTest,
12751275
methodState);
1276-
List<UtMethodTestSet> testSets1 = UtBotJavaApi.fuzzingTestCases(
1276+
List<UtMethodTestSet> testSets1 = UtBotJavaApi.fuzzingTestSets(
12771277
Collections.singletonList(
12781278
methodInfo
12791279
),

‎utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ internal abstract class UtModelTestCaseChecker(
9393
val utMethod = UtMethod.from(method)
9494

9595
withUtContext(UtContext(utMethod.clazz.java.classLoader)) {
96-
val testCase = executions(utMethod, mockStrategy)
96+
val testSet = executions(utMethod, mockStrategy)
9797

98-
assertTrue(testCase.errors.isEmpty()) {
99-
"We have errors: ${testCase.errors.entries.map { "${it.value}: ${it.key}" }.prettify()}"
98+
assertTrue(testSet.errors.isEmpty()) {
99+
"We have errors: ${testSet.errors.entries.map { "${it.value}: ${it.key}" }.prettify()}"
100100
}
101101

102-
val executions = testCase.executions
102+
val executions = testSet.executions
103103
assertTrue(branches(executions.size)) {
104104
"Branch count matcher '$branches' fails for #executions=${executions.size}: ${executions.prettify()}"
105105
}
106106
executions.checkMatchers(matchers, arguments)
107107

108-
processTestCase(testCase)
108+
processTestCase(testSet)
109109
}
110110
}
111111

0 commit comments

Comments
 (0)