Update fuzzing strategy for Dict and Set

tamarinvs19 · tamarinvs19 · commit d9c0d49f3b6b · 2023-11-29T13:36:07.000+03:00
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/fuzzing/provider/DictValueProvider.kt b/utbot-python/src/main/kotlin/org/utbot/python/fuzzing/provider/DictValueProvider.kt
@@ -20,36 +20,23 @@ object DictValueProvider : ValueProvider<UtType, PythonFuzzedValue, PythonMethod
     override fun generate(description: PythonMethodDescription, type: UtType) = sequence {
         val params = type.pythonAnnotationParameters()
 
-        val modifications = emptyList<Routine.Call<UtType, PythonFuzzedValue>>().toMutableList()
-        modifications.add(Routine.Call(params) { instance, arguments ->
-            val key = arguments[0].tree
-            val value = arguments[1].tree
-            val dict = instance.tree as PythonTree.DictNode
-            if (dict.items.keys.toList().contains(key)) {
-                dict.items.replace(key, value)
-            } else {
-                dict.items[key] = value
-            }
-        })
-        modifications.add(Routine.Call(listOf(params[0])) { instance, arguments ->
-            val key = arguments[0].tree
-            val dict = instance.tree as PythonTree.DictNode
-            if (dict.items.keys.toList().contains(key)) {
-                dict.items.remove(key)
-            }
-        })
-        yield(Seed.Recursive(
-            construct = Routine.Create(emptyList()) { v ->
+        yield(Seed.Collection(
+            construct = Routine.Collection { _ ->
                 PythonFuzzedValue(
                     PythonTree.DictNode(mutableMapOf()),
                     "%var% = ${type.pythonTypeRepresentation()}"
                 )
             },
-            modify = modifications.asSequence(),
-            empty = Routine.Empty { PythonFuzzedValue(
-                PythonTree.DictNode(emptyMap<PythonTree.PythonTreeNode, PythonTree.PythonTreeNode>().toMutableMap()),
-                "%var% = ${type.pythonTypeRepresentation()}"
-            )}
+            modify = Routine.ForEach(params) { instance, _, arguments ->
+                val key = arguments[0].tree
+                val value = arguments[1].tree
+                val dict = instance.tree as PythonTree.DictNode
+                if (dict.items.keys.toList().contains(key)) {
+                    dict.items.replace(key, value)
+                } else {
+                    dict.items[key] = value
+                }
+            },
         ))
     }
 }
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/fuzzing/provider/SetValueProvider.kt b/utbot-python/src/main/kotlin/org/utbot/python/fuzzing/provider/SetValueProvider.kt
@@ -20,31 +20,18 @@ object SetValueProvider : ValueProvider<UtType, PythonFuzzedValue, PythonMethodD
     override fun generate(description: PythonMethodDescription, type: UtType) = sequence {
         val params = type.pythonAnnotationParameters()
 
-        val modifications = emptyList<Routine.Call<UtType, PythonFuzzedValue>>().toMutableList()
-        modifications.add(Routine.Call(params) { instance, arguments ->
-            val set = instance.tree as PythonTree.SetNode
-            set.items.add(arguments.first().tree)
-        })
-        modifications.add(Routine.Call(params) { instance, arguments ->
-            val set = instance.tree as PythonTree.SetNode
-            val value = arguments.first().tree
-            if (set.items.contains(value)) {
-                set.items.remove(value)
-            }
-        })
-        yield(Seed.Recursive(
-            construct = Routine.Create(emptyList()) {
-                val items = emptySet<PythonTree.PythonTreeNode>().toMutableSet()
+        yield(Seed.Collection(
+            construct = Routine.Collection { _ ->
                 PythonFuzzedValue(
-                    PythonTree.SetNode(items),
-                    "%var% = ${type.pythonTypeRepresentation()}",
+                    PythonTree.SetNode(mutableSetOf()),
+                    "%var% = ${type.pythonTypeRepresentation()}"
                 )
             },
-            modify = modifications.asSequence(),
-            empty = Routine.Empty { PythonFuzzedValue(
-                PythonTree.SetNode(emptySet<PythonTree.PythonTreeNode>().toMutableSet()),
-                "%var% = ${type.pythonTypeRepresentation()}",
-            )}
+            modify = Routine.ForEach(params) { instance, _, arguments ->
+                val item = arguments[0].tree
+                val set = instance.tree as PythonTree.SetNode
+                set.items.add(item)
+            },
         ))
     }
 }
