Skip to content

Introduce Tool.USVM in ContestEstimator, implement runUsvmGeneration #2666

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 4 commits into from
Oct 27, 2023
Merged

Introduce Tool.USVM in ContestEstimator, implement runUsvmGeneration #2666

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
0695ab5
Add `Tool.USVM` in `ContestEstimator`, implement `runUsvmGeneration`
IlyaMuravjov Oct 27, 2023
45d6b2c
Remove redundant TODO
IlyaMuravjov Oct 27, 2023
33176fd
Bump UtBot dependencies version to match USVM dependencies
IlyaMuravjov Oct 27, 2023
675a797
Use `UTestExecutionResult.trace` instead of `JcCoverage`
IlyaMuravjov Oct 27, 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
Bump UtBot dependencies version to match USVM dependencies
  • Loading branch information
@IlyaMuravjov
IlyaMuravjov committed Oct 27, 2023
commit 33176fd8ae392fc2c59a481494e70e6cae07fc84
13 changes: 9 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@ junit4PlatformVersion=1.9.0
# NOTE: Mockito versions 5+ are not compatible with Java 8: https://www.davidvlijmincx.com/posts/upgrade-to-mockito-5
mockitoVersion=4.11.0
mockitoInlineVersion=4.11.0
ksmtVersion=0.4.3
# TODO usvm-sbft-merge: UtBot engine uses ksmt 0.4.3, while USVM uses ksmt 0.5.7
ksmtVersion=0.5.7
sootVersion=4.4.0-FORK-2
kotlinVersion=1.8.0
log4j2Version=2.13.3
coroutinesVersion=1.6.3
collectionsVersion=0.3.4
# TODO usvm-sbft-merge: UtBot uses kotlinx.coroutines 1.6.3, while USVM uses kotlinx.coroutines 1.6.4
coroutinesVersion=1.6.4
# TODO usvm-sbft-merge: UtBot uses kotlinx.collections 0.3.4, while USVM uses kotlinx.collections 0.3.5
collectionsVersion=0.3.5
# after updating plugin version you should manually bump corresponding versions in plugin
# as they cannot be set from properties
# utbot-intellij/build.gradle.kts
Expand All @@ -56,7 +59,8 @@ intellijPluginVersion=1.13.1
# every time you bump rd version:
# 1. regenerate all models
# 2. check if rider plugin works
rdVersion=2023.1.2
# TODO usvm-sbft-merge: UtBot engine uses RD 2023.1.2, while USVM uses RD 2023.2.0
rdVersion=2023.2.0
# to enable - add -PincludeRiderInBuild=true in build CLI
includeRiderInBuild=false
jacocoVersion=0.8.8
Expand All @@ -77,6 +81,7 @@ testNgVersion=7.6.0
kamlVersion=0.51.0
jacksonVersion=2.12.3
kotlinxSerializationVersion=1.5.0
# TODO usvm-sbft: USVM uses slf4j 1.6.1
slf4jVersion=1.7.36
eclipseAetherVersion=1.1.0
mavenWagonVersion=3.5.1
Expand Down
5 changes: 3 additions & 2 deletions utbot-framework-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ dependencies {
testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version

implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-core', version: ksmtVersion
implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-z3', version: ksmtVersion
// TODO sbft-usvm-merge: UtBot engine expects `com.github.UnitTestBot.ksmt` here
implementation group: 'io.ksmt', name: 'ksmt-core', version: ksmtVersion
implementation group: 'io.ksmt', name: 'ksmt-z3', version: ksmtVersion
}

// This is required to avoid conflict between SpringBoot standard logger and the logger of our project.
Expand Down
5 changes: 3 additions & 2 deletions utbot-framework/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ dependencies {
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.1'
implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1'

implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-core', version: ksmtVersion
implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-z3', version: ksmtVersion
// TODO sbft-usvm-merge: UtBot engine expects `com.github.UnitTestBot.ksmt` here
implementation group: 'io.ksmt', name: 'ksmt-core', version: ksmtVersion
implementation group: 'io.ksmt', name: 'ksmt-z3', version: ksmtVersion

fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration: 'instrumentationArchive')
}
Expand Down
4 changes: 4 additions & 0 deletions utbot-junit-contest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ dependencies {
implementation group: "org.jacodb", name: "jacodb-analysis", version: jacoDbVersion
implementation group: "org.jacodb", name: "jacodb-approximations", version: jacoDbVersion

// TODO uvms-sbft-hack: UtBot has `fastutil:8.3.0` on the classpath that overrides classes from
// `fastutil-core:8.5.11` that USVM adds. Solution: bump `fastutil` version to `8.5.11`
runtimeOnly("it.unimi.dsi:fastutil:8.5.11")

testImplementation fileTree(dir: 'src/main/resources/projects/', include: '*/*.jar')
testImplementation files('src/main/resources/evosuite/evosuite-1.2.0.jar')
testImplementation files('src/main/resources/evosuite/evosuite-standalone-runtime-1.2.0.jar')
Expand Down
5 changes: 3 additions & 2 deletions utbot-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dependencies {
testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version

implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-core', version: ksmtVersion
implementation group: 'com.github.UnitTestBot.ksmt', name: 'ksmt-z3', version: ksmtVersion
// TODO sbft-usvm-merge: UtBot engine expects `com.github.UnitTestBot.ksmt` here
implementation group: 'io.ksmt', name: 'ksmt-core', version: ksmtVersion
implementation group: 'io.ksmt', name: 'ksmt-z3', version: ksmtVersion
}