Skip to content

Commit 21f7895

Browse files
SBOne-KenobiSBOne-Kenobi
committed
add more packages
1 parent 66c3443 commit 21f7895

File tree

16 files changed

+50
-47
lines changed

16 files changed

+50
-47
lines changed

‎utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/BaseConstructorTest.kt

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

33
import org.utbot.engine.ValueConstructor
4-
import org.utbot.framework.concrete.UtModelConstructor
54
import org.utbot.framework.plugin.api.UtAssembleModel
65
import org.utbot.framework.plugin.api.util.UtContext
76
import org.utbot.framework.plugin.api.util.id

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ import java.security.AccessControlException
4545
import java.security.ProtectionDomain
4646
import java.util.IdentityHashMap
4747
import kotlin.reflect.jvm.javaMethod
48+
import org.utbot.framework.concrete.constructors.ConstructOnlyUserClassesOrCachedObjectsStrategy
49+
import org.utbot.framework.concrete.constructors.MockValueConstructor
50+
import org.utbot.framework.concrete.constructors.UtModelConstructor
51+
import org.utbot.framework.concrete.mock.InstrumentationContext
4852

4953
/**
5054
* Consists of the data needed to execute the method concretely. Also includes method arguments stored in models.

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/IterableConstructors.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/IterableConstructors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.constructors
22

33
import org.utbot.framework.plugin.api.ClassId
44
import org.utbot.framework.plugin.api.ConstructorId

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/MockValueConstructor.kt

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.constructors
22

3+
import java.io.Closeable
4+
import java.lang.reflect.Modifier
5+
import java.util.IdentityHashMap
6+
import kotlin.reflect.KClass
7+
import org.mockito.Mockito
8+
import org.mockito.stubbing.Answer
9+
import org.objectweb.asm.Type
10+
import org.utbot.common.Reflection
311
import org.utbot.common.invokeCatching
12+
import org.utbot.engine.util.lambda.CapturedArgument
13+
import org.utbot.engine.util.lambda.constructLambda
14+
import org.utbot.engine.util.lambda.constructStaticLambda
15+
import org.utbot.framework.concrete.mock.InstanceMockController
16+
import org.utbot.framework.concrete.mock.InstrumentationContext
17+
import org.utbot.framework.concrete.mock.MethodMockController
18+
import org.utbot.framework.concrete.mock.MockController
419
import org.utbot.framework.plugin.api.ClassId
520
import org.utbot.framework.plugin.api.ConstructorId
621
import org.utbot.framework.plugin.api.ExecutableId
@@ -20,6 +35,7 @@ import org.utbot.framework.plugin.api.UtConcreteValue
2035
import org.utbot.framework.plugin.api.UtDirectSetFieldModel
2136
import org.utbot.framework.plugin.api.UtEnumConstantModel
2237
import org.utbot.framework.plugin.api.UtExecutableCallModel
38+
import org.utbot.framework.plugin.api.UtLambdaModel
2339
import org.utbot.framework.plugin.api.UtMockValue
2440
import org.utbot.framework.plugin.api.UtModel
2541
import org.utbot.framework.plugin.api.UtNewInstanceInstrumentation
@@ -31,25 +47,12 @@ import org.utbot.framework.plugin.api.UtVoidModel
3147
import org.utbot.framework.plugin.api.isMockModel
3248
import org.utbot.framework.plugin.api.util.constructor
3349
import org.utbot.framework.plugin.api.util.executableId
34-
import org.utbot.framework.plugin.api.util.jField
50+
import org.utbot.framework.plugin.api.util.isStatic
3551
import org.utbot.framework.plugin.api.util.jClass
52+
import org.utbot.framework.plugin.api.util.jField
3653
import org.utbot.framework.plugin.api.util.method
3754
import org.utbot.framework.plugin.api.util.utContext
3855
import org.utbot.framework.util.anyInstance
39-
import java.io.Closeable
40-
import java.lang.reflect.Field
41-
import java.lang.reflect.Modifier
42-
import java.util.IdentityHashMap
43-
import kotlin.reflect.KClass
44-
import org.mockito.Mockito
45-
import org.mockito.stubbing.Answer
46-
import org.objectweb.asm.Type
47-
import org.utbot.common.Reflection
48-
import org.utbot.engine.util.lambda.CapturedArgument
49-
import org.utbot.engine.util.lambda.constructLambda
50-
import org.utbot.engine.util.lambda.constructStaticLambda
51-
import org.utbot.framework.plugin.api.UtLambdaModel
52-
import org.utbot.framework.plugin.api.util.isStatic
5356
import org.utbot.instrumentation.process.runSandbox
5457

5558
/**

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/OptionalConstructors.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructors.kt

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

3+
import java.util.Optional
4+
import java.util.OptionalDouble
5+
import java.util.OptionalInt
6+
import java.util.OptionalLong
7+
import kotlin.reflect.KFunction1
38
import org.utbot.framework.plugin.api.ClassId
49
import org.utbot.framework.plugin.api.MethodId
510
import org.utbot.framework.plugin.api.UtAssembleModel
@@ -10,11 +15,6 @@ import org.utbot.framework.plugin.api.util.intClassId
1015
import org.utbot.framework.plugin.api.util.jClass
1116
import org.utbot.framework.plugin.api.util.longClassId
1217
import org.utbot.framework.plugin.api.util.objectClassId
13-
import java.util.Optional
14-
import java.util.OptionalDouble
15-
import java.util.OptionalInt
16-
import java.util.OptionalLong
17-
import kotlin.reflect.KFunction1
1818

1919

2020
internal sealed class OptionalConstructorBase : UtAssembleModelConstructorBase() {

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/PrimitiveWrapperConstructor.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/PrimitiveWrapperConstructor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.constructors
22

33
import org.utbot.framework.plugin.api.ClassId
44
import org.utbot.framework.plugin.api.UtAssembleModel

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/StreamConstructors.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/StreamConstructors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.constructors
22

33
import org.utbot.framework.plugin.api.ClassId
44
import org.utbot.framework.plugin.api.MethodId

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

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

3+
import java.util.stream.BaseStream
4+
import java.util.stream.DoubleStream
5+
import java.util.stream.IntStream
6+
import java.util.stream.LongStream
37
import org.utbot.framework.plugin.api.ClassId
48
import org.utbot.framework.plugin.api.UtAssembleModel
59
import org.utbot.framework.plugin.api.UtExecutableCallModel
610
import org.utbot.framework.plugin.api.UtStatementModel
7-
import org.utbot.framework.plugin.api.util.id
811
import org.utbot.framework.plugin.api.util.jClass
912
import org.utbot.framework.plugin.api.util.primitiveWrappers
1013
import org.utbot.framework.plugin.api.util.voidWrapperClassId
1114
import org.utbot.framework.util.nextModelName
12-
import java.util.stream.BaseStream
13-
import java.util.stream.DoubleStream
14-
import java.util.stream.IntStream
15-
import java.util.stream.LongStream
1615

1716
private val predefinedConstructors = mutableMapOf<Class<*>, () -> UtAssembleModelConstructorBase>(
1817
/**

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtModelConstructor.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/constructors/UtModelConstructor.kt

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

3+
import java.lang.reflect.Modifier
4+
import java.util.IdentityHashMap
5+
import java.util.stream.BaseStream
36
import org.utbot.common.asPathToFile
47
import org.utbot.common.withAccessibility
58
import org.utbot.framework.plugin.api.ClassId
@@ -14,7 +17,6 @@ import org.utbot.framework.plugin.api.UtModel
1417
import org.utbot.framework.plugin.api.UtNullModel
1518
import org.utbot.framework.plugin.api.UtPrimitiveModel
1619
import org.utbot.framework.plugin.api.UtReferenceModel
17-
import org.utbot.framework.plugin.api.visible.UtStreamConsumingException
1820
import org.utbot.framework.plugin.api.UtVoidModel
1921
import org.utbot.framework.plugin.api.isMockModel
2022
import org.utbot.framework.plugin.api.util.booleanClassId
@@ -30,12 +32,10 @@ import org.utbot.framework.plugin.api.util.jClass
3032
import org.utbot.framework.plugin.api.util.longClassId
3133
import org.utbot.framework.plugin.api.util.objectClassId
3234
import org.utbot.framework.plugin.api.util.shortClassId
35+
import org.utbot.framework.plugin.api.util.utContext
36+
import org.utbot.framework.plugin.api.visible.UtStreamConsumingException
3337
import org.utbot.framework.util.isInaccessibleViaReflection
3438
import org.utbot.framework.util.valueToClassId
35-
import java.lang.reflect.Modifier
36-
import java.util.IdentityHashMap
37-
import java.util.stream.BaseStream
38-
import org.utbot.framework.plugin.api.util.utContext
3939

4040
/**
4141
* Represents common interface for model constructors.

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/InstanceMockController.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/mock/InstanceMockController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.mock
22

33
import org.utbot.framework.plugin.api.ClassId
44
import org.utbot.framework.plugin.api.util.jClass

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/InstrumentationContext.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/mock/InstrumentationContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.mock
22

33
import java.lang.reflect.Method
44
import java.util.IdentityHashMap

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MethodMockController.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/mock/MethodMockController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.mock
22

33
import java.lang.reflect.Field
44
import java.lang.reflect.Method

‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockController.kt renamed to ‎utbot-framework/src/main/kotlin/org/utbot/framework/concrete/mock/MockController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.utbot.framework.concrete
1+
package org.utbot.framework.concrete.mock
22

33
import java.io.Closeable
44

‎utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.utbot.framework.UtSettings.warmupConcreteExecution
2727
import org.utbot.framework.plugin.api.utils.checkFrameworkDependencies
2828
import org.utbot.framework.concrete.UtConcreteExecutionData
2929
import org.utbot.framework.concrete.UtExecutionInstrumentation
30-
import org.utbot.framework.concrete.UtModelConstructor
30+
import org.utbot.framework.concrete.constructors.UtModelConstructor
3131
import org.utbot.framework.minimization.minimizeTestCase
3232
import org.utbot.framework.plugin.api.util.UtContext
3333
import org.utbot.framework.plugin.api.util.id

‎utbot-framework/src/main/kotlin/org/utbot/fuzzer/FallbackModelProvider.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package org.utbot.fuzzer
22

33
import org.utbot.common.isPublic
4-
import org.utbot.framework.concrete.UtModelConstructor
4+
import org.utbot.framework.concrete.constructors.UtModelConstructor
55
import org.utbot.framework.plugin.api.ClassId
66
import org.utbot.framework.plugin.api.UtArrayModel
77
import org.utbot.framework.plugin.api.UtAssembleModel
88
import org.utbot.framework.plugin.api.UtCompositeModel
99
import org.utbot.framework.plugin.api.UtExecutableCallModel
1010
import org.utbot.framework.plugin.api.UtModel
1111
import org.utbot.framework.plugin.api.UtNullModel
12-
import org.utbot.framework.plugin.api.UtStatementModel
1312
import org.utbot.framework.plugin.api.util.defaultValueModel
1413
import org.utbot.framework.plugin.api.util.executableId
1514
import org.utbot.framework.plugin.api.util.id
@@ -22,7 +21,6 @@ import org.utbot.framework.plugin.api.util.jClass
2221
import org.utbot.framework.plugin.api.util.kClass
2322
import org.utbot.fuzzer.providers.AbstractModelProvider
2423
import java.util.*
25-
import java.util.function.IntSupplier
2624
import kotlin.collections.ArrayList
2725
import kotlin.collections.HashMap
2826
import kotlin.reflect.KClass

‎utbot-js/src/main/kotlin/api/JsUtModelConstructor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package api
22

33
import fuzzer.providers.JsObjectModelProvider
4-
import org.utbot.framework.concrete.UtModelConstructorInterface
4+
import org.utbot.framework.concrete.contructors.UtModelConstructorInterface
55
import org.utbot.framework.plugin.api.ClassId
66
import org.utbot.framework.plugin.api.UtAssembleModel
77
import org.utbot.framework.plugin.api.UtExecutableCallModel

0 commit comments

Comments
 (0)