Skip to content

Commit b4d4e8b

Browse files
committed
Move *containsMocking* flag to UtSymbolicExecution
1 parent d8f175b commit b4d4e8b

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ abstract class UtExecution(
103103
var summary: List<DocStatement>? = null,
104104
var testMethodName: String? = null,
105105
var displayName: String? = null
106-
) : UtResult() {
107-
var containsMocking: Boolean = false
108-
}
106+
) : UtResult()
109107

110108
/**
111109
* Symbolic execution.
@@ -138,6 +136,8 @@ class UtSymbolicExecution(
138136
val staticFields: Set<FieldId>
139137
get() = stateBefore.statics.keys
140138

139+
var containsMocking: Boolean = false
140+
141141
override fun toString(): String = buildString {
142142
append("UtSymbolicExecution(")
143143
appendLine()

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/CgMethodTestSet.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import org.utbot.framework.plugin.api.UtExecution
88
import org.utbot.framework.plugin.api.UtExecutionFailure
99
import org.utbot.framework.plugin.api.UtExecutionSuccess
1010
import org.utbot.framework.plugin.api.UtMethodTestSet
11+
import org.utbot.framework.plugin.api.UtSymbolicExecution
1112
import org.utbot.framework.plugin.api.util.objectClassId
1213
import org.utbot.framework.plugin.api.util.voidClassId
14+
import org.utbot.fuzzer.UtFuzzedExecution
1315
import soot.jimple.JimpleBody
1416

1517
data class CgMethodTestSet private constructor(
@@ -69,8 +71,12 @@ data class CgMethodTestSet private constructor(
6971
* Excludes executions with mocking from [CgMethodTestSet].
7072
* */
7173
fun excludeExecutionsWithMocking(): CgMethodTestSet {
72-
val executionsWithoutMocking = executions.filter { !it.containsMocking }
73-
return substituteExecutions(executionsWithoutMocking)
74+
val fuzzedExecutions = executions.filterIsInstance<UtFuzzedExecution>()
75+
val symbolicExecutionsWithoutMocking = executions
76+
.filterIsInstance<UtSymbolicExecution>()
77+
.filter { !it.containsMocking }
78+
79+
return substituteExecutions(symbolicExecutionsWithoutMocking + fuzzedExecutions)
7480
}
7581

7682
/**

utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.utbot.framework.plugin.api.TestCaseGenerator
1616
import org.utbot.framework.plugin.api.UtError
1717
import org.utbot.framework.plugin.api.UtExecution
1818
import org.utbot.framework.plugin.api.UtMethodTestSet
19+
import org.utbot.framework.plugin.api.UtSymbolicExecution
1920
import org.utbot.framework.plugin.api.util.id
2021
import org.utbot.framework.plugin.services.JdkInfoDefaultProvider
2122
import org.utbot.framework.util.Conflict
@@ -69,13 +70,16 @@ class TestSpecificTestCaseGenerator(
6970
.collect {
7071
when (it) {
7172
is UtExecution -> {
72-
if (
73-
conflictTriggers.triggered(Conflict.ForceMockHappened) ||
74-
conflictTriggers.triggered(Conflict.ForceStaticMockHappened)
73+
if (it is UtSymbolicExecution &&
74+
(conflictTriggers.triggered(Conflict.ForceMockHappened) ||
75+
conflictTriggers.triggered(Conflict.ForceStaticMockHappened))
7576
) {
7677
it.containsMocking = true
7778

78-
conflictTriggers.reset(Conflict.ForceMockHappened, Conflict.ForceStaticMockHappened)
79+
conflictTriggers.reset(
80+
Conflict.ForceMockHappened,
81+
Conflict.ForceStaticMockHappened
82+
)
7983
}
8084
executions += it
8185
}

0 commit comments

Comments
 (0)