small refactoring

Author: SBOne-Kenobi

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/RandomExtensions.kt

@@ -39,21 +39,5 @@ fun Long.invertBit(bitIndex: Int): Long {
     return this xor (1L shl bitIndex)
 }
 
-
-fun ModelProvider.assembleModel(id: Int, constructorId: ConstructorId, params: List<FuzzedValue>): FuzzedValue {
-    val instantiationChain = mutableListOf<UtStatementModel>()
-    return UtAssembleModel(
-        id,
-        constructorId.classId,
-        "${constructorId.classId.name}${constructorId.parameters}#" + id.hex(),
-        instantiationChain = instantiationChain,
-        modificationsChain = mutableListOf()
-    ).apply {
-        instantiationChain += UtExecutableCallModel(null, constructorId, params.map { it.model }, this)
-    }.fuzzed {
-        summary = "%var% = ${constructorId.classId.simpleName}(${constructorId.parameters.joinToString { it.simpleName }})"
-    }
-}
-
 fun Int.hex(): String =
     toString(16)

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/objects/AssembleModelUtils.kt

@@ -0,0 +1,25 @@
+package org.utbot.fuzzer.objects
+
+import org.utbot.framework.plugin.api.ConstructorId
+import org.utbot.framework.plugin.api.UtAssembleModel
+import org.utbot.framework.plugin.api.UtExecutableCallModel
+import org.utbot.framework.plugin.api.UtStatementModel
+import org.utbot.fuzzer.FuzzedValue
+import org.utbot.fuzzer.ModelProvider
+import org.utbot.fuzzer.hex
+
+
+fun ModelProvider.assembleModel(id: Int, constructorId: ConstructorId, params: List<FuzzedValue>): FuzzedValue {
+    val instantiationChain = mutableListOf<UtStatementModel>()
+    return UtAssembleModel(
+        id,
+        constructorId.classId,
+        "${constructorId.classId.name}${constructorId.parameters}#" + id.hex(),
+        instantiationChain = instantiationChain,
+        modificationsChain = mutableListOf()
+    ).apply {
+        instantiationChain += UtExecutableCallModel(null, constructorId, params.map { it.model }, this)
+    }.fuzzed {
+        summary = "%var% = ${constructorId.classId.simpleName}(${constructorId.parameters.joinToString { it.simpleName }})"
+    }
+}

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/DateConstantModelProvider.kt

@@ -20,10 +20,10 @@ import org.utbot.fuzzer.FuzzedValue
 import org.utbot.fuzzer.IdentityPreservingIdGenerator
 import org.utbot.fuzzer.ModelProvider
 import org.utbot.fuzzer.ModelProvider.Companion.yieldAllValues
-import org.utbot.fuzzer.assembleModel
 import org.utbot.fuzzer.defaultModelProviders
 import org.utbot.fuzzer.fuzz
 import org.utbot.fuzzer.hex
+import org.utbot.fuzzer.objects.assembleModel
 
 class DateConstantModelProvider(
     private val idGenerator: IdentityPreservingIdGenerator<Int>,
@@ -63,7 +63,7 @@ class DateConstantModelProvider(
         return sequence {
             constructorsFromNumbers.forEach { constructor ->
                 yieldAll(
-                    fuzzValuesRecursively(
+                    fuzzValues(
                         constructor.neededTypes,
                         baseMethodDescription,
                         defaultModelProviders(idGenerator)
@@ -113,7 +113,7 @@ class DateConstantModelProvider(
         }.take(totalLimit)
     }
 
-    private fun fuzzValuesRecursively(
+    private fun fuzzValues(
         types: List<ClassId>,
         baseMethodDescription: FuzzedMethodDescription,
         modelProvider: ModelProvider,

utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/ObjectModelProvider.kt

@@ -26,7 +26,7 @@ import org.utbot.framework.plugin.api.util.stringClassId
 import org.utbot.fuzzer.FuzzedMethodDescription
 import org.utbot.fuzzer.FuzzedValue
 import org.utbot.fuzzer.IdentityPreservingIdGenerator
-import org.utbot.fuzzer.assembleModel
+import org.utbot.fuzzer.objects.assembleModel
 
 /**
  * Creates [UtAssembleModel] for objects which have public constructors