Commit 1787b42

authored

Fix empty else-branch in parameterized test generation #518 (#908)

Add assertNotNull for actual in parameterized test generation

1 parent 1197115 commit 1787b42Copy full SHA for 1787b42

File tree

3 files changed

+15

-5

lines changed

utbot-framework/src/main/kotlin/org/utbot/framework/codegen
- Domain.kt
- model/constructor/tree
  - CgMethodConstructor.kt
  - TestFrameworkManager.kt

3 files changed

+15

-5

lines changed

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,8 @@ sealed class TestFramework(`
`219`	`219`
`220`	`220`	`val assertNull by lazy { assertionId("assertNull", objectClassId) }`
`221`	`221`
	`222`	`+ val assertNotNull by lazy { assertionId("assertNotNull", objectClassId) }`
	`223`	`+`
`222`	`224`	`val assertFalse by lazy { assertionId("assertFalse", booleanClassId) }`
`223`	`225`
`224`	`226`	`val assertTrue by lazy { assertionId("assertTrue", booleanClassId) }`

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt‎`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1212,7 +1212,10 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c`
`1212`	`1212`	`else -> ifStatement(`
`1213`	`1213`	`CgEqualTo(expected, nullLiteral()),`
`1214`	`1214`	`trueBranch = { +testFrameworkManager.assertions[testFramework.assertNull](actual).toStatement() },`
`1215`		`- falseBranch = { generateDeepEqualsAssertion(expected, actual) }`
	`1215`	`+ falseBranch = {`
	`1216`	`+ +testFrameworkManager.assertions[testFrameworkManager.assertNotNull](actual).toStatement()`
	`1217`	`+ generateDeepEqualsAssertion(expected, actual)`
	`1218`	`+ }`
`1216`	`1219`	`)`
`1217`	`1220`	`}`
`1218`	`1221`	`}`
`@@ -1344,10 +1347,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c`
`1344`	`1347`	`fun createParameterizedTestMethod(testSet: CgMethodTestSet, dataProviderMethodName: String): CgTestMethod {`
`1345`	`1348`	`//TODO: orientation on generic execution may be misleading, but what is the alternative?`
`1346`	`1349`	`//may be a heuristic to select a model with minimal number of internal nulls should be used`
`1347`		`- val genericExecution = testSet.executions`
`1348`		`- .firstOrNull { it.result is UtExecutionSuccess && (it.result as UtExecutionSuccess).model !is UtNullModel }`
`1349`		`- ?: testSet.executions`
`1350`		`- .firstOrNull { it.result is UtExecutionSuccess } ?: testSet.executions.first()`
	`1350`	`+ val genericExecution = chooseGenericExecution(testSet.executions)`
`1351`	`1351`
`1352`	`1352`	`val statics = genericExecution.stateBefore.statics`
`1353`	`1353`
`@@ -1415,6 +1415,13 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c`
`1415`	`1415`	`}`
`1416`	`1416`	`}`
`1417`	`1417`
	`1418`	`+ private fun chooseGenericExecution(executions: List<UtExecution>): UtExecution {`
	`1419`	`+ return executions`
	`1420`	`+ .firstOrNull { it.result is UtExecutionSuccess && (it.result as UtExecutionSuccess).model !is UtNullModel }`
	`1421`	`+ ?: executions`
	`1422`	`+ .firstOrNull { it.result is UtExecutionSuccess } ?: executions.first()`
	`1423`	`+ }`
	`1424`	`+`
`1418`	`1425`	`private fun createParameterDeclarations(`
`1419`	`1426`	`testSet: CgMethodTestSet,`
`1420`	`1427`	`genericExecution: UtExecution,`

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/TestFrameworkManager.kt‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ internal abstract class TestFrameworkManager(val context: CgContext)`
`60`	`60`	`val assertDoubleEquals = context.testFramework.assertDoubleEquals`
`61`	`61`
`62`	`62`	`val assertNull = context.testFramework.assertNull`
	`63`	`+ val assertNotNull = context.testFramework.assertNotNull`
`63`	`64`	`val assertTrue = context.testFramework.assertTrue`
`64`	`65`	`val assertFalse = context.testFramework.assertFalse`
`65`	`66`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1787b42

File tree

3 files changed

3 files changed

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt‎`

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt‎`

`‎utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/TestFrameworkManager.kt‎`

0 commit comments