@@ -25,7 +25,6 @@ import org.utbot.framework.codegen.model.constructor.util.EnvironmentFieldStateC
25
25
import org.utbot.framework.codegen.model.constructor.util.FieldStateCache
26
26
import org.utbot.framework.codegen.model.constructor.util.classCgClassId
27
27
import org.utbot.framework.codegen.model.constructor.util.needExpectedDeclaration
28
- import org.utbot.framework.codegen.model.constructor.util.newArrayOf
29
28
import org.utbot.framework.codegen.model.constructor.util.overridesEquals
30
29
import org.utbot.framework.codegen.model.constructor.util.plus
31
30
import org.utbot.framework.codegen.model.constructor.util.typeCast
@@ -120,7 +119,7 @@ import org.utbot.framework.plugin.api.UtVoidModel
120
119
import org.utbot.framework.plugin.api.onFailure
121
120
import org.utbot.framework.plugin.api.onSuccess
122
121
import org.utbot.framework.plugin.api.util.booleanClassId
123
- import org.utbot.framework.plugin.api.util.builtinMethodId
122
+ import org.utbot.framework.plugin.api.util.builtinStaticMethodId
124
123
import org.utbot.framework.plugin.api.util.doubleArrayClassId
125
124
import org.utbot.framework.plugin.api.util.doubleClassId
126
125
import org.utbot.framework.plugin.api.util.doubleWrapperClassId
@@ -1421,21 +1420,19 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
1421
1420
argsVariable : CgVariable ,
1422
1421
arguments : List <CgExpression >,
1423
1422
) {
1423
+ val argsArray = newVar(objectArrayClassId, " testCaseObjects" ) {
1424
+ CgAllocateArray (objectArrayClassId, objectClassId, arguments.size)
1425
+ }
1426
+ for ((i, argument) in arguments.withIndex()) {
1427
+ setArgumentsArrayElement(argsArray, i, argument)
1428
+ }
1424
1429
when (testFramework) {
1425
1430
Junit5 -> {
1426
1431
+ argsVariable[addToListMethodId](
1427
- argumentsClassId[argumentsMethodId](
1428
- newArrayOf(objectClassId, arguments)
1429
- )
1432
+ argumentsClassId[argumentsMethodId](argsArray)
1430
1433
)
1431
1434
}
1432
1435
TestNg -> {
1433
- val argsArray = newVar(objectArrayClassId, " testCaseObjects" ) {
1434
- CgAllocateArray (Array <Any ?>::class .java.id, objectClassId, arguments.size)
1435
- }
1436
- for ((i, argument) in arguments.withIndex()) {
1437
- setArgumentsArrayElement(argsArray, i, argument)
1438
- }
1439
1436
setArgumentsArrayElement(argsVariable, executionIndex, argsArray)
1440
1437
}
1441
1438
Junit4 -> error(" Parameterized tests are not supported for JUnit4" )
@@ -1535,7 +1532,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
1535
1532
* A [MethodId] to call JUnit Arguments method.
1536
1533
*/
1537
1534
private val argumentsMethodId: BuiltinMethodId
1538
- get() = builtinMethodId (
1535
+ get() = builtinStaticMethodId (
1539
1536
classId = argumentsClassId,
1540
1537
name = " arguments" ,
1541
1538
returnType = argumentsClassId,
0 commit comments