Skip to content

Make Spring integration tests use AbstractsValueProvider #2433

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 1 commit into from
Jul 21, 2023
Merged

Make Spring integration tests use AbstractsValueProvider #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...otlin/org/utbot/framework/context/spring/SpringIntegrationTestConcreteExecutionContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.utbot.fuzzing.JavaValueProvider
import org.utbot.fuzzing.ValueProvider
import org.utbot.fuzzing.providers.FieldValueProvider
import org.utbot.fuzzing.providers.ObjectValueProvider
import org.utbot.fuzzing.providers.anyObjectValueProvider
import org.utbot.fuzzing.spring.SavedEntityValueProvider
import org.utbot.fuzzing.spring.SpringBeanValueProvider
import org.utbot.instrumentation.ConcreteExecutor
Expand Down Expand Up @@ -85,7 +86,7 @@ class SpringIntegrationTestConcreteExecutionContext(
springApplicationContext.getBeansAssignableTo(classId).map { it.beanName }
},
relevantRepositories = relevantRepositories
).withFallback(ObjectValueProvider(idGenerator))
).withFallback(anyObjectValueProvider(idGenerator))

return delegateContext.tryCreateValueProvider(concreteExecutor, classUnderTest, idGenerator)
.except { p -> p is ObjectValueProvider }
Expand Down
5 changes: 1 addition & 4 deletions utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/JavaLanguage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.utbot.fuzzing

import mu.KotlinLogging
import org.utbot.framework.UtSettings
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.Instruction
Expand Down Expand Up @@ -43,9 +42,7 @@ fun defaultValueProviders(idGenerator: IdentityPreservingIdGenerator<Int>) = lis
FloatValueProvider,
StringValueProvider,
NumberValueProvider,
ObjectValueProvider(idGenerator).letIf(UtSettings.fuzzingImplementationOfAbstractClasses) { ovp ->
ovp.withFallback(AbstractsObjectValueProvider(idGenerator))
},
anyObjectValueProvider(idGenerator),
ArrayValueProvider(idGenerator),
EnumValueProvider(idGenerator),
ListSetValueProvider(idGenerator),
Expand Down
6 changes: 6 additions & 0 deletions utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.utbot.fuzzing.providers

import mu.KotlinLogging
import org.utbot.framework.UtSettings
import org.utbot.framework.plugin.api.*
import org.utbot.framework.plugin.api.util.*
import org.utbot.fuzzer.*
Expand Down Expand Up @@ -30,6 +31,11 @@ private fun isIgnored(type: ClassId): Boolean {
|| (type.isInner && !type.isStatic)
}

fun anyObjectValueProvider(idGenerator: IdentityPreservingIdGenerator<Int>) =
ObjectValueProvider(idGenerator).letIf(UtSettings.fuzzingImplementationOfAbstractClasses) { ovp ->
ovp.withFallback(AbstractsObjectValueProvider(idGenerator))
}

class ObjectValueProvider(
val idGenerator: IdGenerator<Int>,
) : ValueProvider<FuzzedType, FuzzedValue, FuzzedDescription> {
Expand Down