Make Spring integration tests use AbstractsValueProvider (#2433)

UnitTestBot · Jul 21, 2023 · 1de5cf9 · 1de5cf9
1 parent eab0b84
commit 1de5cf9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...otlin/org/utbot/framework/context/spring/SpringIntegrationTestConcreteExecutionContext.kt b/...otlin/org/utbot/framework/context/spring/SpringIntegrationTestConcreteExecutionContext.kt
@@ -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
@@ -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 }

diff --git a/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/JavaLanguage.kt b/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/JavaLanguage.kt
@@ -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
@@ -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),

diff --git a/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt b/utbot-java-fuzzing/src/main/kotlin/org/utbot/fuzzing/providers/Objects.kt
@@ -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.*
@@ -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> {