Skip to content
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.

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

USVM to UtBot adapters without contest hacks #2710

Merged
merged 123 commits into from
Dec 8, 2023
Merged
Changes from 1 commit
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
fc570ea
Introduce `Tool.USVM` in `ContestEstimator`, implement `runUsvmGenera…
IlyaMuravjov Oct 27, 2023
79cf54b
Bump ksmt version to `0.5.13`
IlyaMuravjov Nov 3, 2023
d5cdd8a
Hacks similar to contest 2023 ones (#2676)
EgorkaKulikov Nov 7, 2023
092a27a
Initial implementations of the adapter from JcExecution to UtExecutio…
EgorkaKulikov Nov 9, 2023
31dd74d
Supporting arrays classId in Contests (#2680)
EgorkaKulikov Nov 10, 2023
b2cb044
Very simple UtAssembleModel improver (#2678)
EgorkaKulikov Nov 10, 2023
3400a96
Fix class name argument in the setField method (#2681)
tepa46 Nov 13, 2023
a11c3e9
Fix test generation for nested classes (#2684)
IlyaMuravjov Nov 13, 2023
2788630
Improver `UTestRunner` initialization and shutdown (#2683)
IlyaMuravjov Nov 13, 2023
62aa5b0
Add summarization for usvm-sbft (#2682)
tepa46 Nov 13, 2023
0a9003d
Use usvm samples instead of UtBot ones (#2685)
EgorkaKulikov Nov 13, 2023
b40f0f3
Fix fieldId creation for UtCompositeModel (#2686)
tepa46 Nov 13, 2023
629983c
A tempopary hack for void TypeName processing
EgorkaKulikov Nov 13, 2023
1d974f7
A proper solution for void TypeName processing
EgorkaKulikov Nov 14, 2023
2b6ff89
Add all arrays as test classes for converters
EgorkaKulikov Nov 14, 2023
5b0e8dd
Add samples from types
EgorkaKulikov Nov 15, 2023
f38dae0
Add samples from ternary
EgorkaKulikov Nov 15, 2023
3080413
Add processing of usvmExistingButNullString (#2689)
tepa46 Nov 15, 2023
26d9901
Fix classloader problem and correct class lists (exclude missing clas…
EgorkaKulikov Nov 15, 2023
8904585
Include usvm via GitHub packages (#2687)
IlyaMuravjov Nov 15, 2023
9869eb0
Upgrade usvm version
EgorkaKulikov Nov 15, 2023
1362ac7
Add invokes into samples
EgorkaKulikov Nov 15, 2023
c365a7a
Add several new classes to samples - Yuri said that it is enough
EgorkaKulikov Nov 16, 2023
7429dc9
Fix enum converter and add sample from enums
tepa46 Nov 16, 2023
9bb144a
Remove non-relevant TODO
EgorkaKulikov Nov 16, 2023
6e6c378
Improve `UTestValueDescriptor` to `UtModel` conversion and state chan…
IlyaMuravjov Nov 18, 2023
5084e02
Update usvm version
EgorkaKulikov Nov 18, 2023
ae1cdcf
Fix `constructConstArrayModelMapper` for empty arrays
IlyaMuravjov Nov 18, 2023
b74f3c8
Remove non-relevant TODO
EgorkaKulikov Nov 20, 2023
5429647
Use jacodb with `classpathWithApproximations`
IlyaMuravjov Nov 20, 2023
96993d9
Reduce concrete execution timeout to 1 second
IlyaMuravjov Nov 20, 2023
e8a30d7
Remove redundant TODO
IlyaMuravjov Nov 20, 2023
ab0a529
Replace generics with bounds when converting to ut models
IlyaMuravjov Nov 20, 2023
75cd001
Correct JacoDb classpath
EgorkaKulikov Nov 20, 2023
eaf85e9
Correct JacoDb classpath
EgorkaKulikov Nov 20, 2023
273335e
Update jacodb (#2694)
Damtev Nov 20, 2023
22e577b
Update approximations version
EgorkaKulikov Nov 21, 2023
9bbb24c
Update usvm version
EgorkaKulikov Nov 21, 2023
623a94f
Make JcMachine's budget distributing strategy and refactor (#2695)
IlyaMuravjov Nov 21, 2023
65dd727
SBFT'24 An attempt to support UTestGlobalMock in converters (#2690)
EgorkaKulikov Nov 22, 2023
26751a5
Introduce and use `JcMachine.analyzeAsync` in `ContestUsvm` (#2696)
IlyaMuravjov Nov 22, 2023
7ed6b08
Make USVM descriptor to UtModel cache consider state kind (initial or…
IlyaMuravjov Nov 22, 2023
5d3ad21
Update gradle script to run tests properly
EgorkaKulikov Nov 23, 2023
208aad4
Update usvm version
EgorkaKulikov Nov 23, 2023
e0f7080
Remove strange hack to discuss later
EgorkaKulikov Nov 23, 2023
272ebbe
Add support for correct generation of inner tests
tepa46 Nov 23, 2023
0a3db6a
Update usvm version
EgorkaKulikov Nov 23, 2023
0eaf9ac
Avoid set fields not present in `UTest` (for `UtCompositeModel`) (#2698)
IlyaMuravjov Nov 24, 2023
ac667bb
Use classpathWithApproximations
EgorkaKulikov Nov 24, 2023
405444f
Fix bug in `assertEquals` for `String` in codegen
IlyaMuravjov Nov 24, 2023
4362bd2
Add timeout execution conversion
IlyaMuravjov Nov 24, 2023
a365f4e
Improve logging time spent on concrete and conversion
IlyaMuravjov Nov 24, 2023
d7134b7
Make logger group repeated exceptions (e.g. "(x100) message")
IlyaMuravjov Nov 24, 2023
f523512
Better log `JcType.classId` fails
IlyaMuravjov Nov 24, 2023
5c82e57
Add notice about `usvmVersion` being outdated
IlyaMuravjov Nov 24, 2023
d25e3bb
Actualise `JcTestExecutor`
IlyaMuravjov Nov 24, 2023
a751085
Update usvm version
EgorkaKulikov Nov 25, 2023
dd5176f
Fix invalid `UTestCyclicReferenceDescriptor`
IlyaMuravjov Nov 27, 2023
1cc84fd
Automatically remove uncompilable test methods (#2699)
IlyaMuravjov Nov 27, 2023
7f1c3a8
Update path selector strategy
EgorkaKulikov Nov 27, 2023
7b58a17
Add a copy of https://github.com/UnitTestBot/UTBotJava/pull/2627 into…
EgorkaKulikov Nov 28, 2023
9eadf92
Update approximations version
EgorkaKulikov Nov 28, 2023
9f4af0b
Use symbolic result instead of concrete if it is better (#2700)
EgorkaKulikov Nov 28, 2023
62f25ad
Avoid class initialization when we evaluate ClassId
EgorkaKulikov Nov 28, 2023
2d09b02
Revert "Avoid class initialization when we evaluate ClassId"
EgorkaKulikov Nov 28, 2023
bae5664
Avoid class initialization when we evaluate ClassId
EgorkaKulikov Nov 28, 2023
dff5430
Create mocks in output values (#2701)
IlyaMuravjov Nov 28, 2023
e1c9d2a
Update versions
EgorkaKulikov Nov 28, 2023
329eb6f
Update usvm version
EgorkaKulikov Nov 28, 2023
6702aec
Workaround to deal with `UTestMethodCall` where `instance` is a mock
IlyaMuravjov Nov 29, 2023
3844378
Solver type changed
EgorkaKulikov Nov 29, 2023
1f24d07
Handle `UTestSetFieldStatement` where `instance` is a mock
IlyaMuravjov Nov 29, 2023
4fa518e
Hack for Random mocks (#2702)
Damtev Nov 29, 2023
bef3893
Add cast when `mock()` is called on anonymous class (e.g. `(CaseForma…
IlyaMuravjov Nov 29, 2023
ae79171
Improve logging for `JcField.fieldId` failures
IlyaMuravjov Nov 29, 2023
9bb4e1a
Update approximations version
EgorkaKulikov Nov 29, 2023
f2c47e0
jc-test-resolver: better handling of strings and classes, class const…
IlyaMuravjov Nov 29, 2023
29cd67a
Update lists as in benchmark
EgorkaKulikov Nov 29, 2023
e63ba23
Fallback to symbolic result when `runner.executeAsync()` throws excep…
IlyaMuravjov Nov 29, 2023
8c206e6
Fix the list
EgorkaKulikov Nov 29, 2023
4142156
Fallback to symbolic result when `jcToUtExecutionConverter.convert` t…
IlyaMuravjov Nov 29, 2023
b492606
Fix codegen for `String(char[])` calls (use string literals when poss…
IlyaMuravjov Nov 29, 2023
c2d693b
Ignore static fields in `UTestObjectDescriptor`
IlyaMuravjov Nov 29, 2023
64b1e18
Usvm competitions 2024: jacodb persistence (#2703)
Saloed Nov 30, 2023
5b46171
Usvm distribution for the contest (#2704)
Saloed Nov 30, 2023
c7ff5cd
Add types sorting
sergeypospelov Nov 30, 2023
08234e2
Drop crashed executions (#2705)
Damtev Nov 30, 2023
c8665bc
Fix classpath (#2706)
Saloed Nov 30, 2023
2086f5b
Avoid `<clinit>` call in `JcField.fieldId`
IlyaMuravjov Dec 1, 2023
2933a0c
Add timeout for all test with exceptions
IlyaMuravjov Dec 1, 2023
69c273f
Removed Soot initialization (#2707)
Damtev Dec 1, 2023
84d9325
Update usvm version
EgorkaKulikov Dec 1, 2023
693c54f
Remove irrelevant require
EgorkaKulikov Dec 1, 2023
acc2473
Initialize JacoDB and stat executor before starting contest, stop cac…
IlyaMuravjov Dec 1, 2023
5503f43
Updated usvm version
Damtev Dec 1, 2023
2a8f639
Add `maxUnknownCoverageExecutionsPerMethodPerResultType` to `settings…
IlyaMuravjov Dec 6, 2023
648fccc
Update Z3 native files paths to work with ksmt 0.5.13
IlyaMuravjov Dec 6, 2023
488e80e
Update RD in all projects
IlyaMuravjov Dec 6, 2023
f4458bb
Update Run IDEA task to use :utbot-intellij-main
IlyaMuravjov Dec 6, 2023
f76c6fe
Complete most `usvm-sbft-merge` TODOs
IlyaMuravjov Dec 6, 2023
515ce1b
Uncomment `include`s for `intellij` projects in `settings.gradle.kts`
IlyaMuravjov Dec 6, 2023
87e8384
Add `addTestMethodMarkers` ut setting
IlyaMuravjov Dec 6, 2023
d18ff85
Revert contest hacks
IlyaMuravjov Dec 6, 2023
aa86d55
Make contest use `Tool.UtBot` by default
IlyaMuravjov Dec 6, 2023
79d5daa
Update tool settings for summary
tepa46 Dec 7, 2023
d14032a
Update gradle properties in yml scripts
EgorkaKulikov Dec 7, 2023
6bdd3c9
Temporary creds
EgorkaKulikov Dec 7, 2023
9689766
Revert temporary creds
EgorkaKulikov Dec 7, 2023
6226fbb
Some todos in TestFrameworkManager
EgorkaKulikov Dec 7, 2023
17dc5d9
bissquit: configure debug env
Dec 7, 2023
806127d
Merge branch 'usvm' of https://github.com/UnitTestBot/UTBotJava into …
Dec 7, 2023
2b88b44
add pers token
Dec 7, 2023
e7b912a
add secret
Dec 7, 2023
e97e076
add token to all gradle runs
Dec 7, 2023
844554d
replace ro_token by github_token
Dec 7, 2023
9f70211
add permissions
Dec 7, 2023
3c45e8c
change to write permissions
Dec 7, 2023
6f9a8b2
return PACKAGES_RO_TOKEN var
Dec 7, 2023
fce45b3
remove debug
Dec 7, 2023
5f9403b
Further update of yml scripts
EgorkaKulikov Dec 7, 2023
e5d3549
Merge branch 'usvm' of https://github.com/UnitTestBot/UTBotJava into …
EgorkaKulikov Dec 7, 2023
fe8a753
Correct usvm version to fix compilation
EgorkaKulikov Dec 8, 2023
e896a30
Disable four tests
EgorkaKulikov Dec 8, 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
add token to all gradle runs
Egor Vasiliev 00665613 committed Dec 7, 2023
commit e97e076bb06c0e83e0269199a9a5b763dd2049ac
10 changes: 5 additions & 5 deletions .github/workflows/build-and-run-tests-from-branch.yml
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ jobs:

- name: Run tests
run: |
gradle -PprojectType=Ultimate -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }}
gradle --no-daemon --build-cache --no-parallel -PprojectType=Ultimate -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }}

- name: Upload logs
if: ${{ always() }}
@@ -209,7 +209,7 @@ jobs:
- name: Run tests
run: |
cd utbot-spring-test
gradle -PprojectType=Community -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-spring-test:test
gradle --no-daemon --build-cache --no-parallel -PprojectType=Community -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-spring-test:test

- name: Upload logs
if: ${{ always() }}
@@ -285,13 +285,13 @@ jobs:
id: first-project
run: |
cd ${{ matrix.projects.first }}
gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
gradle build --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g

- name: Build project ${{ matrix.projects.second }}
if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }}
run: |
cd ${{ matrix.projects.second }}
gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
gradle build --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g

- name: Upload test report if tests have failed
if: ${{ failure() }}
@@ -360,7 +360,7 @@ jobs:
- name: Run tests
run: |
cd ${{ matrix.project }}
gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
gradle build --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g

- name: Upload test report if tests have failed
if: ${{ failure() }}