Skip to content

SBFT'24 An attempt to support UTestGlobalMock in converters #2690

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
IlyaMuravjov merged 3 commits into from
Nov 22, 2023
Merged

SBFT'24 An attempt to support UTestGlobalMock in converters #2690

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fb52bb
An attempt to support UTestGlobalMock in converters
EgorkaKulikov Nov 16, 2023
6f18f7a
Apply review fixes
EgorkaKulikov Nov 18, 2023
ddae79a
Corrected valueModels for global constructors mocks
EgorkaKulikov Nov 22, 2023
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
Apply review fixes
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Nov 22, 2023
commit 6f18f7a1f2fe4a69f2eee0bec5b9fd3dc47a796a
15 changes: 6 additions & 9 deletions ...unit-contest/src/main/kotlin/org/utbot/contest/usvm/converter/JcToUtExecutionConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,13 @@ class JcToUtExecutionConverter(
private val toValueConverter = Descriptor2ValueConverter(utContext.classLoader)

private var jcToUtModelConverter: JcToUtModelConverter
private var instrumentation: List<UtInstrumentation>
private var uTestProcessResult: UTestAnalysisResult

init {
val instToModelConverter = UTestInstToUtModelConverter(idGenerator, jcClasspath, utilMethodProvider)

instToModelConverter.processUTest(jcExecution.uTest).also {
instrumentation = instToModelConverter.findInstrumentations()
}

val instToModelConverter = UTestInstToUtModelConverter(jcExecution.uTest, jcClasspath, idGenerator, utilMethodProvider)
jcToUtModelConverter = JcToUtModelConverter(idGenerator, jcClasspath, instToModelConverter)

uTestProcessResult = instToModelConverter.processUTest()
}

fun convert(): UtExecution? {
Expand All @@ -80,7 +77,7 @@ class JcToUtExecutionConverter(
jcToUtModelConverter.convert(it, EnvironmentStateKind.FINAL)
} ?: UtVoidModel),
coverage = coverage,
instrumentation = instrumentation,
instrumentation = uTestProcessResult.instrumentation,
)
is UTestExecutionExceptionResult -> {
UtUsvmExecution(
Expand All @@ -91,7 +88,7 @@ class JcToUtExecutionConverter(
jcExecution.method,
),
coverage = coverage,
instrumentation = instrumentation,
instrumentation = uTestProcessResult.instrumentation,
)
}

Expand Down
33 changes: 17 additions & 16 deletions ...t-contest/src/main/kotlin/org/utbot/contest/usvm/converter/UTestInstToUtModelConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import org.usvm.instrumentation.testcase.api.UTestShortExpression
import org.usvm.instrumentation.testcase.api.UTestStaticMethodCall
import org.usvm.instrumentation.testcase.api.UTestStringExpression
import org.utbot.framework.codegen.domain.builtin.UtilMethodProvider
import org.utbot.framework.plugin.api.ConstructorId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.FieldId
import org.utbot.framework.plugin.api.MethodId
Expand All @@ -54,19 +53,19 @@ import org.utbot.framework.plugin.api.util.objectClassId
import org.utbot.fuzzer.IdGenerator

class UTestInstToUtModelConverter(
private val idGenerator: IdGenerator<Int>,
private val uTest: UTest,
private val jcClasspath: JcClasspath,
private val idGenerator: IdGenerator<Int>,
private val utilMethodProvider: UtilMethodProvider,
) {
private val exprToModelCache = mutableMapOf<UTestExpression, UtModel>()
private val instrumentations = mutableListOf<UtInstrumentation>()

fun processUTest(uTest: UTest) {
exprToModelCache.clear()
instrumentations.clear()

fun processUTest(): UTestAnalysisResult {
uTest.initStatements.forEach { uInst -> processInst(uInst) }
removeInstantiationCallFromThisInstanceModificationChain(processExpr(uTest.callMethodExpression))

return UTestAnalysisResult(instrumentations)
}

fun findModelByInst(expr: UTestExpression): UtModel {
Expand All @@ -75,8 +74,6 @@ class UTestInstToUtModelConverter(
return alreadyCreatedModel
}

fun findInstrumentations(): List<UtInstrumentation> = instrumentations

private fun removeInstantiationCallFromThisInstanceModificationChain(model: UtModel) {
if (model is UtAssembleModel) {
val instantiationCall = model.instantiationCall
Expand Down Expand Up @@ -307,11 +304,11 @@ class UTestInstToUtModelConverter(
}

is UTestGlobalMock -> {
// Daniil said that we can miss [type] and [fields] when converting to [UtInstrumentation]
val methodsToExprs = uTestExpr.methods.entries
val initMethodExprs = methodsToExprs.filter { it.key.isConstructor }
val otherMethodsExprs = methodsToExprs.minus(initMethodExprs.toSet())

methodsToExprs
.filter { it.key is MethodId }
otherMethodsExprs
.forEach { (jcMethod, uTestExprs) ->
val methodId = jcMethod.toExecutableId(jcClasspath) as MethodId
val valueModels = uTestExprs.map { expr -> processExpr(expr) }
Expand All @@ -323,15 +320,15 @@ class UTestInstToUtModelConverter(
instrumentations += methodInstrumentation
}

methodsToExprs
.filter { it.key is ConstructorId }
initMethodExprs
.forEach { (jcMethod, uTestExprs) ->
val valueModels = uTestExprs.map { expr -> processExpr(expr) }
val methodInstrumentation = UtNewInstanceInstrumentation(
// TODO usvm-sbft looking at [Traverser] ln 1682, this classId does not seem correct
classId = jcMethod.enclosingClass.classId,
instances = valueModels,
callSites = setOf(jcMethod.enclosingClass.classId),
// [UTestGlobalMock] does not have an equivalent of [callSites],
// but it is used only in UtBot instrumentation. We use USVM one, so it is not a problem.
callSites = emptySet(),
)

instrumentations += methodInstrumentation
Expand All @@ -355,4 +352,8 @@ class UTestInstToUtModelConverter(
is UTestArrayLengthExpression -> error("This expression type is not supported")
}
}
}
}

data class UTestAnalysisResult(
val instrumentation: List<UtInstrumentation>,
)