Remove 'import java.util' from js tests.

2016-08-20 07:29:41 +03:00
parent 1eac6d47ed
commit 2aa60adbca
54 changed files with 12 additions and 73 deletions
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun test(f: () -> String): String {
    val funLit = { f() }
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 fun box(): String {
    val oneTwo = Array(2) {
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 fun box(): String {
    val oneTwo = Array(2) {
@@ -1,7 +1,5 @@
 package foo

-import java.util.ArrayList
-

 data class Holder<T>(val v: T)

@@ -7,13 +7,13 @@ data class Dat(val start: String, val end: String)
 class Obj(val start: String, val end: String)

 fun box(): String {
-    val setD = java.util.HashSet<Holder<Dat>>()
+    val setD = HashSet<Holder<Dat>>()
    setD.add(Holder(Dat("a", "b")))
    setD.add(Holder(Dat("a", "b")))
    setD.add(Holder(Dat("a", "b")))
    assertEquals(1, setD.size)

-    val setO = java.util.HashSet<Holder<Obj>>()
+    val setO = HashSet<Holder<Obj>>()
    setO.add(Holder(Obj("a", "b")))
    setO.add(Holder(Obj("a", "b")))
    setO.add(Holder(Obj("a", "b")))
@@ -1,4 +1,3 @@
-import java.util.ArrayList

 interface Tr {
    fun extra(): String = "_"
@@ -1,5 +1,3 @@
-import java.util.*
-import java.io.*

 class World() {
    public val items: ArrayList<Item> = ArrayList<Item>()
@@ -1,4 +1,3 @@
-import java.util.*

 class ArrayWrapper<T>() {
    val contents = ArrayList<T>()
@@ -1,4 +1,3 @@
-import java.util.*

 class ArrayWrapper<T>() {
    val contents = ArrayList<T>()
@@ -1,4 +1,3 @@
-import java.util.*

 class ArrayWrapper<T>() {
    val contents = ArrayList<T>()
@@ -1,4 +1,3 @@
-import java.util.*

 class ArrayWrapper<T>() {
    val contents = ArrayList<T>()
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 fun box(): String {
    val data = ArrayList<String>()
@@ -1,4 +1,3 @@
-import java.util.*

 var log = ""

@@ -1,6 +1,5 @@
 package foo

-import java.util.*;

 val d = { a: Int -> a + 1 }
 val p = { a: Int -> a * 3 }
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 fun box(): String {
    val data = myArrayList("foo", "bar")
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 fun <T> ArrayList<T>.findAll(predicate: (T) -> Boolean): ArrayList<T> {
    val result = ArrayList<T>()
@@ -183,8 +183,6 @@ fun box(): String {
 // FILE: bar.kt
 package foo

-import java.util.ArrayList
-import java.util.HashMap

 abstract class Element {
    abstract fun render(builder: StringBuilder, indent: String)
@@ -187,8 +187,6 @@ fun box(): String {
 // FILE: bar.kt
 package foo

-import java.util.ArrayList
-import java.util.HashMap

 abstract class Element {
    abstract fun render(builder: StringBuilder, indent: String)
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun box(): String {
    val a = ArrayList<Int>();
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun box(): String {
    val a = ArrayList<Int>();
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    val al = ArrayList<Int>(10)
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 var baz = 0
 fun withSideEffect(v: Int): Int {
@@ -1,7 +1,5 @@
 package foo

-import java.util.ArrayList;
-
 fun box(): String {
    val list: List<Any?> = arrayListOf(3, "2", -1, null, 0, 8, 5, "3", 77, -15)
    val subset = arrayListOf(3, "2", -1, null)
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun box(): String {
    val a = ArrayList<Int>();
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun box(): String {
    val arr = ArrayList<Int>();
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun <T> test(list: List<T>, elements: List<T>, expected: List<Int>, method: List<T>.(T) -> Int, methodName: String): String? {
    for (i in 0..elements.size - 1) {
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun box(): String {
    val a = ArrayList<Int>();
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun box(): String {
    var i = 0
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    var i = 0
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    val arr = ArrayList<Int>()
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;


 fun <T> test(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    var threwForEmptyList = false
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList;

 fun <T> test(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
    val t = ArrayList<T>(a.size)
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    var i = 0
@@ -1,6 +1,5 @@
 package foo

-import java.util.HashMap


 operator fun <K, V> Map<K, V>.iterator(): Iterator<Map.Entry<K, V>> {
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 class A {
    operator fun component1(): Int = 1
@@ -8,7 +7,7 @@ class A {
 operator fun A.component2(): String = "n"

 fun box(): String {
-    val list = ArrayList<A>()
+    val list = mutableListOf<A>()
    list.add(A())

    var i = 0;
@@ -1,6 +1,5 @@
 package foo

-import java.util.HashMap

@native
 val classes: Map<String, Any> = noImpl
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 class ArrayWrapper<T>() {
    val contents = ArrayList<T>()
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 class A<T>(val list: MutableList<T>) {
    fun addAll(c: Collection<T>) {
@@ -1,6 +1,5 @@
 package foo

-import java.util.*

 operator fun <T> ArrayList<T>.plus(other: Collection<T>): List<T> {
    val c = ArrayList<T>()
@@ -1,9 +1,8 @@
 package foo

-import java.util.ArrayList

 fun testDownTo() {
-    var elems = ArrayList<Int>()
+    var elems = mutableListOf<Int>()
    for (i in 4 downTo 0) {
        elems.add(i)
    }
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    var elems = ArrayList<Int>()
@@ -1,6 +1,5 @@
 package foo

-import java.util.ArrayList

 fun box(): String {
    for (i in 0.rangeTo(-1)) {
@@ -1,7 +1,6 @@
 // KT-5192 JS compiler fails to generate correct code for List implementation
 package foo

-import java.util.ArrayList

 class stdlib_emptyListClass : List<Any> by ArrayList<Any>() {}

@@ -1,6 +1,5 @@
 package foo

-import java.util.HashMap

 fun box(): String {

@@ -1,6 +1,5 @@
 package foo

-import java.util.HashSet

 fun box(): String {

@@ -1,6 +1,7 @@
 package foo

-import java.util.ArrayList
+
+// TODO: Isn't native anymore

 class N() : ArrayList<Any>() {
    override fun add(el: Any): Boolean {
@@ -1,7 +1,7 @@
 package kotlin

 import java.util.*
-import java.lang.Iterable
+import java.lang.Iterable // WTF?

 /*
 Filters given iterator
@@ -4,7 +4,6 @@
 */
 package creatures

-import java.util.ArrayList
 import jquery.*
 import kotlin.browser.window
 import org.w3c.dom.*
@@ -1,6 +1,5 @@
 package traffic

-import java.util.ArrayList
 import kotlin.browser.window
 import org.w3c.dom.*
 import jquery.*
@@ -1,4 +1,3 @@
-import java.util.ArrayList;

 fun main(args: Array<String>) {
    val x = parseInt(args[0])
@@ -13,7 +12,7 @@ fun main(args: Array<String>) {

    //Check if a number is out of range:
    println()
-    val array = ArrayList<String>();
+    val array = mutableListOf<String>()

    array.add("aaa")
    array.add("bbb")
@@ -7,7 +7,6 @@
 * See this page for details:
 * http://confluence.jetbrains.net/display/Kotlin/Type-safe+Groovy-style+builders
 */
-import java.util.*

 fun main(args: Array<String>) {
    val result =
@@ -3,9 +3,6 @@
 * See http://en.wikipedia.org/wiki/Conway's_Game_of_Life
 */

-import java.util.*
-import java.util.Collections
-
 /*
 * A field where cells live. Effectively immutable
 */
@@ -123,16 +120,12 @@ fun printField(s: String, steps: Int) {
 fun makeField(s: String): Field {
    val lines: List<String> = s.split("\n")

-    val w = Collections.max<String>(lines.toList(), Comparator<String> { o1, o2 ->
-        val l1: Int = o1.length
-        val l2 = o2.length
-        l1 - l2
-    })!!
-    val data = Array(lines.size) { Array(w.length) { false } }
+    val w = lines.map { it.length }.max()!!
+    val data = Array(lines.size) { Array(w) { false } }

    // workaround
    for (i in data.indices) {
-        data[i] = Array(w.length) { false }
+        data[i] = Array(w) { false }
        for (j in data[i].indices)
            data[i][j] = false
    }
@@ -144,5 +137,5 @@ fun makeField(s: String): Field {
        }
    }

-    return Field(w.length, lines.size) { i, j -> data[i][j] }
+    return Field(w, lines.size) { i, j -> data[i][j] }
 }
@@ -18,7 +18,6 @@
 * I want to get the prize, and this program helps me do so as soon
 * as I possibly can by finding a shortest path through the maze.
 */
-import java.util.*

 /**
 * This function looks for a path from max.start to maze.end through