From 2aa60adbca3eaca3464e1e75f292049375c01163 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 20 Aug 2016 07:29:41 +0300
Subject: [PATCH] Remove 'import java.util' from js tests.

---
 .../box/closure/closureArrayListInstance.kt       |  1 -
 .../testData/box/closure/iteratingCallbacks.kt    |  1 -
 .../box/closure/localParameterInCallback.kt       |  1 -
 .../testData/box/dataClass/hashcode.kt            |  2 --
 .../testData/box/dataClass/keyrole.kt             |  4 ++--
 .../testData/box/examples/basicmethod.kt          |  1 -
 .../box/examples/initializerBlockDImpl.kt         |  2 --
 .../box/examples/overloadBinaryOperator.kt        |  1 -
 .../box/examples/overloadPlusAssignReturn.kt      |  1 -
 .../box/examples/overloadPlusToPlusAssign.kt      |  1 -
 .../box/examples/overloadUnaryOperator.kt         |  1 -
 .../testData/box/expression/equals/kt2370.kt      |  1 -
 .../testData/box/expression/function/KT-921.kt    |  1 -
 .../expression/function/expressionAsFunction.kt   |  1 -
 .../testData/box/expression/misc/KT-2314.kt       |  1 -
 .../testData/box/extensionFunction/generic.kt     |  1 -
 .../testData/box/inlineMultiFile/builders.kt      |  2 --
 .../inlineMultiFile/buildersAndLambdaCapturing.kt |  2 --
 .../testData/box/java/arrayList/access.kt         |  1 -
 .../testData/box/java/arrayList/arrayAccess.kt    |  1 -
 .../box/java/arrayList/constructWithCapacity.kt   |  1 -
 .../arrayList/constructWithSideEffectParam.kt     |  1 -
 .../testData/box/java/arrayList/containsAll.kt    |  2 --
 .../testData/box/java/arrayList/emptyList.kt      |  1 -
 .../testData/box/java/arrayList/indexOOB.kt       |  1 -
 .../testData/box/java/arrayList/indexOf.kt        |  1 -
 .../testData/box/java/arrayList/isEmpty.kt        |  1 -
 .../testData/box/java/arrayList/iterate.kt        |  1 -
 .../testData/box/java/arrayList/misc.kt           |  1 -
 .../testData/box/java/arrayList/remove.kt         |  1 -
 .../testData/box/java/arrayList/removeAll.kt      |  1 -
 .../java/arrayList/removeWithIndexOutOfBounds.kt  |  1 -
 .../testData/box/java/arrayList/retainAll.kt      |  1 -
 .../testData/box/java/arrayList/toArray.kt        |  1 -
 .../box/multideclaration/multiValForMap.kt        |  1 -
 .../box/multideclaration/multiValInFor.kt         |  3 +--
 js/js.translator/testData/box/native/kt2323.kt    |  1 -
 .../overloadPlusAssignArrayList.kt                |  1 -
 .../overloadPlusAssignViaExtensionFunction.kt     |  1 -
 .../overloadPlusViaExtensionFunction.kt           |  1 -
 js/js.translator/testData/box/range/intDownTo.kt  |  3 +--
 js/js.translator/testData/box/range/intUpTo.kt    |  1 -
 .../testData/box/range/rangeToDoesNotIterate.kt   |  1 -
 .../testData/box/rtti/stdlibEmptyListClass.kt     |  1 -
 .../box/standardClasses/hashMapTypeOfElement.kt   |  1 -
 .../box/standardClasses/hashSetTypeOfElement.kt   |  1 -
 .../testData/box/superCall/nativeSuperClass.kt    |  3 ++-
 js/js.translator/testData/stdlib/cases/Filter.kt  |  2 +-
 .../webDemoCanvasExamples/cases/Creatures.kt      |  1 -
 .../webDemoCanvasExamples/cases/Traffic light.kt  |  1 -
 .../testData/webDemoExamples1/cases/ranges.kt     |  3 +--
 .../testData/webDemoExamples2/cases/builder.kt    |  1 -
 .../testData/webDemoExamples2/cases/life.kt       | 15 ++++-----------
 .../testData/webDemoExamples2/cases/maze.kt       |  1 -
 54 files changed, 12 insertions(+), 73 deletions(-)

diff --git a/js/js.translator/testData/box/closure/closureArrayListInstance.kt b/js/js.translator/testData/box/closure/closureArrayListInstance.kt
index 128dbe78f98..41625a27563 100644
--- a/js/js.translator/testData/box/closure/closureArrayListInstance.kt
+++ b/js/js.translator/testData/box/closure/closureArrayListInstance.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun test(f: () -> String): String {
     val funLit = { f() }
diff --git a/js/js.translator/testData/box/closure/iteratingCallbacks.kt b/js/js.translator/testData/box/closure/iteratingCallbacks.kt
index 7d79a203d4e..37851c3c1c9 100644
--- a/js/js.translator/testData/box/closure/iteratingCallbacks.kt
+++ b/js/js.translator/testData/box/closure/iteratingCallbacks.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 fun box(): String {
     val oneTwo = Array(2) {
diff --git a/js/js.translator/testData/box/closure/localParameterInCallback.kt b/js/js.translator/testData/box/closure/localParameterInCallback.kt
index 4c345074914..62814d4852e 100644
--- a/js/js.translator/testData/box/closure/localParameterInCallback.kt
+++ b/js/js.translator/testData/box/closure/localParameterInCallback.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 fun box(): String {
     val oneTwo = Array(2) {
diff --git a/js/js.translator/testData/box/dataClass/hashcode.kt b/js/js.translator/testData/box/dataClass/hashcode.kt
index b1a597f44a6..c2b82c67e72 100644
--- a/js/js.translator/testData/box/dataClass/hashcode.kt
+++ b/js/js.translator/testData/box/dataClass/hashcode.kt
@@ -1,7 +1,5 @@
 package foo
 
-import java.util.ArrayList
-
 
 data class Holder<T>(val v: T)
 
diff --git a/js/js.translator/testData/box/dataClass/keyrole.kt b/js/js.translator/testData/box/dataClass/keyrole.kt
index c07b80fd37f..2a8d1eeda2f 100644
--- a/js/js.translator/testData/box/dataClass/keyrole.kt
+++ b/js/js.translator/testData/box/dataClass/keyrole.kt
@@ -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")))
diff --git a/js/js.translator/testData/box/examples/basicmethod.kt b/js/js.translator/testData/box/examples/basicmethod.kt
index bd5e24e1a02..48c4eed0e05 100644
--- a/js/js.translator/testData/box/examples/basicmethod.kt
+++ b/js/js.translator/testData/box/examples/basicmethod.kt
@@ -1,4 +1,3 @@
-import java.util.ArrayList
 
 interface Tr {
     fun extra(): String = "_"
diff --git a/js/js.translator/testData/box/examples/initializerBlockDImpl.kt b/js/js.translator/testData/box/examples/initializerBlockDImpl.kt
index 5c9d3d497ae..0c671e62922 100644
--- a/js/js.translator/testData/box/examples/initializerBlockDImpl.kt
+++ b/js/js.translator/testData/box/examples/initializerBlockDImpl.kt
@@ -1,5 +1,3 @@
-import java.util.*
-import java.io.*
 
 class World() {
     public val items: ArrayList<Item> = ArrayList<Item>()
diff --git a/js/js.translator/testData/box/examples/overloadBinaryOperator.kt b/js/js.translator/testData/box/examples/overloadBinaryOperator.kt
index 8056a562fc5..e632663456b 100644
--- a/js/js.translator/testData/box/examples/overloadBinaryOperator.kt
+++ b/js/js.translator/testData/box/examples/overloadBinaryOperator.kt
@@ -1,4 +1,3 @@
-import java.util.*
 
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt b/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
index b6db9de510e..dca7054ffce 100644
--- a/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
+++ b/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
@@ -1,4 +1,3 @@
-import java.util.*
 
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt b/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
index ce095b152ef..2ab51f642de 100644
--- a/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
+++ b/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
@@ -1,4 +1,3 @@
-import java.util.*
 
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/overloadUnaryOperator.kt b/js/js.translator/testData/box/examples/overloadUnaryOperator.kt
index b664b78768b..7a542ac3ebd 100644
--- a/js/js.translator/testData/box/examples/overloadUnaryOperator.kt
+++ b/js/js.translator/testData/box/examples/overloadUnaryOperator.kt
@@ -1,4 +1,3 @@
-import java.util.*
 
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/expression/equals/kt2370.kt b/js/js.translator/testData/box/expression/equals/kt2370.kt
index 5e0e9b5ea00..cbea9dc8a11 100644
--- a/js/js.translator/testData/box/expression/equals/kt2370.kt
+++ b/js/js.translator/testData/box/expression/equals/kt2370.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 fun box(): String {
     val data = ArrayList<String>()
diff --git a/js/js.translator/testData/box/expression/function/KT-921.kt b/js/js.translator/testData/box/expression/function/KT-921.kt
index 834783dc3fc..7c6908290a9 100644
--- a/js/js.translator/testData/box/expression/function/KT-921.kt
+++ b/js/js.translator/testData/box/expression/function/KT-921.kt
@@ -1,4 +1,3 @@
-import java.util.*
 
 var log = ""
 
diff --git a/js/js.translator/testData/box/expression/function/expressionAsFunction.kt b/js/js.translator/testData/box/expression/function/expressionAsFunction.kt
index 14304b72fde..a9ce32204d8 100644
--- a/js/js.translator/testData/box/expression/function/expressionAsFunction.kt
+++ b/js/js.translator/testData/box/expression/function/expressionAsFunction.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*;
 
 val d = { a: Int -> a + 1 }
 val p = { a: Int -> a * 3 }
diff --git a/js/js.translator/testData/box/expression/misc/KT-2314.kt b/js/js.translator/testData/box/expression/misc/KT-2314.kt
index 06e370bdda6..2c8356a6a5a 100644
--- a/js/js.translator/testData/box/expression/misc/KT-2314.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-2314.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 fun box(): String {
     val data = myArrayList("foo", "bar")
diff --git a/js/js.translator/testData/box/extensionFunction/generic.kt b/js/js.translator/testData/box/extensionFunction/generic.kt
index a1e03717d28..09bcb264372 100644
--- a/js/js.translator/testData/box/extensionFunction/generic.kt
+++ b/js/js.translator/testData/box/extensionFunction/generic.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 fun <T> ArrayList<T>.findAll(predicate: (T) -> Boolean): ArrayList<T> {
     val result = ArrayList<T>()
diff --git a/js/js.translator/testData/box/inlineMultiFile/builders.kt b/js/js.translator/testData/box/inlineMultiFile/builders.kt
index 01392eea669..91e25243f31 100644
--- a/js/js.translator/testData/box/inlineMultiFile/builders.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/builders.kt
@@ -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)
diff --git a/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt b/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt
index 214242c0c4d..cecbf38c3f7 100644
--- a/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt
@@ -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)
diff --git a/js/js.translator/testData/box/java/arrayList/access.kt b/js/js.translator/testData/box/java/arrayList/access.kt
index e91521cc782..349b4962b61 100644
--- a/js/js.translator/testData/box/java/arrayList/access.kt
+++ b/js/js.translator/testData/box/java/arrayList/access.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList;
 
 fun box(): String {
     val a = ArrayList<Int>();
diff --git a/js/js.translator/testData/box/java/arrayList/arrayAccess.kt b/js/js.translator/testData/box/java/arrayList/arrayAccess.kt
index 6165854d325..3773ddd02d4 100644
--- a/js/js.translator/testData/box/java/arrayList/arrayAccess.kt
+++ b/js/js.translator/testData/box/java/arrayList/arrayAccess.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList;
 
 fun box(): String {
     val a = ArrayList<Int>();
diff --git a/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt b/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt
index fcb110cd513..e00b4eb3845 100644
--- a/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt
+++ b/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     val al = ArrayList<Int>(10)
diff --git a/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt b/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt
index 7a990516f86..333760ba845 100644
--- a/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt
+++ b/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 var baz = 0
 fun withSideEffect(v: Int): Int {
diff --git a/js/js.translator/testData/box/java/arrayList/containsAll.kt b/js/js.translator/testData/box/java/arrayList/containsAll.kt
index 3e68774715a..1dc832dbe82 100644
--- a/js/js.translator/testData/box/java/arrayList/containsAll.kt
+++ b/js/js.translator/testData/box/java/arrayList/containsAll.kt
@@ -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)
diff --git a/js/js.translator/testData/box/java/arrayList/emptyList.kt b/js/js.translator/testData/box/java/arrayList/emptyList.kt
index ea5d77d509e..f794b11c8d3 100644
--- a/js/js.translator/testData/box/java/arrayList/emptyList.kt
+++ b/js/js.translator/testData/box/java/arrayList/emptyList.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList;
 
 fun box(): String {
     val a = ArrayList<Int>();
diff --git a/js/js.translator/testData/box/java/arrayList/indexOOB.kt b/js/js.translator/testData/box/java/arrayList/indexOOB.kt
index cd79f729748..26e3434dc5f 100644
--- a/js/js.translator/testData/box/java/arrayList/indexOOB.kt
+++ b/js/js.translator/testData/box/java/arrayList/indexOOB.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList;
 
 fun box(): String {
     val arr = ArrayList<Int>();
diff --git a/js/js.translator/testData/box/java/arrayList/indexOf.kt b/js/js.translator/testData/box/java/arrayList/indexOf.kt
index 03b61dc8e78..5cf70f28c54 100644
--- a/js/js.translator/testData/box/java/arrayList/indexOf.kt
+++ b/js/js.translator/testData/box/java/arrayList/indexOf.kt
@@ -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) {
diff --git a/js/js.translator/testData/box/java/arrayList/isEmpty.kt b/js/js.translator/testData/box/java/arrayList/isEmpty.kt
index 494532bde1d..8ac2df3237e 100644
--- a/js/js.translator/testData/box/java/arrayList/isEmpty.kt
+++ b/js/js.translator/testData/box/java/arrayList/isEmpty.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList;
 
 fun box(): String {
     val a = ArrayList<Int>();
diff --git a/js/js.translator/testData/box/java/arrayList/iterate.kt b/js/js.translator/testData/box/java/arrayList/iterate.kt
index 35f5fd6a775..b7e02396a23 100644
--- a/js/js.translator/testData/box/java/arrayList/iterate.kt
+++ b/js/js.translator/testData/box/java/arrayList/iterate.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList;
 
 fun box(): String {
     var i = 0
diff --git a/js/js.translator/testData/box/java/arrayList/misc.kt b/js/js.translator/testData/box/java/arrayList/misc.kt
index f536c8c374f..66b6dd47b6e 100644
--- a/js/js.translator/testData/box/java/arrayList/misc.kt
+++ b/js/js.translator/testData/box/java/arrayList/misc.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     var i = 0
diff --git a/js/js.translator/testData/box/java/arrayList/remove.kt b/js/js.translator/testData/box/java/arrayList/remove.kt
index 81a284b84cc..afd06bdb029 100644
--- a/js/js.translator/testData/box/java/arrayList/remove.kt
+++ b/js/js.translator/testData/box/java/arrayList/remove.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     val arr = ArrayList<Int>()
diff --git a/js/js.translator/testData/box/java/arrayList/removeAll.kt b/js/js.translator/testData/box/java/arrayList/removeAll.kt
index e871d0c47aa..9bd8d0cb391 100644
--- a/js/js.translator/testData/box/java/arrayList/removeAll.kt
+++ b/js/js.translator/testData/box/java/arrayList/removeAll.kt
@@ -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? {
diff --git a/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt b/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt
index 28d5e73e013..4a94a702f0a 100644
--- a/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt
+++ b/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     var threwForEmptyList = false
diff --git a/js/js.translator/testData/box/java/arrayList/retainAll.kt b/js/js.translator/testData/box/java/arrayList/retainAll.kt
index dba224e4932..786bd8049af 100644
--- a/js/js.translator/testData/box/java/arrayList/retainAll.kt
+++ b/js/js.translator/testData/box/java/arrayList/retainAll.kt
@@ -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)
diff --git a/js/js.translator/testData/box/java/arrayList/toArray.kt b/js/js.translator/testData/box/java/arrayList/toArray.kt
index 55a9a19023e..6480aff4e2f 100644
--- a/js/js.translator/testData/box/java/arrayList/toArray.kt
+++ b/js/js.translator/testData/box/java/arrayList/toArray.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     var i = 0
diff --git a/js/js.translator/testData/box/multideclaration/multiValForMap.kt b/js/js.translator/testData/box/multideclaration/multiValForMap.kt
index 6fe6699cef7..710a68cd1bf 100644
--- a/js/js.translator/testData/box/multideclaration/multiValForMap.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValForMap.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.HashMap
 
 
 operator fun <K, V> Map<K, V>.iterator(): Iterator<Map.Entry<K, V>> {
diff --git a/js/js.translator/testData/box/multideclaration/multiValInFor.kt b/js/js.translator/testData/box/multideclaration/multiValInFor.kt
index 268f7e818cb..bdd0b4a410d 100644
--- a/js/js.translator/testData/box/multideclaration/multiValInFor.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValInFor.kt
@@ -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;
diff --git a/js/js.translator/testData/box/native/kt2323.kt b/js/js.translator/testData/box/native/kt2323.kt
index eb09c1111ee..f69179130d8 100644
--- a/js/js.translator/testData/box/native/kt2323.kt
+++ b/js/js.translator/testData/box/native/kt2323.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.HashMap
 
 @native
 val classes: Map<String, Any> = noImpl
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt
index fa92b6997d5..16750b89d3b 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 class ArrayWrapper<T>() {
     val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt
index 5b91b53d827..1ef3bc4eeb5 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 class A<T>(val list: MutableList<T>) {
     fun addAll(c: Collection<T>) {
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt
index 6ee57899958..dde073332eb 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.*
 
 operator fun <T> ArrayList<T>.plus(other: Collection<T>): List<T> {
     val c = ArrayList<T>()
diff --git a/js/js.translator/testData/box/range/intDownTo.kt b/js/js.translator/testData/box/range/intDownTo.kt
index 9d650d6b057..008f8f9ac47 100644
--- a/js/js.translator/testData/box/range/intDownTo.kt
+++ b/js/js.translator/testData/box/range/intDownTo.kt
@@ -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)
     }
diff --git a/js/js.translator/testData/box/range/intUpTo.kt b/js/js.translator/testData/box/range/intUpTo.kt
index c9853c9b453..9f489fa3238 100644
--- a/js/js.translator/testData/box/range/intUpTo.kt
+++ b/js/js.translator/testData/box/range/intUpTo.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     var elems = ArrayList<Int>()
diff --git a/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt b/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt
index 952a3bb6156..345fb040396 100644
--- a/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt
+++ b/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.ArrayList
 
 fun box(): String {
     for (i in 0.rangeTo(-1)) {
diff --git a/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt b/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt
index 7a0284b3825..4b3af400cdb 100644
--- a/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt
+++ b/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt
@@ -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>() {}
 
diff --git a/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt b/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt
index 40d2108f142..a7abeaa9546 100644
--- a/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt
+++ b/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.HashMap
 
 fun box(): String {
 
diff --git a/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt b/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt
index be737265ea0..eac57d407f5 100644
--- a/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt
+++ b/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt
@@ -1,6 +1,5 @@
 package foo
 
-import java.util.HashSet
 
 fun box(): String {
 
diff --git a/js/js.translator/testData/box/superCall/nativeSuperClass.kt b/js/js.translator/testData/box/superCall/nativeSuperClass.kt
index 61d87fda539..544205634ef 100644
--- a/js/js.translator/testData/box/superCall/nativeSuperClass.kt
+++ b/js/js.translator/testData/box/superCall/nativeSuperClass.kt
@@ -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 {
diff --git a/js/js.translator/testData/stdlib/cases/Filter.kt b/js/js.translator/testData/stdlib/cases/Filter.kt
index eef573dcf36..d041e8447d8 100644
--- a/js/js.translator/testData/stdlib/cases/Filter.kt
+++ b/js/js.translator/testData/stdlib/cases/Filter.kt
@@ -1,7 +1,7 @@
 package kotlin
 
 import java.util.*
-import java.lang.Iterable
+import java.lang.Iterable // WTF?
 
 /*
 Filters given iterator
diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt
index 7048e2fb470..c0cc8b3836b 100644
--- a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt
+++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt
@@ -4,7 +4,6 @@
 */
 package creatures
 
-import java.util.ArrayList
 import jquery.*
 import kotlin.browser.window
 import org.w3c.dom.*
diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt
index 48e79bef228..16fb88b6794 100644
--- a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt	
+++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt	
@@ -1,6 +1,5 @@
 package traffic
 
-import java.util.ArrayList
 import kotlin.browser.window
 import org.w3c.dom.*
 import jquery.*
diff --git a/js/js.translator/testData/webDemoExamples1/cases/ranges.kt b/js/js.translator/testData/webDemoExamples1/cases/ranges.kt
index 0e999b09011..2355da22443 100644
--- a/js/js.translator/testData/webDemoExamples1/cases/ranges.kt
+++ b/js/js.translator/testData/webDemoExamples1/cases/ranges.kt
@@ -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")
diff --git a/js/js.translator/testData/webDemoExamples2/cases/builder.kt b/js/js.translator/testData/webDemoExamples2/cases/builder.kt
index 5e381f53e0e..77f2fb1e8c3 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/builder.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/builder.kt
@@ -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 =
diff --git a/js/js.translator/testData/webDemoExamples2/cases/life.kt b/js/js.translator/testData/webDemoExamples2/cases/life.kt
index 26689d35cf7..fbe414bef1e 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/life.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/life.kt
@@ -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] }
 }
diff --git a/js/js.translator/testData/webDemoExamples2/cases/maze.kt b/js/js.translator/testData/webDemoExamples2/cases/maze.kt
index 812b8067289..bfc1caa7ea4 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/maze.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/maze.kt
@@ -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