azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace assertTrue with assertEquals in AbstractKotlinEvaluateExpressionTest

Browse Source
This commit is contained in:
Nikolay Krasko
2017-12-01 17:38:05 +03:00
parent 04e6aa76cf
commit b21fb1a375
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+14 -5
View File
@@ -84,6 +84,7 @@ abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() {
override fun append(event: LoggingEvent?) { override fun append(event: LoggingEvent?) {
println(event?.renderedMessage, ProcessOutputTypes.SYSTEM) println(event?.renderedMessage, ProcessOutputTypes.SYSTEM)
} }
override fun close() {} override fun close() {}
override fun requiresLayout() = false override fun requiresLayout() = false
} }
@@ -464,13 +465,20 @@ abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() {
val value = evaluator.evaluate(this@AbstractKotlinEvaluateExpressionTest.evaluationContext) val value = evaluator.evaluate(this@AbstractKotlinEvaluateExpressionTest.evaluationContext)
val actualResult = value.asValue().asString() val actualResult = value.asValue().asString()
if (expectedResult != null) { if (expectedResult != null) {
Assert.assertTrue("Evaluate expression returns wrong result for ${item.text}:" + Assert.assertEquals(
"\nexpected = $expectedResult\nactual = $actualResult\n", expectedResult == actualResult) "Evaluate expression returns wrong result for ${item.text}:\n" +
"expected = $expectedResult\n" +
"actual = $actualResult\n",
expectedResult, actualResult)
} }
} }
catch (e: EvaluateException) { catch (e: EvaluateException) {
Assert.assertTrue("Evaluate expression throws wrong exception for ${item.text}:" + val expectedMessage = e.message?.replaceFirst(ID_PART_REGEX, "id=ID")
"\nexpected = $expectedResult\nactual = ${e.message}\n", expectedResult == e.message?.replaceFirst(ID_PART_REGEX, "id=ID")) Assert.assertEquals(
"Evaluate expression throws wrong exception for ${item.text}:\n" +
"expected = $expectedResult\n" +
"actual = $expectedMessage\n",
expectedResult, expectedMessage)
} }
} }
} }
@@ -479,7 +487,8 @@ abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() {
private fun SuspendContextImpl.runActionInSuspendCommand(action: SuspendContextImpl.() -> Unit) { private fun SuspendContextImpl.runActionInSuspendCommand(action: SuspendContextImpl.() -> Unit) {
if (myInProgress) { if (myInProgress) {
action() action()
} else { }
else {
val command = object : SuspendContextCommandImpl(this) { val command = object : SuspendContextCommandImpl(this) {
override fun contextAction(suspendContext: SuspendContextImpl) { override fun contextAction(suspendContext: SuspendContextImpl) {
action(suspendContext) action(suspendContext)