Skip to content

Initial implementations of the adapter from JcExecution to UtExecution #2677

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
EgorkaKulikov merged 31 commits into from
Nov 9, 2023
Merged

Initial implementations of the adapter from JcExecution to UtExecution #2677

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6d4f05c
Some awful attempts
EgorkaKulikov Oct 28, 2023
4aa8a10
Initially implemented a converter of UTestInst to UtModel
EgorkaKulikov Oct 30, 2023
ddcf870
Refactor JcToUtModelConverter basing on UTestInst2UtModel converter
EgorkaKulikov Oct 31, 2023
9532b8a
Some steps to implement JcToUtExecutionConverter
EgorkaKulikov Oct 31, 2023
d79ea8b
Implement minimalistic jc to ut execution conversion, enable codegen
IlyaMuravjov Nov 1, 2023
8e30b30
Some improvements
EgorkaKulikov Nov 1, 2023
5935d7b
DeepMapper for models is used
EgorkaKulikov Nov 3, 2023
535abb0
Corrections
EgorkaKulikov Nov 3, 2023
509cb73
Some improvements to JcToUtModelConverter
EgorkaKulikov Nov 3, 2023
21bde03
Further improvements to JcToUtModelConverter
EgorkaKulikov Nov 3, 2023
6471f07
Another converter little improvement
EgorkaKulikov Nov 3, 2023
c14067f
Improve `UtExecutionFailure` creation
IlyaMuravjov Nov 3, 2023
20967a9
Finish implementing `JcToUtModelConverter`
IlyaMuravjov Nov 5, 2023
bf6d497
Refactor nullability in `JcToUtModelConverter` and `JcToUtExecutionCo…
IlyaMuravjov Nov 5, 2023
1a893ad
First version of JC to UT converters without overusing `Descriptor2Va…
IlyaMuravjov Nov 5, 2023
1717235
Processed forgotten call method expression
EgorkaKulikov Nov 7, 2023
f2debe4
Make conversion more class-friendly (do not fail if one method cause …
EgorkaKulikov Nov 7, 2023
c191ed3
Make it possible to use samples in ContestEstimator
EgorkaKulikov Nov 7, 2023
e61cef4
Tested on all primitives
EgorkaKulikov Nov 7, 2023
bb82a6b
contrflow tests added
EgorkaKulikov Nov 7, 2023
13ee51e
More test classes added
EgorkaKulikov Nov 7, 2023
b01d6b3
Add `build/output/test/samples` to `utbot-junit-contest` test projects
IlyaMuravjov Nov 8, 2023
61c1608
Steps to avoid duplicating statements
EgorkaKulikov Nov 8, 2023
f455f99
Merge remote-tracking branch 'origin/egor/jc_to_ut_models_converter' …
EgorkaKulikov Nov 8, 2023
a31d6b1
Make it working correct on IntExamples.max
EgorkaKulikov Nov 8, 2023
98b4398
Remove OptimizeImportsProcessor (seems it was not called, but a sourc…
EgorkaKulikov Nov 8, 2023
0ca848a
Process UTestStaticMethodCall
EgorkaKulikov Nov 8, 2023
9442c72
Comment out includes for IDE related projects in `settings.gradle.kts`
IlyaMuravjov Nov 8, 2023
f37c1eb
Avoid using burningwave to export modules on Java 8
IlyaMuravjov Nov 8, 2023
cea02dd
Fix review comments
EgorkaKulikov Nov 8, 2023
813c2d6
Fix review comments
EgorkaKulikov Nov 9, 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
Corrections
  • Loading branch information
@EgorkaKulikov @IlyaMuravjov
EgorkaKulikov authored and IlyaMuravjov committed Nov 3, 2023
commit 535abb0fbd9d2d10f183376df20fb0bffbf7fe88
31 changes: 15 additions & 16 deletions utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtExecutionConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,33 @@ import org.utbot.framework.plugin.api.UtExecutionSuccess
import org.utbot.framework.plugin.api.UtExplicitlyThrownException
import org.utbot.framework.plugin.api.UtImplicitlyThrownException
import org.utbot.framework.plugin.api.UtInstrumentation
import org.utbot.framework.plugin.api.mapper.UtModelDeepMapper
import org.utbot.framework.plugin.api.mapper.mapStateBeforeModels
import org.utbot.framework.plugin.api.util.objectClassId
import org.utbot.framework.plugin.api.util.utContext
import org.utbot.fuzzer.IdGenerator

private val logger = KotlinLogging.logger {}

class JcToUtExecutionConverter(
private val jcExecution: JcExecution,
private val idGenerator: IdGenerator<Int>,
private val instructionIdProvider: InstructionIdProvider,
) {
//TODO: obtain in somehow from [JcExecution] or somewhere else
//TODO usvm-sbft: obtain in somehow from [JcExecution] or somewhere else
private val testClassId: ClassId = objectClassId
private val utilMethodProvider = TestClassUtilMethodProvider(testClassId)

private val instConverter = UTestInst2UtModelConverter(utilMethodProvider)
private val toValueConverter = Descriptor2ValueConverter(utContext.classLoader)

fun convert(jcExecution: JcExecution): UtExecution? {
val instToModelCache = instConverter.processUTest(jcExecution.uTest)
val modelConverter = JcToUtModelConverter(instToModelCache)
private var modelConverter: JcToUtModelConverter

init {
val utilMethodProvider = TestClassUtilMethodProvider(testClassId)
val instToModelConverter = UTestInst2UtModelConverter(idGenerator, utilMethodProvider)
val uTestProcessResult = instToModelConverter.processUTest(jcExecution.uTest)

modelConverter = JcToUtModelConverter(idGenerator, uTestProcessResult.exprToModelCache)
}

fun convert(): UtExecution? {
val coverage = convertCoverage(getTrace(jcExecution.uTestExecutionResult), jcExecution.method.enclosingType.jcClass)
// TODO usvm-sbft: fill up instrumentation with data from UTest
val instrumentation = emptyList<UtInstrumentation>()
Expand Down Expand Up @@ -98,14 +104,7 @@ class JcToUtExecutionConverter(
}
} ?: return null

return utUsvmExecution.mapModels(UtModelDeepMapper {
instToModelCache[
toValueConverter.cache.getValue(
utModelConstructor.cache.getValue(it)
).origin
] ?: it
})
// TODO usvm-sbft: deep map UtExecution to substitute models build from UTest
return utUsvmExecution
}

private fun toUserRaisedException(exceptionDescriptor: UTestExceptionDescriptor): Throwable? {
Expand Down
57 changes: 57 additions & 0 deletions utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtModelConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@ package org.utbot.contest.usvm

import org.usvm.instrumentation.testcase.api.UTestExpression
import org.usvm.instrumentation.testcase.descriptor.Descriptor2ValueConverter
import org.usvm.instrumentation.testcase.descriptor.UTestArrayDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestClassDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestConstantDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestCyclicReferenceDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestEnumValueDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestExceptionDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestObjectDescriptor
import org.usvm.instrumentation.testcase.descriptor.UTestValueDescriptor
import org.usvm.instrumentation.util.toJavaClass
import org.utbot.framework.codegen.domain.builtin.UtilMethodProvider
import org.utbot.framework.plugin.api.FieldId
import org.utbot.framework.plugin.api.UtArrayModel
import org.utbot.framework.plugin.api.UtAssembleModel
import org.utbot.framework.plugin.api.UtClassRefModel
Expand All @@ -21,12 +29,14 @@ import org.utbot.framework.plugin.api.util.id
import org.utbot.framework.plugin.api.util.jClass
import org.utbot.framework.plugin.api.util.objectClassId
import org.utbot.framework.plugin.api.util.utContext
import org.utbot.fuzzer.IdGenerator
import org.utbot.instrumentation.instrumentation.execution.constructors.StateBeforeAwareIdGenerator
import org.utbot.instrumentation.instrumentation.execution.constructors.UtModelConstructor
import org.utbot.instrumentation.instrumentation.execution.constructors.javaStdLibModelWithCompositeOriginConstructors
import java.util.*

class JcToUtModelConverter(
private val idGenerator: IdGenerator<Int>,
private val instToModelCache: Map<UTestExpression, UtModel>,
) {

Expand All @@ -41,12 +51,59 @@ class JcToUtModelConverter(
}
)

private val descriptorToModelCache = mutableMapOf<UTestValueDescriptor, UtModel>()

fun convert(valueDescriptor: UTestValueDescriptor?): UtModel {
valueDescriptor?.origin?.let {
return instToModelCache.getValue(it as UTestExpression)
}

// TODO usvm-sbft: ask why `UTestExecutionSuccessResult.result` is nullable
if (valueDescriptor == null) {
return UtNullModel(objectClassId)
}

when (valueDescriptor) {
is UTestObjectDescriptor -> {
val fields = mutableMapOf<FieldId, UtModel>()

val model = UtCompositeModel(
id = idGenerator.createId(),
classId = valueDescriptor.type.classId,
isMock = false,
mocks = mutableMapOf(),
fields = fields,
)

descriptorToModelCache[valueDescriptor] = model
// add fields
}

is UTestArrayDescriptor.Array -> TODO()
is UTestArrayDescriptor.BooleanArray -> TODO()
is UTestArrayDescriptor.ByteArray -> TODO()
is UTestArrayDescriptor.CharArray -> TODO()
is UTestArrayDescriptor.DoubleArray -> TODO()
is UTestArrayDescriptor.FloatArray -> TODO()
is UTestArrayDescriptor.IntArray -> TODO()
is UTestArrayDescriptor.LongArray -> TODO()
is UTestArrayDescriptor.ShortArray -> TODO()
is UTestClassDescriptor -> TODO()
is UTestConstantDescriptor.Boolean -> TODO()
is UTestConstantDescriptor.Byte -> TODO()
is UTestConstantDescriptor.Char -> TODO()
is UTestConstantDescriptor.Double -> TODO()
is UTestConstantDescriptor.Float -> TODO()
is UTestConstantDescriptor.Int -> TODO()
is UTestConstantDescriptor.Long -> TODO()
is UTestConstantDescriptor.Null -> TODO()
is UTestConstantDescriptor.Short -> TODO()
is UTestConstantDescriptor.String -> TODO()
is UTestCyclicReferenceDescriptor -> TODO()
is UTestEnumValueDescriptor -> TODO()
is UTestExceptionDescriptor -> TODO()
}

val concreteValue = toValueConverter.buildObjectFromDescriptor(valueDescriptor)
val objectType = valueDescriptor.type.toJavaClass(classLoader).id

Expand Down
6 changes: 3 additions & 3 deletions utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/UTestInst2UtModelConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import org.utbot.framework.plugin.api.UtNullModel
import org.utbot.framework.plugin.api.UtPrimitiveModel
import org.utbot.framework.plugin.api.util.id
import org.utbot.framework.plugin.api.util.objectClassId
import org.utbot.fuzzer.IdGenerator
import org.utbot.fuzzer.ReferencePreservingIntIdGenerator

data class UTestInstOutput(
Expand All @@ -55,10 +56,9 @@ data class UTestInstOutput(
)

class UTestInst2UtModelConverter(
private val utilMethodProvider: UtilMethodProvider
private val idGenerator: IdGenerator<Int>,
private val utilMethodProvider: UtilMethodProvider,
) {

private val idGenerator = ReferencePreservingIntIdGenerator()
private val exprToModelCache = mutableMapOf<UTestExpression, UtModel>()
private val instrumentations = mutableListOf<UtInstrumentation>()

Expand Down