Skip to content

Fuzzing generates impossible UtAssembleModels #1684 #1703

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
merged 5 commits into from
Jan 23, 2023
Merged

Fuzzing generates impossible UtAssembleModels #1684 #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6490197
Fuzzing generates impossible UtAssembleModels #1684
Vassiliy-Kudryashov Jan 18, 2023
91f59e0
Merge branch 'main' into Vassiliy-Kudryashov/1684-fuzzing-generates-i…
Vassiliy-Kudryashov Jan 19, 2023
f6dfe2d
Merge branch 'main' into Vassiliy-Kudryashov/1684-fuzzing-generates-i…
Vassiliy-Kudryashov Jan 20, 2023
f34dea7
Fuzzing generates impossible UtAssembleModels #1684
Vassiliy-Kudryashov Jan 20, 2023
2442b61
Merge branch 'main' into Vassiliy-Kudryashov/1684-fuzzing-generates-i…
Vassiliy-Kudryashov Jan 20, 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
7 changes: 7 additions & 0 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ val atomicIntegerGetAndIncrement = MethodId(atomicIntegerClassId, "getAndIncreme

val iterableClassId = java.lang.Iterable::class.id
val mapClassId = java.util.Map::class.id
val collectionClassId = java.util.Collection::class.id

val baseStreamClassId = java.util.stream.BaseStream::class.id
val streamClassId = java.util.stream.Stream::class.id
Expand Down Expand Up @@ -405,6 +406,12 @@ val ClassId.isMap: Boolean
val ClassId.isIterableOrMap: Boolean
get() = isIterable || isMap

val ClassId.isCollection: Boolean
get() = isSubtypeOf(collectionClassId)

val ClassId.isCollectionOrMap: Boolean
get() = isCollection || isMap

val ClassId.isEnum: Boolean
get() = jClass.isEnum

Expand Down
6 changes: 1 addition & 5 deletions utbot-fuzzers/src/main/kotlin/org/utbot/fuzzing/providers/Collections.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,10 @@ class MapValueProvider(

class ListSetValueProvider(
idGenerator: IdGenerator<Int>
) : CollectionValueProvider(idGenerator, java.lang.Iterable::class.id) {
) : CollectionValueProvider(idGenerator, java.util.Collection::class.id) {
override fun resolveType(description: FuzzedDescription, type: FuzzedType) = sequence {
val generic = type.generics.firstOrNull() ?: FuzzedType(objectClassId)
when (type.classId) {
java.lang.Iterable::class.id -> {
yield(FuzzedType(java.util.ArrayList::class.id, listOf(generic)))
yield(FuzzedType(java.util.HashSet::class.id, listOf(generic)))
}
java.util.Queue::class.id,
java.util.Deque::class.id-> {
yield(FuzzedType(java.util.ArrayDeque::class.id, listOf(generic)))
Expand Down
2 changes: 1 addition & 1 deletion utbot-fuzzers/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class ObjectValueProvider(

private fun isIgnored(type: ClassId): Boolean {
return unwantedConstructorsClasses.contains(type)
|| type.isIterableOrMap
|| type.isCollectionOrMap
|| type.isPrimitiveWrapper
|| type.isEnum
|| type.isAbstract
Expand Down