Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add parameterized test generation in CI #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2022
Merged

Add parameterized test generation in CI #1114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5975728
Add parameterized test generation in ci
sofurihafe Oct 7, 2022
d8f175b
Little style corrections
EgorkaKulikov Oct 11, 2022
b4d4e8b
Move *containsMocking* flag to UtSymbolicExecution
sofurihafe Oct 11, 2022
eab5f7f
Merge branch 'main' into andrey-t/parameterized-tests-pipeline
sofurihafe Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move *containsMocking* flag to UtSymbolicExecution
  • Loading branch information
@sofurihafe
sofurihafe committed Oct 11, 2022
commit b4d4e8b8408eeb58f1aa8ed7c160dfa3848edeef
6 changes: 3 additions & 3 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,7 @@ abstract class UtExecution(
var summary: List<DocStatement>? = null,
var testMethodName: String? = null,
var displayName: String? = null
) : UtResult() {
var containsMocking: Boolean = false
}
) : UtResult()

/**
* Symbolic execution.
Expand Down Expand Up @@ -138,6 +136,8 @@ class UtSymbolicExecution(
val staticFields: Set<FieldId>
get() = stateBefore.statics.keys

var containsMocking: Boolean = false

override fun toString(): String = buildString {
append("UtSymbolicExecution(")
appendLine()
Expand Down
10 changes: 8 additions & 2 deletions ...ramework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/CgMethodTestSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import org.utbot.framework.plugin.api.UtExecution
import org.utbot.framework.plugin.api.UtExecutionFailure
import org.utbot.framework.plugin.api.UtExecutionSuccess
import org.utbot.framework.plugin.api.UtMethodTestSet
import org.utbot.framework.plugin.api.UtSymbolicExecution
import org.utbot.framework.plugin.api.util.objectClassId
import org.utbot.framework.plugin.api.util.voidClassId
import org.utbot.fuzzer.UtFuzzedExecution
import soot.jimple.JimpleBody

data class CgMethodTestSet private constructor(
Expand Down Expand Up @@ -69,8 +71,12 @@ data class CgMethodTestSet private constructor(
* Excludes executions with mocking from [CgMethodTestSet].
* */
fun excludeExecutionsWithMocking(): CgMethodTestSet {
val executionsWithoutMocking = executions.filter { !it.containsMocking }
return substituteExecutions(executionsWithoutMocking)
val fuzzedExecutions = executions.filterIsInstance<UtFuzzedExecution>()
val symbolicExecutionsWithoutMocking = executions
.filterIsInstance<UtSymbolicExecution>()
.filter { !it.containsMocking }

return substituteExecutions(symbolicExecutionsWithoutMocking + fuzzedExecutions)
}

/**
Expand Down
12 changes: 8 additions & 4 deletions ...framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import org.utbot.framework.plugin.api.TestCaseGenerator
import org.utbot.framework.plugin.api.UtError
import org.utbot.framework.plugin.api.UtExecution
import org.utbot.framework.plugin.api.UtMethodTestSet
import org.utbot.framework.plugin.api.UtSymbolicExecution
import org.utbot.framework.plugin.api.util.id
import org.utbot.framework.plugin.services.JdkInfoDefaultProvider
import org.utbot.framework.util.Conflict
Expand Down Expand Up @@ -69,13 +70,16 @@ class TestSpecificTestCaseGenerator(
.collect {
when (it) {
is UtExecution -> {
if (
conflictTriggers.triggered(Conflict.ForceMockHappened) ||
conflictTriggers.triggered(Conflict.ForceStaticMockHappened)
if (it is UtSymbolicExecution &&
(conflictTriggers.triggered(Conflict.ForceMockHappened) ||
conflictTriggers.triggered(Conflict.ForceStaticMockHappened))
) {
it.containsMocking = true

conflictTriggers.reset(Conflict.ForceMockHappened, Conflict.ForceStaticMockHappened)
conflictTriggers.reset(
Conflict.ForceMockHappened,
Conflict.ForceStaticMockHappened
)
}
executions += it
}
Expand Down