From 04220935e004f8b9a6389c2f109168f75f0a38fa Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Wed, 8 Feb 2012 07:56:51 +0000
Subject: [PATCH] enabled the test for T?.getOrElse and fixed up minor glitch
 in assertEquals

---
 testlib/test/GetOrElseTest.kt | 18 +++++++-----------
 testlib/test/Test.kt          |  6 +++++-
 testlib/test/dom/DomTest.kt   |  3 ---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/testlib/test/GetOrElseTest.kt b/testlib/test/GetOrElseTest.kt
index 7507936f0b6..fef7087fa65 100644
--- a/testlib/test/GetOrElseTest.kt
+++ b/testlib/test/GetOrElseTest.kt
@@ -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")
-        */
     }
 }
diff --git a/testlib/test/Test.kt b/testlib/test/Test.kt
index b4cd6d0e0c8..e8eada76036 100644
--- a/testlib/test/Test.kt
+++ b/testlib/test/Test.kt
@@ -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)
 }
diff --git a/testlib/test/dom/DomTest.kt b/testlib/test/dom/DomTest.kt
index 41b4ea179da..0f09aadc17f 100644
--- a/testlib/test/dom/DomTest.kt
+++ b/testlib/test/dom/DomTest.kt
@@ -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() {