enabled the test for T?.getOrElse and fixed up minor glitch in assertEquals
This commit is contained in:
@@ -2,38 +2,34 @@ package test.standard
|
||||
|
||||
import std.*
|
||||
import stdhack.test.*
|
||||
import stdhack.test.assertEquals
|
||||
|
||||
class GetOrElseTest() : TestSupport() {
|
||||
val v1: String? = "hello"
|
||||
val v2: String? = null
|
||||
|
||||
fun testDefaultValue() {
|
||||
/**
|
||||
TODO compiler error?
|
||||
|
||||
assertEquals("hello", v1.getOrElse("bar"))
|
||||
assertEquals("bar", v2.getOrElse("bar"))
|
||||
|
||||
expect("hello") {
|
||||
v1.getOrElse("bar")
|
||||
}
|
||||
}
|
||||
|
||||
fun testDefaultValueOnNull() {
|
||||
assertEquals("bar", v2.getOrElse("bar"))
|
||||
|
||||
expect("bar") {
|
||||
v2.getOrElse("bar")
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
fun testLazyDefaultValue() {
|
||||
var counter = 0
|
||||
|
||||
/**
|
||||
TODO compiler error?
|
||||
assertEquals("hello", v1.getOrElse{ counter++; "bar"}
|
||||
assertEquals("hello", v1.getOrElse{ counter++; "bar"})
|
||||
assertEquals(counter, 0, "counter should not be incremented yet")
|
||||
|
||||
assertEquals("bar", v2.getOrElse{ counter++; "bar"}
|
||||
assertEquals("bar", v2.getOrElse{ counter++; "bar"})
|
||||
assertEquals(counter, 1, "counter should be incremented in the default function")
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,10 +89,14 @@ fun assertFalse(actual: Boolean, message: String = "") {
|
||||
return assertEquals(false, actual, message)
|
||||
}
|
||||
|
||||
fun assertEquals(expected: Any, actual: Any?, message: String = "") {
|
||||
fun assertEquals(expected: Any?, actual: Any?, message: String = "") {
|
||||
Assert.assertEquals(message, expected, actual)
|
||||
}
|
||||
|
||||
fun assertNotNull(actual: Any?, message: String = "") {
|
||||
Assert.assertNotNull(message, actual)
|
||||
}
|
||||
|
||||
fun assertNull(actual: Any?, message: String = "") {
|
||||
Assert.assertNull(message, actual)
|
||||
}
|
||||
|
||||
@@ -2,11 +2,8 @@ package test.dom
|
||||
|
||||
import std.*
|
||||
import std.dom.*
|
||||
import stdhack.test.TestSupport
|
||||
import stdhack.test.*
|
||||
import stdhack.test.assertNull
|
||||
import org.w3c.dom.*
|
||||
import stdhack.test.assertEquals
|
||||
import std.dom.toXmlString
|
||||
|
||||
class DomTest() : TestSupport() {
|
||||
|
||||
Reference in New Issue
Block a user