Fixed wrong resolved values for a primitive stream as a parameter

Damtev · Damtev · commit 74cba30fe3ad · 2022-09-28T08:56:46.000+03:00
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt
@@ -47,16 +47,15 @@ class DoubleStreamExampleTest : UtValueTestCaseChecker(
 
     @Test
     fun testUseParameterStream() {
-        withoutConcrete {
-            check(
-                DoubleStreamExample::useParameterStream,
-                eq(2),
-                { s, r -> s.toArray().isEmpty() && r == 0 },
-                { s, r -> s.toArray().let {
-                    it.isNotEmpty() && r == it.size }
-                },
-            )
-        }
+        check(
+            DoubleStreamExample::useParameterStream,
+            eq(2),
+            { s, r -> s.toArray().isEmpty() && r == 0 },
+            { s, r -> s.toArray().let {
+                it.isNotEmpty() && r == it.size }
+            },
+            coverage = AtLeast(94)
+        )
     }
 
     @Test
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt
@@ -46,6 +46,19 @@ class IntStreamExampleTest : UtValueTestCaseChecker(
         }
     }
 
+    @Test
+    fun testUseParameterStream() {
+        check(
+            IntStreamExample::useParameterStream,
+            eq(2),
+            { s, r -> s.toArray().isEmpty() && r == 0 },
+            { s, r -> s.toArray().let {
+                it.isNotEmpty() && r == it.size }
+            },
+            coverage = AtLeast(94)
+        )
+    }
+
     @Test
     fun testFilterExample() {
         check(
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt
@@ -46,6 +46,19 @@ class LongStreamExampleTest : UtValueTestCaseChecker(
         }
     }
 
+    @Test
+    fun testUseParameterStream() {
+        check(
+            LongStreamExample::useParameterStream,
+            eq(2),
+            { s, r -> s.toArray().isEmpty() && r == 0 },
+            { s, r -> s.toArray().let {
+                it.isNotEmpty() && r == it.size }
+            },
+            coverage = AtLeast(94)
+        )
+    }
+
     @Test
     fun testFilterExample() {
         check(
diff --git a/utbot-framework/src/main/java/org/utbot/engine/overrides/collections/UtGenericStorage.java b/utbot-framework/src/main/java/org/utbot/engine/overrides/collections/UtGenericStorage.java
@@ -10,4 +10,10 @@ public interface UtGenericStorage<E> {
     @SuppressWarnings("unused")
     default void setEqualGenericType(RangeModifiableUnlimitedArray<E> elements) {}
 
+    /**
+     * Auxiliary method that tells engine to add constraint, that binds type parameter of this storage
+     * to the type of the specified object value.
+     */
+    @SuppressWarnings("unused")
+    default void setGenericTypeToTypeOfValue(RangeModifiableUnlimitedArray<E> array, E value) {}
 }
diff --git a/utbot-framework/src/main/java/org/utbot/engine/overrides/stream/UtDoubleStream.java b/utbot-framework/src/main/java/org/utbot/engine/overrides/stream/UtDoubleStream.java
@@ -73,12 +73,12 @@ public UtDoubleStream(Double[] data, int startInclusive, int endExclusive) {
      * <li> elementData is marked as parameter </li>
      * <li> elementData.storage and it's elements are marked as parameters </li>
      */
-    @SuppressWarnings("DuplicatedCode")
+    @SuppressWarnings({"DuplicatedCode"})
     void preconditionCheck() {
         if (alreadyVisited(this)) {
             return;
         }
-        setEqualGenericType(elementData);
+        setGenericTypeToTypeOfValue(elementData, 0.0);
 
         assume(elementData != null);
         assume(elementData.storage != null);
@@ -97,6 +97,9 @@ void preconditionCheck() {
             assume(elementData.get(i) != null);
         }
 
+        // Do not assume that firstly used stream may be already closed to prevent garbage branches
+        isClosed = false;
+
         visit(this);
     }
 
diff --git a/utbot-framework/src/main/java/org/utbot/engine/overrides/stream/UtIntStream.java b/utbot-framework/src/main/java/org/utbot/engine/overrides/stream/UtIntStream.java
@@ -79,7 +79,7 @@ void preconditionCheck() {
         if (alreadyVisited(this)) {
             return;
         }
-        setEqualGenericType(elementData);
+        setGenericTypeToTypeOfValue(elementData, 0);
 
         assume(elementData != null);
         assume(elementData.storage != null);
@@ -98,6 +98,9 @@ void preconditionCheck() {
             assume(elementData.get(i) != null);
         }
 
+        // Do not assume that firstly used stream may be already closed to prevent garbage branches
+        isClosed = false;
+
         visit(this);
     }
 
diff --git a/utbot-framework/src/main/java/org/utbot/engine/overrides/stream/UtLongStream.java b/utbot-framework/src/main/java/org/utbot/engine/overrides/stream/UtLongStream.java
@@ -79,7 +79,7 @@ void preconditionCheck() {
         if (alreadyVisited(this)) {
             return;
         }
-        setEqualGenericType(elementData);
+        setGenericTypeToTypeOfValue(elementData, 0L);
 
         assume(elementData != null);
         assume(elementData.storage != null);
@@ -98,6 +98,9 @@ void preconditionCheck() {
             assume(elementData.get(i) != null);
         }
 
+        // Do not assume that firstly used stream may be already closed to prevent garbage branches
+        isClosed = false;
+
         visit(this);
     }
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/ArrayObjectWrappers.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/ArrayObjectWrappers.kt
@@ -29,6 +29,7 @@ import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.objectArrayClassId
 import org.utbot.framework.plugin.api.util.objectClassId
 import soot.ArrayType
+import soot.RefType
 import soot.Scene
 import soot.SootClass
 import soot.SootField
@@ -196,7 +197,23 @@ class RangeModifiableUnlimitedArrayWrapper : WrapperInterface {
         with(traverser) {
             val value = getStorageArrayExpression(wrapper).select((parameters[0] as PrimitiveValue).expr)
             val addr = UtAddrExpression(value)
-            val resultObject = createObject(addr, OBJECT_TYPE, useConcreteType = false)
+
+            // Try to retrieve manually set type if present
+            val valueType = typeRegistry
+                .getTypeStoragesForObjectTypeParameters(wrapper.addr)
+                ?.singleOrNull()
+                ?.leastCommonType
+                ?: OBJECT_TYPE
+
+            val resultObject = if (valueType is RefType) {
+                createObject(addr, valueType, useConcreteType = false)
+            } else {
+                require(valueType is ArrayType) {
+                    "Unexpected Primitive Type $valueType in generic parameter for RangeModifiableUnlimitedArray $wrapper"
+                }
+
+                createArray(addr, valueType, useConcreteType = false)
+            }
 
             listOf(
                 MethodResult(
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/CollectionWrappers.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/CollectionWrappers.kt
@@ -23,7 +23,6 @@ import org.utbot.framework.plugin.api.UtCompositeModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
 import org.utbot.framework.plugin.api.UtModel
 import org.utbot.framework.plugin.api.UtNullModel
-import org.utbot.framework.plugin.api.UtStatementModel
 import org.utbot.framework.plugin.api.classId
 import org.utbot.framework.plugin.api.getIdOrThrow
 import org.utbot.framework.util.graph
@@ -40,7 +39,6 @@ import soot.Scene
 import soot.SootClass
 import soot.SootField
 import soot.SootMethod
-import kotlin.reflect.KFunction4
 
 abstract class BaseOverriddenWrapper(protected val overriddenClassName: String) : WrapperInterface {
     val overriddenClass: SootClass = Scene.v().getSootClass(overriddenClassName)
@@ -179,6 +177,15 @@ abstract class BaseGenericStorageBasedContainerWrapper(containerClassName: Strin
 
                 listOf(methodResult)
             }
+            UT_GENERIC_STORAGE_SET_GENERIC_TYPE_TO_TYPE_OF_VALUE_SIGNATURE -> {
+                val valueTypeStorage = parameters[1].typeStorage
+
+                typeRegistry.saveObjectParameterTypeStorages(parameters[0].addr, listOf(valueTypeStorage))
+
+                val methodResult = MethodResult(SymbolicSuccess(voidValue))
+
+                listOf(methodResult)
+            }
             else -> null
         }
 
@@ -398,6 +405,9 @@ private val UT_GENERIC_STORAGE_CLASS
 internal val UT_GENERIC_STORAGE_SET_EQUAL_GENERIC_TYPE_SIGNATURE =
     UT_GENERIC_STORAGE_CLASS.getMethodByName(UtGenericStorage<*>::setEqualGenericType.name).signature
 
+internal val UT_GENERIC_STORAGE_SET_GENERIC_TYPE_TO_TYPE_OF_VALUE_SIGNATURE =
+    UT_GENERIC_STORAGE_CLASS.getMethodByName(UtGenericStorage<*>::setGenericTypeToTypeOfValue.name).signature
+
 private val UT_GENERIC_ASSOCIATIVE_CLASS
     get() = Scene.v().getSootClass(UtGenericAssociative::class.java.canonicalName)
 
diff --git a/utbot-sample/src/main/java/org/utbot/examples/stream/IntStreamExample.java b/utbot-sample/src/main/java/org/utbot/examples/stream/IntStreamExample.java
@@ -40,6 +40,18 @@ IntStream returningStreamAsParameterExample(IntStream s) {
         return s;
     }
 
+    int useParameterStream(IntStream s) {
+        UtMock.assume(s != null);
+
+        final int[] values = s.toArray();
+
+        if (values.length == 0) {
+            return 0;
+        } else {
+            return values.length;
+        }
+    }
+
     boolean filterExample(List<Short> list) {
         UtMock.assume(list != null && !list.isEmpty());
 
diff --git a/utbot-sample/src/main/java/org/utbot/examples/stream/LongStreamExample.java b/utbot-sample/src/main/java/org/utbot/examples/stream/LongStreamExample.java
@@ -39,6 +39,18 @@ LongStream returningStreamAsParameterExample(LongStream s) {
         return s;
     }
 
+    int useParameterStream(LongStream s) {
+        UtMock.assume(s != null);
+
+        final long[] values = s.toArray();
+
+        if (values.length == 0) {
+            return 0;
+        } else {
+            return values.length;
+        }
+    }
+
     boolean filterExample(List<Short> list) {
         UtMock.assume(list != null && !list.isEmpty());
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void preconditionCheck() {`
`79`	`79`	`if (alreadyVisited(this)) {`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`		`- setEqualGenericType(elementData);`
	`82`	`+ setGenericTypeToTypeOfValue(elementData, 0);`
`83`	`83`
`84`	`84`	`assume(elementData != null);`
`85`	`85`	`assume(elementData.storage != null);`
`@@ -98,6 +98,9 @@ void preconditionCheck() {`
`98`	`98`	`assume(elementData.get(i) != null);`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ // Do not assume that firstly used stream may be already closed to prevent garbage branches`
	`102`	`+ isClosed = false;`
	`103`	`+`
`101`	`104`	`visit(this);`
`102`	`105`	`}`
`103`	`106`