From 4e4d0b448cab807df7148f68a6acf11483595421 Mon Sep 17 00:00:00 2001
From: Ilya Ryzhenkov <orangy@jetbrains.com>
Date: Fri, 6 Jun 2014 01:31:04 +0400
Subject: [PATCH] Minor. Cleanup test.

---
 libraries/stdlib/test/collections/StreamTest.kt | 10 +++++-----
 libraries/stdlib/test/text/StringUtilTest.kt    | 10 ++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libraries/stdlib/test/collections/StreamTest.kt b/libraries/stdlib/test/collections/StreamTest.kt
index 1e8f6562e56..c65dc8a820d 100644
--- a/libraries/stdlib/test/collections/StreamTest.kt
+++ b/libraries/stdlib/test/collections/StreamTest.kt
@@ -9,7 +9,7 @@ fun fibonacci(): Stream<Int> {
     var index = 0;
     var a = 0;
     var b = 1
-    return stream<Int> {
+    return stream {
         when (index++) { 0 -> a; 1 -> b; else -> {
             val result = a + b; a = b; b = result; result
         } }
@@ -81,8 +81,8 @@ public class StreamTest {
 
     test fun plus() {
         val stream = listOf("foo", "bar").stream()
-        val streamChease = stream + "cheese"
-        assertEquals(listOf("foo", "bar", "cheese"), streamChease.toList())
+        val streamCheese = stream + "cheese"
+        assertEquals(listOf("foo", "bar", "cheese"), streamCheese.toList())
 
         // lets use a mutable variable
         var mi = listOf("a", "b").stream()
@@ -118,7 +118,7 @@ public class StreamTest {
     test fun streamFromFunction() {
         var count = 3
 
-        val stream = stream<Int> {
+        val stream = stream {
             count--
             if (count >= 0) count else null
         }
@@ -128,7 +128,7 @@ public class StreamTest {
     }
 
     test fun streamFromFunctionWithInitialValue() {
-        val values = stream<Int>(3) { n -> if (n > 0) n - 1 else null }
+        val values = stream(3) { n -> if (n > 0) n - 1 else null }
         assertEquals(arrayListOf(3, 2, 1, 0), values.toList())
     }
 
diff --git a/libraries/stdlib/test/text/StringUtilTest.kt b/libraries/stdlib/test/text/StringUtilTest.kt
index 3998aaeedd7..5414c3dc515 100644
--- a/libraries/stdlib/test/text/StringUtilTest.kt
+++ b/libraries/stdlib/test/text/StringUtilTest.kt
@@ -3,14 +3,12 @@ package test.text
 import kotlin.*
 import kotlin.test.*
 import kotlin.util.*
+import org.junit.Test as test
 
-import junit.framework.*
-
-class StringUtilTest() : TestCase() {
-
-    fun testToRegex() {
+class StringUtilTest() {
+    test fun toRegex() {
         val re = """foo""".toRegex()
         val list = re.split("hellofoobar").toList()
-        assertEquals(arrayList("hello", "bar"), list)
+        assertEquals(listOf("hello", "bar"), list)
     }
 }