Make UtEnumConstModel and UtClassRefModel reference models #414 #611
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jul 30, 2022
dtim
force-pushed
the
dtim/414-reference-subtypes
branch
from
19214b2 to
06e56ad
Compare
Damtev
requested changes
Aug 1, 2022
| * Get model id or null if id is null or the model has no id. | ||
| */ | ||
| fun UtModel.idOrNull(): Int? = when (this) { | ||
| is UtNullModel -> 0 |
There was a problem hiding this comment.
Could you link this constant with org.utbot.engine.ResolverKt#NULL_ADDR somehow, please?
There was a problem hiding this comment.
What do you think about moving the constant from Resolver into Api.kt?
utbot-framework/src/main/kotlin/org/utbot/engine/CollectionWrappers.kt
Outdated
Show resolved
Hide resolved
utbot-framework/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt
Outdated
Show resolved
Hide resolved
utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
Outdated
Show resolved
Hide resolved
utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
Outdated
Show resolved
Hide resolved
utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
Show resolved
Hide resolved
utbot-sample/src/main/java/org/utbot/examples/enums/ComplexEnumExamples.java
Show resolved
Hide resolved
dtim
force-pushed
the
dtim/414-reference-subtypes
branch
3 times, most recently
from
3de411a to
84c66ce
Compare
Damtev
approved these changes
Aug 2, 2022
sergeypospelov
approved these changes
Aug 3, 2022
| import org.utbot.engine.UtNamedStore | ||
| import org.utbot.framework.plugin.api.ClassId | ||
| import org.utbot.framework.plugin.api.FieldId | ||
| import org.utbot.framework.plugin.api.classId |
There was a problem hiding this comment.
Looks like these imports are redundant.
dtim
force-pushed
the
dtim/414-reference-subtypes
branch
2 times, most recently
from
54af0a3 to
410613a
Compare
|
Updated |
dtim
force-pushed
the
dtim/414-reference-subtypes
branch
2 times, most recently
from
f4959aa to
e29923f
Compare
Markoutte
approved these changes
Aug 4, 2022
Historically `UtEnumConstModel` and `UtClassRefModel` have been
processed not as other reference models, but in a special way,
more like to primitive types. This approach leads to several
problems, especially to class cast errors when processing generic
collections with enums or class references as elements.
This commit makes `UtEnumConstModel` and `UtClassRefModel` subtypes of
`UtReferenceModel`.
* Concrete executor is modified to respect the identity of static
fields to avoid rewriting enum values and `Class<?>` instances.
* Special processing for enums is implemented.
When a new enum value is created, or an `Object` is being cast
to the enum type, static values for the enum class are initialized,
and the set of hard constraint is added to require that the new
instance has the same address and ordinal as any one of enum
constants to implement reference equality for enums.
* Corresponding changes in fuzzer model providers have been
implemented.
* UtModelVisitor has been updated to reflect the new inheritance
hierarchy.
A custom id generator interface hierarchy is used instead of `IntSupplier`:
* `IdGenerator` that allows to create fresh identifiers,
* `IdentityPreservingIdGenerator`: `IdGenerator` that can return
the same id for the same object.
A default implementation of `IdentityPreservingIdGenerator` is used in
fuzzer. It uses reference equality for object comparison, that allows
to create distinct models of equal object (in `equals` sense), and
to always assign the same id to the same enum value.
dtim
force-pushed
the
dtim/414-reference-subtypes
branch
from
374eb3c to
b11b184
Compare
Markoutte
approved these changes
Aug 4, 2022
denis-fokin
pushed a commit
that referenced
this pull request
Aug 18, 2022
Make UtEnumConstModel and UtClassRefModel reference models #414 Historically `UtEnumConstModel` and `UtClassRefModel` have been processed not as other reference models, but in a special way, more like to primitive types. This approach leads to several problems, especially to class cast errors when processing generic collections with enums or class references as elements. This commit makes `UtEnumConstModel` and `UtClassRefModel` subtypes of `UtReferenceModel`. * Concrete executor is modified to respect the identity of static fields to avoid rewriting enum values and `Class<?>` instances. * Special processing for enums is implemented. When a new enum value is created, or an `Object` is being cast to the enum type, static values for the enum class are initialized, and the set of hard constraint is added to require that the new instance has the same address and ordinal as any one of enum constants to implement reference equality for enums. * `UtModelVisitor` has been updated to reflect the new inheritance hierarchy. * Corresponding changes in the fuzzer have been implemented, including id generation refactoring. A custom id generator interface hierarchy is now used instead of `IntSupplier`: - `IdGenerator` that allows to create fresh identifiers, - `IdentityPreservingIdGenerator`: `IdGenerator` that can return the same id for the same object. A default implementation of `IdentityPreservingIdGenerator` is used in fuzzer. It uses reference equality for object comparison, that allows to create distinct models of equal object (in `equals` sense), and to always assign the same id to the same enum value.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Historically
UtEnumConstModelandUtClassRefModelhave been processed not as other reference models, but in a special way, more like to primitive types. This approach leads to several problems, especially to class cast errors when processing generic collections with enums or class references as elements.This commit makes
UtEnumConstModelandUtClassRefModelsubtypes ofUtReferenceModel.Concrete executor is modified to respect the identity of static fields to avoid rewriting enum values and
Class<?>instances.Special processing for enums is implemented. When a new enum value is created, or an
Objectis being cast to the enum type, static values for the enum class are initialized, and the set of hard constraint is added to require that the new instance has the same address and ordinal as any one of enum constants to implement reference equality for enums.Corresponding changes in fuzzer model providers have been implemented.
Limitations (probably have been there for a long time, addressed separately):
Fixes #414 (meta-issue)
Fixes #230
Fixes #300
Type of Change
How Has This Been Tested?
Automated Testing
All existing unit tests should pass.
New unit tests for enums have been added:
org.utbot.examples.enums.ComplexEnumExamplesTestNote: the test
org.utbot.examples.enums.ComplexEnumExamplesTest#testFindStateis currently disabled because of limited anonymous classes support.Manual Scenario
To check that #230 is fixed: generate the test suite for the code example in issue #230 description. Test should be generated, no exceptions should be thrown.
To check that #300 is fixed: run the contest estimator with settings from issue #300 description. Generated file should compile, class name should be present in qualified enum constant names.
Checklist:
This is the author self-check list