Dropped some TODOs

#KT-2564 Obsolete. Looks like, it's fixed in dcddd04.
2014-02-05 16:41:10 +04:00
parent ffa2a84170
commit 33360c2528
4 changed files with 51 additions and 56 deletions
@@ -97,50 +97,50 @@ class PreconditionsTest() {
        }
    }

-// TODO: uncomment when KT-1540 is resolved.
-//    test fun passingAssert() {
-//        assert(true)
-//        var called = false
-//        assert(true) { called = true; "some message" }
-//
-//        assertFalse(called)
-//    }
-//
-//
-//    test fun failingAssert() {
-//        val error = fails {
-//            assert(false)
-//        }
-//        if(error is IllegalStateException) {
-//            assertNull(error.getMessage())
-//        } else {
-//            fail("Invalid exception type: "+error)
-//        }
-//    }
-//
-//    test fun passingAssertWithMessage() {
-//        assert(true, "Hello")
-//    }
-//
-//    test fun failingAssertWithMessage() {
-//        val error = fails {
-//            assert(false, "Hello")
-//        }
-//        if(error is IllegalStateException) {
-//            assertEquals("Hello", error.getMessage())
-//        } else {
-//            fail("Invalid exception type: "+error)
-//        }
-//    }
-//
-//    test fun failingAssertWithLazyMessage() {
-//        val error = fails {
-//            assert(false) {"Hello"}
-//        }
-//        if(error is IllegalStateException) {
-//            assertEquals("Hello", error.getMessage())
-//        } else {
-//            fail("Invalid exception type: "+error)
-//        }
-//    }
+    test fun passingAssert() {
+        assert(true)
+        var called = false
+        assert(true) { called = true; "some message" }
+
+        assertFalse(called)
+    }
+
+    test fun failingAssert() {
+        val assertDefaultMessage = "Assertion failed"
+
+        val error = fails {
+            assert(false)
+        }
+        if(error is AssertionError) {
+            assertEquals(assertDefaultMessage, error.getMessage())
+        } else {
+            fail("Invalid exception type: "+error)
+        }
+    }
+
+    test fun passingAssertWithMessage() {
+        assert(true, "Hello")
+    }
+
+    test fun failingAssertWithMessage() {
+        val error = fails {
+            assert(false, "Hello")
+        }
+        if(error is AssertionError) {
+            assertEquals("Hello", error.getMessage())
+        } else {
+            fail("Invalid exception type: "+error)
+        }
+    }
+
+    test fun failingAssertWithLazyMessage() {
+        val error = fails {
+            assert(false) {"Hello"}
+        }
+        if(error is AssertionError) {
+            assertEquals("Hello", error.getMessage())
+        } else {
+            fail("Invalid exception type: "+error)
+        }
+    }
 }