Skip to content

Commit d59bef1

Browse files
sergeypospelovsergeypospelov
committed
Fix: failing tests
1 parent 2c30fae commit d59bef1

File tree

2 files changed

+21
-26
lines changed

2 files changed

+21
-26
lines changed

‎utbot-framework-test/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class AssembleModelGeneratorTests {
184184
val firstExpectedRepresentation = printExpectedModel(testClassId.simpleName, v1, statementsChain.toList())
185185

186186
statementsChain.clear()
187-
statementsChain.add("val $v2 = ${innerClassId.canonicalName}()")
187+
statementsChain.add("${innerClassId.canonicalName}()")
188188
statementsChain.add("$v2." + addExpectedSetter("a", 2))
189189
statementsChain.add("$v2." + ("b" `=` 4))
190190
val secondExpectedRepresentation = printExpectedModel(innerClassId.simpleName, v2, statementsChain.toList())
@@ -238,7 +238,7 @@ class AssembleModelGeneratorTests {
238238
val firstExpectedRepresentation = printExpectedModel(listClassId.simpleName, v1, statementsChain.toList())
239239

240240
statementsChain.clear()
241-
statementsChain.add("val $v2 = ${listClassId.canonicalName}()")
241+
statementsChain.add("${listClassId.canonicalName}()")
242242
statementsChain.add("$v2." + addExpectedSetter("value", 2))
243243
val secondExpectedRepresentation = printExpectedModel(listClassId.simpleName, v2, statementsChain.toList())
244244

@@ -268,13 +268,13 @@ class AssembleModelGeneratorTests {
268268
val firstExpectedRepresentation = printExpectedModel(listClassId.simpleName, v1, statementsChain.toList())
269269

270270
statementsChain.clear()
271-
statementsChain.add("val $v2 = ${listClassId.canonicalName}()")
271+
statementsChain.add("${listClassId.canonicalName}()")
272272
statementsChain.add("$v2." + addExpectedSetter("value", 2))
273273
statementsChain.add("$v2." + addExpectedSetter("next", v3))
274274
val secondExpectedRepresentation = printExpectedModel(listClassId.simpleName, v2, statementsChain.toList())
275275

276276
statementsChain.clear()
277-
statementsChain.add("val $v3 = ${listClassId.canonicalName}()")
277+
statementsChain.add("${listClassId.canonicalName}()")
278278
statementsChain.add("$v3." + addExpectedSetter("value", 3))
279279
statementsChain.add("$v3." + addExpectedSetter("next", v1))
280280
val thirdExpectedRepresentation = printExpectedModel(listClassId.simpleName, v3, statementsChain.toList())
@@ -989,7 +989,7 @@ class AssembleModelGeneratorTests {
989989
val firstExpectedRepresentation = printExpectedModel(listClassId.simpleName, v1, statementsChain.toList())
990990

991991
statementsChain.clear()
992-
statementsChain.add("val $v2 = ${listClassId.canonicalName}()")
992+
statementsChain.add("${listClassId.canonicalName}()")
993993
statementsChain.add("$v2." + addExpectedSetter("value", 2))
994994
val secondExpectedRepresentation = printExpectedModel(listClassId.simpleName, v2, statementsChain.toList())
995995

@@ -1017,7 +1017,7 @@ class AssembleModelGeneratorTests {
10171017
val firstExpectedRepresentation = printExpectedModel(listClassId.simpleName, v1, statementsChain.toList())
10181018

10191019
statementsChain.clear()
1020-
statementsChain.add("val $v2 = ${listClassId.canonicalName}()")
1020+
statementsChain.add("${listClassId.canonicalName}()")
10211021
statementsChain.add("$v2." + addExpectedSetter("value", 2))
10221022
statementsChain.add("$v2." + addExpectedSetter("next", v1))
10231023
val secondExpectedRepresentation = printExpectedModel(listClassId.simpleName, v2, statementsChain)
@@ -1140,7 +1140,7 @@ class AssembleModelGeneratorTests {
11401140
statementsChain.add(
11411141
"$v1." + ("array" `=` "[" +
11421142
"null, " +
1143-
"UtAssembleModel(${innerClassId.simpleName} $v2) val $v2 = ${innerClassId.canonicalName}() $v2.setA(5), " +
1143+
"UtAssembleModel(${innerClassId.simpleName} $v2) ${innerClassId.canonicalName}() $v2.setA(5), " +
11441144
"null" +
11451145
"]")
11461146
)
@@ -1240,8 +1240,8 @@ class AssembleModelGeneratorTests {
12401240
val v3 = createExpectedVariableName<PrimitiveFields>()
12411241
statementsChain.add(
12421242
"$v1." + ("array" `=` "[" +
1243-
"[UtAssembleModel(${innerClassId.simpleName} $v2) val $v2 = ${innerClassId.canonicalName}() $v2.setA(5), ${null}], " +
1244-
"[UtAssembleModel(${innerClassId.simpleName} $v3) val $v3 = ${innerClassId.canonicalName}() $v3.b = 4, ${null}]" +
1243+
"[UtAssembleModel(${innerClassId.simpleName} $v2) ${innerClassId.canonicalName}() $v2.setA(5), ${null}], " +
1244+
"[UtAssembleModel(${innerClassId.simpleName} $v3) ${innerClassId.canonicalName}() $v3.b = 4, ${null}]" +
12451245
"]")
12461246
)
12471247

@@ -1480,7 +1480,7 @@ class AssembleModelGeneratorTests {
14801480
val varName = createExpectedVariableName<T>()
14811481

14821482
val paramString = if (params.any()) params.joinToString(", ") else ""
1483-
this.add("val $varName = $fqn($paramString)")
1483+
this.add("$fqn($paramString)")
14841484

14851485
return varName
14861486
}

‎utbot-fuzzers/src/test/kotlin/org/utbot/framework/plugin/api/ModelProviderTest.kt

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ class ModelProviderTest {
206206
assertTrue(models[0]!!.all { it is UtAssembleModel && it.classId == classId })
207207

208208
models[0]!!.filterIsInstance<UtAssembleModel>().forEachIndexed { index, model ->
209-
assertEquals(1, model.instantiationStatement.size)
210-
val stm = model.instantiationStatement[0]
209+
val stm = model.instantiationCall
211210
val paramCountInConstructorAsTheyListed = index + 1
212211
assertEquals(paramCountInConstructorAsTheyListed, stm.params.size)
213212
}
@@ -247,9 +246,8 @@ class ModelProviderTest {
247246

248247
assertEquals(1, models.size)
249248
assertTrue(models[0]!!.isNotEmpty())
250-
val chain = (models[0]!![0] as UtAssembleModel).instantiationStatement
251-
assertEquals(1, chain.size)
252-
chain[0].params.forEach {
249+
val chain = (models[0]!![0] as UtAssembleModel).instantiationCall
250+
chain.params.forEach {
253251
assertEquals(intClassId, it.classId)
254252
}
255253
}
@@ -366,14 +364,13 @@ class ModelProviderTest {
366364
assertEquals(1, result[0]!!.size)
367365
assertInstanceOf(UtAssembleModel::class.java, result[0]!![0])
368366
assertEquals(A::class.java.id, result[0]!![0].classId)
369-
(result[0]!![0] as UtAssembleModel).instantiationStatement.forEach {
367+
(result[0]!![0] as UtAssembleModel).instantiationCall.let {
370368
assertEquals(1, it.params.size)
371369
val objectParamInConstructor = it.params[0]
372370
assertInstanceOf(UtAssembleModel::class.java, objectParamInConstructor)
373371
val innerAssembledModel = objectParamInConstructor as UtAssembleModel
374372
assertEquals(Any::class.java.id, innerAssembledModel.classId)
375-
assertEquals(1, innerAssembledModel.instantiationStatement.size)
376-
val objectCreation = innerAssembledModel.instantiationStatement.first()
373+
val objectCreation = innerAssembledModel.instantiationCall
377374
assertEquals(0, objectCreation.params.size)
378375
assertInstanceOf(ConstructorId::class.java, objectCreation.executable)
379376
}
@@ -395,13 +392,12 @@ class ModelProviderTest {
395392
assertEquals(1, result.size)
396393
assertEquals(1, result[0]!!.size)
397394
val outerModel = result[0]!![0] as UtAssembleModel
398-
outerModel.instantiationStatement.forEach {
395+
outerModel.instantiationCall.let {
399396
val constructorParameters = it.params
400397
assertEquals(1, constructorParameters.size)
401398
val innerModel = (constructorParameters[0] as UtAssembleModel)
402399
assertEquals(MyA::class.java.id, innerModel.classId)
403-
assertEquals(1, innerModel.instantiationStatement.size)
404-
val innerConstructorParameters = innerModel.instantiationStatement[0]
400+
val innerConstructorParameters = innerModel.instantiationCall
405401
assertEquals(1, innerConstructorParameters.params.size)
406402
assertInstanceOf(UtNullModel::class.java, innerConstructorParameters.params[0])
407403
}
@@ -437,13 +433,12 @@ class ModelProviderTest {
437433
assertEquals(1, result.size)
438434
assertEquals(1, result[0]!!.size)
439435
val outerModel = result[0]!![0] as UtAssembleModel
440-
outerModel.instantiationStatement.forEach {
436+
outerModel.instantiationCall.let {
441437
val constructorParameters = it.params
442438
assertEquals(1, constructorParameters.size)
443439
val innerModel = (constructorParameters[0] as UtAssembleModel)
444440
assertEquals(Inner::class.java.id, innerModel.classId)
445-
assertEquals(1, innerModel.instantiationStatement.size)
446-
val innerConstructorParameters = innerModel.instantiationStatement[0]
441+
val innerConstructorParameters = innerModel.instantiationCall
447442
assertEquals(2, innerConstructorParameters.params.size)
448443
assertTrue(innerConstructorParameters.params.all { param -> param is UtPrimitiveModel })
449444
assertEquals(intClassId, innerConstructorParameters.params[0].classId)
@@ -539,15 +534,15 @@ class ModelProviderTest {
539534

540535
for (model in models) {
541536
val outerModel = (model as? UtAssembleModel)
542-
?.instantiationStatement as? UtExecutableCallModel
537+
?.instantiationCall
543538
?: fail("No final instantiation model found for the outer class")
544539
for (param in outerModel.params) {
545540
when (param) {
546541
is UtEnumConstantModel -> {
547542
assertEquals(expectedIds[param.value], param.id)
548543
}
549544
is UtAssembleModel -> {
550-
for (enumParam in (param.instantiationStatement as UtExecutableCallModel).params) {
545+
for (enumParam in param.instantiationCall.params) {
551546
enumParam as UtEnumConstantModel
552547
assertEquals(expectedIds[enumParam.value], enumParam.id)
553548
}

0 commit comments

Comments
 (0)