From d266f546f48f15ffda50518b8a33802a6df68307 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 15 Jun 2016 21:35:15 +0300
Subject: [PATCH] Remove obsolete and not relevant to stdlib tests

---
 .../test/semantics/StdLibGetOtElseTest.java   | 27 -----------
 libraries/stdlib/test/DataClassTest.kt        | 27 -----------
 libraries/stdlib/test/GetOrElseTest.kt        | 42 -----------------
 libraries/stdlib/test/JavaClassTest.kt        | 15 ------
 libraries/stdlib/test/OldStdlibTest.kt        | 34 --------------
 libraries/stdlib/test/io/IOStreams.kt         | 16 ++++++-
 libraries/stdlib/test/js/SimpleTest.kt        | 19 --------
 .../language/StringExpressionExampleTest.kt   | 47 -------------------
 .../stdlib/test/language/main/MainFunction.kt |  5 --
 .../test/language/main/MainFunctionInt.kt     |  6 ---
 .../test/language/main/MainFunctionUnit.kt    |  5 --
 11 files changed, 15 insertions(+), 228 deletions(-)
 delete mode 100644 js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java
 delete mode 100644 libraries/stdlib/test/DataClassTest.kt
 delete mode 100644 libraries/stdlib/test/GetOrElseTest.kt
 delete mode 100644 libraries/stdlib/test/JavaClassTest.kt
 delete mode 100644 libraries/stdlib/test/OldStdlibTest.kt
 delete mode 100644 libraries/stdlib/test/js/SimpleTest.kt
 delete mode 100644 libraries/stdlib/test/language/StringExpressionExampleTest.kt
 delete mode 100644 libraries/stdlib/test/language/main/MainFunction.kt
 delete mode 100644 libraries/stdlib/test/language/main/MainFunctionInt.kt
 delete mode 100644 libraries/stdlib/test/language/main/MainFunctionUnit.kt

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java
deleted file mode 100644
index 992a4acbce0..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.js.test.semantics;
-
-import junit.framework.Test;
-
-//NOTE: well, it has tests
-@SuppressWarnings("JUnitTestCaseWithNoTests")
-public final class StdLibGetOtElseTest extends JsUnitTestBase {
-    public static Test suite() throws Exception {
-        return createTestSuiteForFile("libraries/stdlib/test/GetOrElseTest.kt");
-    }
-}
diff --git a/libraries/stdlib/test/DataClassTest.kt b/libraries/stdlib/test/DataClassTest.kt
deleted file mode 100644
index 9814403466a..00000000000
--- a/libraries/stdlib/test/DataClassTest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package test.dataclass
-
-import org.junit.Test
-import kotlin.test.*
-
-
-/**
- */
-class DataClassTest {
-    @Test
-    fun dataClass() {
-        val p = Person("James", 43)
-        println("Got $p")
-        assertEquals("Person(name=James, age=43)", "$p", "toString")
-
-        val (a, b) = p
-        assertEquals("James", a, "a")
-        assertEquals(43, b, "b")
-
-        assertEquals(Person("James", 43), Person("James", 43), "person equals")
-
-        // TODO not implemented yet
-        // assertTrue(Person("ZZZ", 21) > Person("AAA", 21), "person a > b")
-    }
-}
-
-data class Person(val name: String, val age: Int)
\ No newline at end of file
diff --git a/libraries/stdlib/test/GetOrElseTest.kt b/libraries/stdlib/test/GetOrElseTest.kt
deleted file mode 100644
index 7534c69d231..00000000000
--- a/libraries/stdlib/test/GetOrElseTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package test.standard
-
-import kotlin.*
-import kotlin.test.*
-import org.junit.Test as test
-
-class GetOrElseTest {
-    val v1: String? = "hello"
-    val v2: String? = null
-    var counter = 0
-
-    @test fun defaultValue() {
-        assertEquals("hello", v1?: "bar")
-
-        expect("hello") {
-            v1?: "bar"
-        }
-    }
-
-    @test fun defaultValueOnNull() {
-        assertEquals("bar", v2?: "bar")
-
-        expect("bar") {
-            v2?: "bar"
-        }
-    }
-
-    fun calculateBar(): String {
-        counter++
-        return "bar"
-    }
-
-    @test fun lazyDefaultValue() {
-        counter = 0
-
-        assertEquals("hello", v1?: calculateBar())
-        assertEquals(counter, 0, "counter should not be incremented yet")
-
-        assertEquals("bar", v2?: calculateBar())
-        assertEquals(counter, 1, "counter should be incremented in the default function")
-    }
-}
diff --git a/libraries/stdlib/test/JavaClassTest.kt b/libraries/stdlib/test/JavaClassTest.kt
deleted file mode 100644
index 8bfec0fcdf8..00000000000
--- a/libraries/stdlib/test/JavaClassTest.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package testjc
-
-import kotlin.test.*
-import junit.framework.TestCase
-import java.util.*
-
-class C()
-
-class JavaClassTest() : TestCase() {
-    fun testMe () {
-        assertEquals("java.util.ArrayList", java.util.ArrayList<Any>().javaClass.name)
-        assertEquals("java.util.ArrayList", ArrayList::class.java.name)
-        assertEquals("testjc.C", C::class.java.name)
-    }
-}
\ No newline at end of file
diff --git a/libraries/stdlib/test/OldStdlibTest.kt b/libraries/stdlib/test/OldStdlibTest.kt
deleted file mode 100644
index 4162d366947..00000000000
--- a/libraries/stdlib/test/OldStdlibTest.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package test.collections
-
-import kotlin.*
-import kotlin.io.*
-import kotlin.test.*
-import org.junit.Test as test
-
-class OldStdlibTest() {
-    @test fun testCollectionEmpty() {
-        assertFalse {
-            listOf(0, 1, 2).isEmpty()
-        }
-    }
-
-    @test fun testCollectionSize() {
-        assertTrue {
-            listOf(0, 1, 2).size == 3
-        }
-    }
-
-    @test fun testInputStreamIterator() {
-        val x = ByteArray (10)
-
-        for(index in 0..9) {
-            x [index] = index.toByte()
-        }
-
-        x.inputStream().buffered().use { stream ->
-            for(b in stream) {
-                println(b)
-            }
-        }
-    }
-}
diff --git a/libraries/stdlib/test/io/IOStreams.kt b/libraries/stdlib/test/io/IOStreams.kt
index 5b855591126..0e84966001b 100644
--- a/libraries/stdlib/test/io/IOStreams.kt
+++ b/libraries/stdlib/test/io/IOStreams.kt
@@ -15,7 +15,7 @@ class IOStreamsTest {
         } finally {
             writer?.close()
         }
-        var act: String?
+        val act: String?
         var reader: BufferedReader? = null
         try {
             reader = tmpFile.inputStream().reader().buffered()
@@ -25,4 +25,18 @@ class IOStreamsTest {
         }
         assertEquals("Hello, World!", act)
     }
+
+    @test fun testInputStreamIterator() {
+        val x = ByteArray(10) { it.toByte() }
+
+        val result = mutableListOf<Byte>()
+
+        x.inputStream().buffered().use { stream ->
+            for(b in stream) {
+                result += b
+            }
+        }
+
+        assertEquals(x.asList(), result)
+    }
 }
diff --git a/libraries/stdlib/test/js/SimpleTest.kt b/libraries/stdlib/test/js/SimpleTest.kt
deleted file mode 100644
index dfed65de5cd..00000000000
--- a/libraries/stdlib/test/js/SimpleTest.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package testPackage
-
-import org.junit.Test as test
-import kotlin.test.*
-
-class SimpleTest {
-
-    public fun testFoo() {
-        val name = "world"
-        val message = "hello $name!"
-        assertEquals("hello world!", message)
-    }
-
-    @test fun cheese() {
-        val name = "world"
-        val message = "bye $name!"
-        assertEquals("bye world!", message)
-    }
-}
diff --git a/libraries/stdlib/test/language/StringExpressionExampleTest.kt b/libraries/stdlib/test/language/StringExpressionExampleTest.kt
deleted file mode 100644
index 8f5e3293a8a..00000000000
--- a/libraries/stdlib/test/language/StringExpressionExampleTest.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package language
-
-import org.junit.Test as test
-import kotlin.test.*
-
-class Product(val name: String, val price: Double) {
-}
-
-class Customer(val name: String, val products: List<Product>) {
-}
-
-
-fun customerTemplate(customer: Customer) = """
-<html>
-<body>
-<h1>Hello ${customer.name}</h1>
-<ul>
-${customer.products.map{ productSnippet(it) }.joinToString("\n")}
-</ul>
-<p>lets do some kool stuff</p>
-</body>
-"""
-
-fun productSnippet(product: Product) = "<li>${product.name}. Price : ${product.price}</li>"
-
-// TODO support number formatting methods?
-// fun productSnippet(product: Product) = "<li>${product.name}. Price : ${product.price.format('## ###,00')} </li>"
-
-val EXPECTED = """
-<html>
-<body>
-<h1>Hello James</h1>
-<ul>
-<li>Beer. Price : 1.99</li>
-<li>Wine. Price : 5.99</li>
-</ul>
-<p>lets do some kool stuff</p>
-</body>
-"""
-
-class StringExpressionExampleTest {
-    val customer = Customer("James", arrayListOf(Product("Beer", 1.99), Product("Wine", 5.99)))
-
-    @test fun testExpressions(): Unit {
-        assertEquals(EXPECTED, customerTemplate(customer))
-    }
-}
\ No newline at end of file
diff --git a/libraries/stdlib/test/language/main/MainFunction.kt b/libraries/stdlib/test/language/main/MainFunction.kt
deleted file mode 100644
index 076950b50ee..00000000000
--- a/libraries/stdlib/test/language/main/MainFunction.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package language.main
-
-fun main(args: Array<String>) {
-    println("Hello world!")
-}
diff --git a/libraries/stdlib/test/language/main/MainFunctionInt.kt b/libraries/stdlib/test/language/main/MainFunctionInt.kt
deleted file mode 100644
index ae30f25876e..00000000000
--- a/libraries/stdlib/test/language/main/MainFunctionInt.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package language.mainint
-
-fun main(args: Array<String>): Int {
-    println("Hello world: Int")
-    return 0
-}
diff --git a/libraries/stdlib/test/language/main/MainFunctionUnit.kt b/libraries/stdlib/test/language/main/MainFunctionUnit.kt
deleted file mode 100644
index cb42144ad06..00000000000
--- a/libraries/stdlib/test/language/main/MainFunctionUnit.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package language.mainunit
-
-fun main(args: Array<String>): Unit {
-    println("Hello world: Unit")
-}