Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix assertions #1096

Merged
merged 2 commits into from
Oct 5, 2022
Merged

Fix assertions #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b8dd35
fix assertions
SBOne-Kenobi Oct 5, 2022
bcc2125
fix test
SBOne-Kenobi Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,13 @@ object UtSettings : AbstractSettings(
*/
var treatOverflowAsError: Boolean by getBooleanProperty(false)

/**
* Generate tests that treat assertions as error suits.
*
* True by default.
*/
var treatAssertAsErrorSuit: Boolean by getBooleanProperty(true)

/**
* Instrument all classes before start
*/
Expand Down
5 changes: 4 additions & 1 deletion utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import org.utbot.tests.infrastructure.UtValueTestCaseChecker
import org.utbot.tests.infrastructure.isException
import org.utbot.testcheckers.eq

class JavaAssertTest : UtValueTestCaseChecker(testClass = JavaAssert::class){
class JavaAssertTest : UtValueTestCaseChecker(
testClass = JavaAssert::class,
testCodeGeneration = false
) {
@Test
fun testAssertPositive() {
checkWithException(
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ import org.utbot.summary.SummarySentenceConstants.TAB
import java.lang.reflect.InvocationTargetException
import java.security.AccessControlException
import java.lang.reflect.ParameterizedType
import org.utbot.framework.UtSettings

private const val DEEP_EQUALS_MAX_DEPTH = 5 // TODO move it to plugin settings?

Expand Down Expand Up @@ -365,6 +366,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
if (exception is AccessControlException) return false
// tests with timeout or crash should be processed differently
if (exception is TimeoutException || exception is ConcreteExecutionFailureException) return false
if (UtSettings.treatAssertAsErrorSuit && exception is AssertionError) return false

val exceptionRequiresAssert = exception !is RuntimeException || runtimeExceptionTestsBehaviour == PASS
val exceptionIsExplicit = execution.result is UtExplicitlyThrownException
Expand Down