merge

DaniilStepanov · DaniilStepanov · commit 949c3f528f5d · 2022-12-19T16:49:56.000+03:00
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/ThisInstanceGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/ThisInstanceGenerator.kt
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/userclasses/generator/StaticsFieldBasedInstanceGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/userclasses/generator/StaticsFieldBasedInstanceGenerator.kt
@@ -5,7 +5,7 @@ import org.utbot.engine.greyboxfuzzer.quickcheck.generator.GeneratorContext
 import org.utbot.engine.greyboxfuzzer.util.hasModifiers
 import org.utbot.engine.greyboxfuzzer.util.toClass
 import org.utbot.external.api.classIdForType
-import org.utbot.framework.concrete.UtModelConstructor
+import org.utbot.framework.concrete.constructors.UtModelConstructor
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.*
 import ru.vyarus.java.generics.resolver.context.GenericsContext
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/GeneratorContext.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/GeneratorContext.kt
@@ -1,6 +1,6 @@
 package org.utbot.engine.greyboxfuzzer.quickcheck.generator
 
-import org.utbot.framework.concrete.UtModelConstructor
+import org.utbot.framework.concrete.constructors.UtModelConstructor
 import java.util.*
 
 data class GeneratorContext(
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/util/UtBotUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/util/UtBotUtils.kt
@@ -3,7 +3,7 @@ package org.utbot.engine.greyboxfuzzer.util
 import org.utbot.engine.greyboxfuzzer.quickcheck.internal.ParameterTypeContext
 import org.utbot.engine.greyboxfuzzer.generator.*
 import org.utbot.external.api.classIdForType
-import org.utbot.framework.concrete.UtModelConstructor
+import org.utbot.framework.concrete.constructors.UtModelConstructor
 import org.utbot.framework.plugin.api.*
 import org.utbot.engine.greyboxfuzzer.quickcheck.generator.GeneratorContext
 import java.lang.reflect.Method
diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/util/UtModelGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/util/UtModelGenerator.kt
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/BigNumberConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/BigNumberConstructor.kt
@@ -1,5 +1,8 @@
 package org.utbot.framework.concrete
 
+import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
+import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
+import org.utbot.framework.concrete.constructors.checkClassCast
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.id
 import org.utbot.framework.plugin.api.util.jClass
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/BitSetConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/BitSetConstructor.kt
@@ -1,5 +1,8 @@
 package org.utbot.framework.concrete
 
+import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
+import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
+import org.utbot.framework.concrete.constructors.checkClassCast
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/DateTimeConstructors.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/DateTimeConstructors.kt
@@ -1,5 +1,8 @@
 package org.utbot.framework.concrete
 
+import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
+import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
+import org.utbot.framework.concrete.constructors.checkClassCast
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/LocaleConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/LocaleConstructor.kt
@@ -1,5 +1,8 @@
 package org.utbot.framework.concrete
 
+import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
+import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
+import org.utbot.framework.concrete.constructors.checkClassCast
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UUIDConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UUIDConstructor.kt
@@ -1,5 +1,8 @@
 package org.utbot.framework.concrete
 
+import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
+import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
+import org.utbot.framework.concrete.constructors.checkClassCast
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutableCallModel
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt
@@ -13,6 +13,7 @@ import org.utbot.framework.concrete.phases.start
 import org.utbot.framework.plugin.api.Coverage
 import org.utbot.framework.plugin.api.EnvironmentModels
 import org.utbot.framework.plugin.api.FieldId
+import org.utbot.framework.plugin.api.Instruction
 import org.utbot.framework.plugin.api.UtAssembleModel
 import org.utbot.framework.plugin.api.UtExecutionResult
 import org.utbot.framework.plugin.api.UtExecutionSuccess
@@ -22,6 +23,7 @@ import org.utbot.framework.plugin.api.util.singleExecutableId
 import org.utbot.instrumentation.instrumentation.ArgumentList
 import org.utbot.instrumentation.instrumentation.Instrumentation
 import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
+import org.utbot.instrumentation.instrumentation.et.EtInstruction
 import org.utbot.instrumentation.instrumentation.et.TraceHandler
 import org.utbot.instrumentation.instrumentation.instrumenter.Instrumenter
 import org.utbot.instrumentation.instrumentation.mock.MockClassVisitor
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtFuzzingExecutionInstrumentation.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtFuzzingExecutionInstrumentation.kt
@@ -4,7 +4,10 @@ import org.objectweb.asm.Type
 import org.utbot.common.StopWatch
 import org.utbot.common.ThreadBasedExecutor
 import org.utbot.common.withAccessibility
-import org.utbot.framework.assemble.AssembleModelGenerator
+import org.utbot.framework.concrete.constructors.ConstructOnlyUserClassesOrCachedObjectsStrategy
+import org.utbot.framework.concrete.constructors.MockValueConstructor
+import org.utbot.framework.concrete.constructors.UtModelConstructor
+import org.utbot.framework.concrete.mock.InstrumentationContext
 import org.utbot.framework.plugin.api.*
 import org.utbot.framework.plugin.api.util.*
 import org.utbot.framework.util.isInaccessibleViaReflection
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/UtAssembleModelConstructors.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/UtAssembleModelConstructors.kt
@@ -1,5 +1,6 @@
 package org.utbot.framework.concrete.constructors
 
+import org.utbot.framework.concrete.*
 import java.util.stream.BaseStream
 import java.util.stream.DoubleStream
 import java.util.stream.IntStream
