Don't let the last tests fail

This commit is contained in:
Andrey Breslav
2013-10-14 08:21:45 +04:00
parent e9edc70758
commit b5f43dcc2d
+15 -11
View File
@@ -93,8 +93,6 @@ fun suite(): TestSuite {
eval
)
if (remainingTests.decrementAndGet() == 0) vm.resume()
fun jdi.ObjectReference?.callToString(): String? {
if (this == null) return "null"
return (eval.invokeMethod(
@@ -109,17 +107,23 @@ fun suite(): TestSuite {
}
if (value is ExceptionThrown) {
val str = value.exception.jdiObj.callToString()
System.err.println("Exception: $str")
try {
if (value is ExceptionThrown) {
val str = value.exception.jdiObj.callToString()
System.err.println("Exception: $str")
}
if (expected is ValueReturned && value is ValueReturned && value.result is ObjectValue) {
assertEquals(expected.result.obj.toString(), value.result.jdiObj.callToString())
}
else {
assertEquals(expected, value)
}
}
finally {
if (remainingTests.decrementAndGet() == 0) vm.resume()
}
if (expected is ValueReturned && value is ValueReturned && value.result is ObjectValue) {
assertEquals(expected.result.obj.toString(), value.result.jdiObj.callToString())
}
else {
assertEquals(expected, value)
}
}
}
}