From 0ac461927cf5cca00f5c08b20b0e22c22b5562b6 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 17 Oct 2016 21:29:54 +0300
Subject: [PATCH] Minor: Fix TODOs in stdlib tests

---
 libraries/stdlib/test/collections/CollectionTest.kt |  4 +---
 libraries/stdlib/test/text/StringTest.kt            | 13 +++++--------
 libraries/stdlib/test/utils/TODOTest.kt             |  4 ++--
 .../kotlin-stdlib-gen/src/templates/Generators.kt   |  2 --
 .../kotlin-stdlib-gen/src/templates/SpecialJVM.kt   |  1 -
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt
index daa45684c2a..d8429dfe4f8 100644
--- a/libraries/stdlib/test/collections/CollectionTest.kt
+++ b/libraries/stdlib/test/collections/CollectionTest.kt
@@ -483,9 +483,7 @@ class CollectionTest {
 
         val hasNulls = listOf("foo", null, "bar")
 
-        //        TODO replace with more accurate version when KT-5987 will be fixed
-        //        failsWith(javaClass<IllegalArgumentException>()) {
-        assertFails {
+        assertFailsWith<IllegalArgumentException> {
             // should throw an exception as we have a null
             hasNulls.requireNoNulls()
         }
diff --git a/libraries/stdlib/test/text/StringTest.kt b/libraries/stdlib/test/text/StringTest.kt
index 9429a260d83..aa7a8ecf6ec 100644
--- a/libraries/stdlib/test/text/StringTest.kt
+++ b/libraries/stdlib/test/text/StringTest.kt
@@ -50,17 +50,14 @@ fun Char.isAsciiUpperCase() = this in 'A'..'Z'
 
 class StringTest {
 
-    // could not be local inside isEmptyAndBlank, because local declarations is not yet supported for JS
-    // TODO: move inside after KT-11030 is implemented
-    class IsEmptyCase(val value: String?, val isNull: Boolean = false, val isEmpty: Boolean = false, val isBlank: Boolean = false)
-
     @test fun isEmptyAndBlank() = withOneCharSequenceArg { arg1 ->
+        class Case(val value: String?, val isNull: Boolean = false, val isEmpty: Boolean = false, val isBlank: Boolean = false)
 
         val cases = listOf(
-            IsEmptyCase(null,              isNull = true),
-            IsEmptyCase("",                isEmpty = true, isBlank = true),
-            IsEmptyCase("  \r\n\t\u00A0",  isBlank = true),
-            IsEmptyCase(" Some ")
+            Case(null,              isNull = true),
+            Case("",                isEmpty = true, isBlank = true),
+            Case("  \r\n\t\u00A0",  isBlank = true),
+            Case(" Some ")
         )
 
         for (case in cases) {
diff --git a/libraries/stdlib/test/utils/TODOTest.kt b/libraries/stdlib/test/utils/TODOTest.kt
index d099f461f7a..1df19fc954f 100644
--- a/libraries/stdlib/test/utils/TODOTest.kt
+++ b/libraries/stdlib/test/utils/TODOTest.kt
@@ -23,7 +23,7 @@ import org.junit.Test as test
 class TODOTest {
     private class PartiallyImplementedClass {
         public val prop: String get() = TODO()
-        //  fun method1() = TODO() as String // <- doesn't compile in JS
+        fun method1() = TODO() as String
         public fun method2(): Int = TODO()
 
         public fun method3(switch: Boolean, value: String): String {
@@ -56,7 +56,7 @@ class TODOTest {
         val inst = PartiallyImplementedClass()
 
         assertNotImplemented { inst.prop }
-//        assertNotImplemented{ inst.method1() }
+        assertNotImplemented{ inst.method1() }
         assertNotImplemented { inst.method2() }
         assertNotImplemented { inst.method4() }
         assertNotImplementedWithMessage("what if false") { inst.method3(false, "test") }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
index 7335327f911..3490a86099c 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
@@ -48,7 +48,6 @@ fun generators(): List<GenericFunction> {
             """
         }
 
-        // TODO: use build scope function when available
         // TODO: use immutable sets when available
         returns("SELF", Sets, Sequences)
         doc(Sets) {
@@ -490,7 +489,6 @@ fun generators(): List<GenericFunction> {
             while *second* list contains elements for which [predicate] yielded `false`.
             """
         }
-        // TODO: Sequence variant
         returns("Pair<List<T>, List<T>>")
         body {
             """
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt
index ea4142f6e39..84889c308eb 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt
@@ -257,7 +257,6 @@ fun specialJVM(): List<GenericFunction> {
             """
         }
 
-        // TODO: Use own readonly kotlin.AbstractList
         body(ArraysOfPrimitives) {
             """
             return object : AbstractList<T>(), RandomAccess {