Dropped some TODOs

#KT-2564 Obsolete. Looks like, it's fixed in dcddd04.

libraries/stdlib/test/PreconditionsTest.kt

@@ -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)
+        }
+    }
 }

libraries/stdlib/test/StandardCollectionTest.kt

@@ -9,10 +9,8 @@ class StandardCollectionTest() : TestCase() {
   fun testDisabled() {
   }
 
-  /*
   fun testAny() {
-    // TODO requires KT-924 to be implemented
-    val data: Iterable<String> = kotlin.util.arrayList("foo", "bar")
+    val data: Iterable<String> = listOf("foo", "bar")
 
     assertTrue {
       data.any{it.startsWith("f")}
@@ -21,5 +19,4 @@ class StandardCollectionTest() : TestCase() {
       data.any{it.startsWith("x")}
     }
   }
-  */
 }