Skip to content

Commit 949c3f5

Browse files
DaniilStepanovDaniilStepanov
committed
merge
1 parent fb27c78 commit 949c3f5

13 files changed

+25
-38
lines changed

‎utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/ThisInstanceGenerator.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/generator/userclasses/generator/StaticsFieldBasedInstanceGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.utbot.engine.greyboxfuzzer.quickcheck.generator.GeneratorContext
55
import org.utbot.engine.greyboxfuzzer.util.hasModifiers
66
import org.utbot.engine.greyboxfuzzer.util.toClass
77
import org.utbot.external.api.classIdForType
8-
import org.utbot.framework.concrete.UtModelConstructor
8+
import org.utbot.framework.concrete.constructors.UtModelConstructor
99
import org.utbot.framework.plugin.api.*
1010
import org.utbot.framework.plugin.api.util.*
1111
import ru.vyarus.java.generics.resolver.context.GenericsContext

‎utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/quickcheck/generator/GeneratorContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.utbot.engine.greyboxfuzzer.quickcheck.generator
22

3-
import org.utbot.framework.concrete.UtModelConstructor
3+
import org.utbot.framework.concrete.constructors.UtModelConstructor
44
import java.util.*
55

66
data class GeneratorContext(

‎utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/util/UtBotUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.utbot.engine.greyboxfuzzer.util
33
import org.utbot.engine.greyboxfuzzer.quickcheck.internal.ParameterTypeContext
44
import org.utbot.engine.greyboxfuzzer.generator.*
55
import org.utbot.external.api.classIdForType
6-
import org.utbot.framework.concrete.UtModelConstructor
6+
import org.utbot.framework.concrete.constructors.UtModelConstructor
77
import org.utbot.framework.plugin.api.*
88
import org.utbot.engine.greyboxfuzzer.quickcheck.generator.GeneratorContext
99
import java.lang.reflect.Method

‎utbot-framework/src/main/kotlin/org/utbot/engine/greyboxfuzzer/util/UtModelGenerator.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/BigNumberConstructor.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.utbot.framework.concrete
22

3+
import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
4+
import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
5+
import org.utbot.framework.concrete.constructors.checkClassCast
36
import org.utbot.framework.plugin.api.*
47
import org.utbot.framework.plugin.api.util.id
58
import org.utbot.framework.plugin.api.util.jClass

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/BitSetConstructor.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.utbot.framework.concrete
22

3+
import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
4+
import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
5+
import org.utbot.framework.concrete.constructors.checkClassCast
36
import org.utbot.framework.plugin.api.ClassId
47
import org.utbot.framework.plugin.api.UtAssembleModel
58
import org.utbot.framework.plugin.api.UtExecutableCallModel

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/DateTimeConstructors.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.utbot.framework.concrete
22

3+
import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
4+
import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
5+
import org.utbot.framework.concrete.constructors.checkClassCast
36
import org.utbot.framework.plugin.api.ClassId
47
import org.utbot.framework.plugin.api.UtAssembleModel
58
import org.utbot.framework.plugin.api.UtExecutableCallModel

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/LocaleConstructor.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.utbot.framework.concrete
22

3+
import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
4+
import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
5+
import org.utbot.framework.concrete.constructors.checkClassCast
36
import org.utbot.framework.plugin.api.ClassId
47
import org.utbot.framework.plugin.api.UtAssembleModel
58
import org.utbot.framework.plugin.api.UtExecutableCallModel

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UUIDConstructor.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.utbot.framework.concrete
22

3+
import org.utbot.framework.concrete.constructors.UtAssembleModelConstructorBase
4+
import org.utbot.framework.concrete.constructors.UtModelConstructorInterface
5+
import org.utbot.framework.concrete.constructors.checkClassCast
36
import org.utbot.framework.plugin.api.ClassId
47
import org.utbot.framework.plugin.api.UtAssembleModel
58
import org.utbot.framework.plugin.api.UtExecutableCallModel

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.utbot.framework.concrete.phases.start
1313
import org.utbot.framework.plugin.api.Coverage
1414
import org.utbot.framework.plugin.api.EnvironmentModels
1515
import org.utbot.framework.plugin.api.FieldId
16+
import org.utbot.framework.plugin.api.Instruction
1617
import org.utbot.framework.plugin.api.UtAssembleModel
1718
import org.utbot.framework.plugin.api.UtExecutionResult
1819
import org.utbot.framework.plugin.api.UtExecutionSuccess
@@ -22,6 +23,7 @@ import org.utbot.framework.plugin.api.util.singleExecutableId
2223
import org.utbot.instrumentation.instrumentation.ArgumentList
2324
import org.utbot.instrumentation.instrumentation.Instrumentation
2425
import org.utbot.instrumentation.instrumentation.InvokeInstrumentation
26+
import org.utbot.instrumentation.instrumentation.et.EtInstruction
2527
import org.utbot.instrumentation.instrumentation.et.TraceHandler
2628
import org.utbot.instrumentation.instrumentation.instrumenter.Instrumenter
2729
import org.utbot.instrumentation.instrumentation.mock.MockClassVisitor

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtFuzzingExecutionInstrumentation.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import org.objectweb.asm.Type
44
import org.utbot.common.StopWatch
55
import org.utbot.common.ThreadBasedExecutor
66
import org.utbot.common.withAccessibility
7-
import org.utbot.framework.assemble.AssembleModelGenerator
7+
import org.utbot.framework.concrete.constructors.ConstructOnlyUserClassesOrCachedObjectsStrategy
8+
import org.utbot.framework.concrete.constructors.MockValueConstructor
9+
import org.utbot.framework.concrete.constructors.UtModelConstructor
10+
import org.utbot.framework.concrete.mock.InstrumentationContext
811
import org.utbot.framework.plugin.api.*
912
import org.utbot.framework.plugin.api.util.*
1013
import org.utbot.framework.util.isInaccessibleViaReflection

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/UtAssembleModelConstructors.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.utbot.framework.concrete.constructors
22

3+
import org.utbot.framework.concrete.*
34
import java.util.stream.BaseStream
45
import java.util.stream.DoubleStream
56
import java.util.stream.IntStream

0 commit comments

Comments
 (0)