Do not reference java.util in tests that run on JS backend.

compiler/testData/codegen/box/arrays/cloneArray.kt

@@ -1,17 +1,17 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS
 
-import java.util.Arrays.equals
+// WITH_RUNTIME
 
 fun box(): String {
     val s = arrayOf("live", "long")
     val t: Array<String> = s.clone()
-    if (!equals(s, t)) return "Fail string"
+    if (!(s contentEquals t)) return "Fail string"
     if (s === t) return "Fail string identity"
 
     val ss = arrayOf(s, s)
     val tt: Array<Array<String>> = ss.clone()
-    if (!equals(ss, tt)) return "Fail string[]"
+    if (!(ss contentEquals tt)) return "Fail string[]"
     if (ss === tt) return "Fail string[] identity"
 
     return "OK"

compiler/testData/codegen/box/arrays/clonePrimitiveArrays.kt

@@ -1,39 +1,39 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS
 
-import java.util.Arrays.equals
+// WITH_RUNTIME
 
 fun box(): String {
     val i = intArrayOf(1, 2)
-    if (!equals(i, i.clone())) return "Fail int"
+    if (!(i contentEquals i.clone())) return "Fail int"
     if (i.clone() === i) return "Fail int identity"
 
     val j = longArrayOf(1L, 2L)
-    if (!equals(j, j.clone())) return "Fail long"
+    if (!(j contentEquals j.clone())) return "Fail long"
     if (j.clone() === j) return "Fail long identity"
 
     val s = shortArrayOf(1.toShort(), 2.toShort())
-    if (!equals(s, s.clone())) return "Fail short"
+    if (!(s contentEquals s.clone())) return "Fail short"
     if (s.clone() === s) return "Fail short identity"
 
     val b = byteArrayOf(1.toByte(), 2.toByte())
-    if (!equals(b, b.clone())) return "Fail byte"
+    if (!(b contentEquals b.clone())) return "Fail byte"
     if (b.clone() === b) return "Fail byte identity"
 
     val c = charArrayOf('a', 'b')
-    if (!equals(c, c.clone())) return "Fail char"
+    if (!(c contentEquals c.clone())) return "Fail char"
     if (c.clone() === c) return "Fail char identity"
 
     val d = doubleArrayOf(1.0, -1.0)
-    if (!equals(d, d.clone())) return "Fail double"
+    if (!(d contentEquals d.clone())) return "Fail double"
     if (d.clone() === d) return "Fail double identity"
 
     val f = floatArrayOf(1f, -1f)
-    if (!equals(f, f.clone())) return "Fail float"
+    if (!(f contentEquals f.clone())) return "Fail float"
     if (f.clone() === f) return "Fail float identity"
 
     val z = booleanArrayOf(true, false)
-    if (!equals(z, z.clone())) return "Fail boolean"
+    if (!(z contentEquals z.clone())) return "Fail boolean"
     if (z.clone() === z) return "Fail boolean identity"
 
     return "OK"

compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt

@@ -1,5 +1,3 @@
-import java.util.ArrayList
-
 operator fun ArrayList<String>.get(index1: Int, index2: Int) = this[index1 + index2]
 operator fun ArrayList<String>.set(index1: Int, index2: Int, elem: String) {
     this[index1 + index2] = elem

compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt

@@ -1,5 +1,3 @@
-import java.util.ArrayList
-
 operator fun ArrayList<String>.get(index1: Int, index2: Int) = this[index1 + index2]
 operator fun ArrayList<String>.set(index1: Int, index2: Int, elem: String) {
     this[index1 + index2] = elem

compiler/testData/codegen/box/arrays/hashMap.kt

@@ -1,5 +1,3 @@
-import java.util.HashMap
-
 operator fun HashMap<String, Int?>.set(index: String, elem: Int?) {
     this.put(index, elem)
 }

compiler/testData/codegen/box/arrays/kt33.kt

@@ -1,5 +1,5 @@
 fun box () : String {
-    val s = java.util.ArrayList<String>()
+    val s = ArrayList<String>()
     s.add("foo")
     s[0] += "bar"
     return if(s[0] == "foobar") "OK" else "fail"

compiler/testData/codegen/box/arrays/kt950.kt

@@ -1,5 +1,3 @@
-import java.util.*
-
 operator fun <K, V> MutableMap<K, V>.set(k : K, v : V) = put(k, v)
 
 fun box() : String {

compiler/testData/codegen/box/bridges/complexTraitImpl.kt

@@ -1,9 +1,8 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS
-
-import java.util.ArrayList
 import java.util.Arrays
 
+
 abstract class A {
     abstract fun foo(): List<String>
 }

compiler/testData/codegen/box/bridges/delegationComplexWithList.kt

@@ -1,4 +1,4 @@
-import java.util.*
+// WITH_RUNTIME
 
 open class Content() {
     override fun toString() = "OK"

compiler/testData/codegen/box/bridges/kt2498.kt

@@ -1,5 +1,3 @@
-import java.util.ArrayList
-
 open class BaseStringList: ArrayList<String>() {
 }
 

compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt

@@ -1,7 +1,5 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS
-
-import java.util.ArrayList
 import java.util.Arrays
 
 interface A {

compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt

@@ -1,5 +1,3 @@
-import java.util.HashSet
-
 class A : HashSet<Long>()
 
 fun box(): String {

compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt

@@ -1,7 +1,5 @@
 // KT-6042 java.lang.UnsupportedOperationException with ArrayList
 
-import java.util.ArrayList
-
 class A : ArrayList<String>()
 
 fun box(): String {

compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt

@@ -1,5 +1,3 @@
-import java.util.HashMap
-
 class A : HashMap<String, Double>()
 
 fun box(): String {

compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt

@@ -1,5 +1,3 @@
-import java.util.HashSet
-
 class A : HashSet<Long>()
 
 fun box(): String {

compiler/testData/codegen/box/builtinStubMethods/nonTrivialSubstitution.kt

@@ -1,8 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS
 
-import java.util.ArrayList
-
 class MyCollection<T> : Collection<List<Iterator<T>>> {
     override fun iterator() = null!!
     override val size: Int get() = null!!

compiler/testData/codegen/box/casts/mutableCollections/reifiedSafeAsWithMutable.kt

@@ -1,7 +1,5 @@
 // WITH_RUNTIME
 
-import java.util.*
-
 class Itr : Iterator<String> by ArrayList<String>().iterator()
 class MItr : MutableIterator<String> by ArrayList<String>().iterator()
 class LItr : ListIterator<String> by ArrayList<String>().listIterator()

compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt

@@ -1,5 +1,3 @@
-import java.util.HashSet
-
 interface A : Set<String>
 
 class B : A, HashSet<String>()

compiler/testData/codegen/box/classes/kt1538.kt

@@ -1,5 +1,3 @@
-import java.util.HashMap
-
 data class Pair<First, Second>(val first: First, val second: Second)
 
 fun parseCatalogs(hashMap: Any?) {

compiler/testData/codegen/box/classes/kt1980.kt

@@ -1,5 +1,3 @@
-import java.util.*
-
 public inline fun Int.times(body : () -> Unit) {
     var count = this;
     while (count > 0) {

compiler/testData/codegen/box/classes/kt2417.kt

@@ -1,5 +1,3 @@
-import java.util.HashSet
-
 fun box() : String{
     val set = HashSet<String>()
     set.add("foo")

compiler/testData/codegen/box/classes/kt343.kt

@@ -1,5 +1,3 @@
-import java.util.ArrayList
-
 fun launch(f : () -> Unit) {
     f()
 }

compiler/testData/codegen/box/classes/kt903.kt

@@ -1,5 +1,3 @@
-import java.util.ArrayList
-
 operator fun Int.plus(a: Int?) = this + a!!
 
 public open class PerfectNumberFinder() {

compiler/testData/codegen/box/classes/kt940.kt

@@ -1,4 +1,4 @@
-import java.util.*
+// WITH_RUNTIME
 
 fun box() : String {
     val w = object : Comparator<String?> {

compiler/testData/codegen/box/classes/overloadBinaryOperator.kt

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

compiler/testData/codegen/box/classes/overloadPlusAssign.kt

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

compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt

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

compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt

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

compiler/testData/codegen/box/controlStructures/continueInFor.kt

@@ -30,7 +30,7 @@ fun for_long_range(): Int {
 }
 
 fun for_int_list(): Int {
-    val a = java.util.ArrayList<Int>()
+    val a = ArrayList<Int>()
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     var c = 0
@@ -42,7 +42,7 @@ fun for_int_list(): Int {
 }
 
 fun for_byte_list(): Int {
-    val a = java.util.ArrayList<Byte>()
+    val a = ArrayList<Byte>()
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     var c = 0
@@ -54,7 +54,7 @@ fun for_byte_list(): Int {
 }
 
 fun for_long_list(): Int {
-    val a = java.util.ArrayList<Long>()
+    val a = ArrayList<Long>()
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     var c = 0
@@ -66,7 +66,7 @@ fun for_long_list(): Int {
 }
 
 fun for_double_list(): Int {
-    val a = java.util.ArrayList<Double>()
+    val a = ArrayList<Double>()
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     var c = 0
@@ -78,7 +78,7 @@ fun for_double_list(): Int {
 }
 
 fun for_object_list(): Int {
-    val a = java.util.ArrayList<Any>()
+    val a = ArrayList<Any>()
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     var c = 0

compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt

@@ -30,7 +30,7 @@ fun for_long_range(): Int {
 }
 
 fun for_int_list(): Int {
-    val a = java.util.ArrayList<Int>()
+    val a = ArrayList<Int>()
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     var c = 0
@@ -42,7 +42,7 @@ fun for_int_list(): Int {
 }
 
 fun for_byte_list(): Int {
-    val a = java.util.ArrayList<Byte>()
+    val a = ArrayList<Byte>()
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     var c = 0
@@ -54,7 +54,7 @@ fun for_byte_list(): Int {
 }
 
 fun for_long_list(): Int {
-    val a = java.util.ArrayList<Long>()
+    val a = ArrayList<Long>()
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     a.add(0); a.add(0); a.add(0); a.add(0); a.add(0)
     var c = 0
@@ -66,7 +66,7 @@ fun for_long_list(): Int {
 }
 
 fun for_double_list(): Int {
-    val a = java.util.ArrayList<Double>()
+    val a = ArrayList<Double>()
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     var c = 0
@@ -78,7 +78,7 @@ fun for_double_list(): Int {
 }
 
 fun for_object_list(): Int {
-    val a = java.util.ArrayList<Any>()
+    val a = ArrayList<Any>()
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0); a.add(0.0)
     var c = 0

compiler/testData/codegen/box/controlStructures/kt910.kt

@@ -1,5 +1,3 @@
-import java.util.HashSet
-
 fun foo() : Int =
     try {
         2

compiler/testData/codegen/box/coroutines/handleException.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 class Controller {
     var exception: Throwable? = null
-    val postponedActions = java.util.ArrayList<() -> Unit>()
+    val postponedActions = ArrayList<() -> Unit>()
 
     suspend fun suspendWithValue(v: String, x: Continuation<String>) {
         postponedActions.add {

compiler/testData/codegen/box/coroutines/nestedTryCatch.kt

@@ -2,7 +2,7 @@
 var globalResult = ""
 var wasCalled = false
 class Controller {
-    val postponedActions = java.util.ArrayList<() -> Unit>()
+    val postponedActions = ArrayList<() -> Unit>()
 
     suspend fun suspendWithValue(v: String, x: Continuation<String>) {
         postponedActions.add {

compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt

@@ -2,7 +2,7 @@
 var globalResult = ""
 var wasCalled = false
 class Controller {
-    val postponedActions = java.util.ArrayList<() -> Unit>()
+    val postponedActions = ArrayList<() -> Unit>()
 
     suspend fun suspendWithValue(v: String, x: Continuation<String>) {
         postponedActions.add {

compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt

@@ -2,7 +2,7 @@
 var globalResult = ""
 var wasCalled = false
 class Controller {
-    val postponedActions = java.util.ArrayList<() -> Unit>()
+    val postponedActions = ArrayList<() -> Unit>()
 
     suspend fun suspendWithValue(v: String, x: Continuation<String>) {
         postponedActions.add {

compiler/testData/codegen/box/delegatedProperty/local/kt13557.kt

@@ -1,6 +1,5 @@
 //WITH_REFLECT
 
-import java.util.*
 import kotlin.properties.Delegates
 
 fun box(): String {

compiler/testData/codegen/box/delegatedProperty/useKPropertyLater.kt

@@ -1,7 +1,6 @@
 // WITH_REFLECT
 // TODO: replace with WITH_RUNTIME once KT-11316 is fixed
 
-import java.util.*
 import kotlin.reflect.*
 
 val properties = HashSet<KProperty<*>>()

compiler/testData/codegen/box/extensionFunctions/kt865.kt

@@ -1,5 +1,3 @@
-import java.util.*
-
 class Template() {
     val collected = ArrayList<String>()
 

compiler/testData/codegen/box/functions/invoke/kt3190.kt

@@ -6,7 +6,7 @@ fun box(): String {
 }
 
 class Cached<K, V>(private val generate: (K)->V): Function1<K, V> {
-    val store = java.util.HashMap<K, V>()
+    val store = HashMap<K, V>()
 
     // Everything works just fine if 'invoke' method is renamed to, for example, 'get'
     override fun invoke(p1: K) = store.getOrPut(p1) { generate(p1) }

compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val list = java.util.ArrayList<IntRange>()
+    val list = ArrayList<IntRange>()
     list.add(1..3)
     list[0].start
     return "OK"

compiler/testData/codegen/box/intrinsics/stringFromCollection.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val list = java.util.ArrayList<String>()
+    val list = ArrayList<String>()
     list.add("0")
     list[0][0]
     list[0].length

compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt

@@ -1,4 +1,3 @@
-import java.util.HashMap
 
 fun <K: Any, V: Any> foo(k: K, v: V) {
     val map = HashMap<K, V>()

compiler/testData/codegen/box/jdk/arrayList.kt

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

compiler/testData/codegen/box/jdk/hashMap.kt

@@ -1,4 +1,3 @@
-import java.util.*
 
 fun box(): String {
     val map: MutableMap<String, Int> = HashMap<String, Int>()

compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt

@@ -1,4 +1,3 @@
-import java.util.HashMap
 
 fun box() : String {
     if (!testIteratingOverMap1()) return "fail 1"

compiler/testData/codegen/box/jdk/kt1397.kt

@@ -1,4 +1,3 @@
-import java.util.ArrayList
 
 class IntArrayList(): ArrayList<Int>() {
     override fun get(index: Int): Int = super.get(index)

compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt

@@ -3,7 +3,7 @@ class C(val i: Int) {
   operator fun component2() = i + 2
 }
 
-fun doTest(l : java.util.ArrayList<C>): String {
+fun doTest(l : ArrayList<C>): String {
     var s = ""
     for ((a, b) in l) {
       s += "$a:$b;"
@@ -12,7 +12,7 @@ fun doTest(l : java.util.ArrayList<C>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<C>()
+  val l = ArrayList<C>()
   l.add(C(0))
   l.add(C(1))
   l.add(C(2))

compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt

@@ -4,7 +4,7 @@ class C(val i: Int) {
 operator fun C.component1() = i + 1
 operator fun C.component2() = i + 2
 
-fun doTest(l : java.util.ArrayList<C>): String {
+fun doTest(l : ArrayList<C>): String {
     var s = ""
     for ((a, b) in l) {
       s += "$a:$b;"
@@ -13,7 +13,7 @@ fun doTest(l : java.util.ArrayList<C>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<C>()
+  val l = ArrayList<C>()
   l.add(C(0))
   l.add(C(1))
   l.add(C(2))

compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt

@@ -5,7 +5,7 @@ class M {
   operator fun C.component1() = i + 1
   operator fun C.component2() = i + 2
 
-  fun doTest(l : java.util.ArrayList<C>): String {
+  fun doTest(l : ArrayList<C>): String {
       var s = ""
       for ((a, b) in l) {
         s += "$a:$b;"
@@ -15,7 +15,7 @@ class M {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<C>()
+  val l = ArrayList<C>()
   l.add(C(0))
   l.add(C(1))
   l.add(C(2))

compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -6,7 +6,7 @@ class M {
   operator fun C.component2() = i + 2
 }
 
-fun M.doTest(l : java.util.ArrayList<C>): String {
+fun M.doTest(l : ArrayList<C>): String {
     var s = ""
     for ((a, b) in l) {
       s += "$a:$b;"
@@ -15,7 +15,7 @@ fun M.doTest(l : java.util.ArrayList<C>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<C>()
+  val l = ArrayList<C>()
   l.add(C(0))
   l.add(C(1))
   l.add(C(2))

compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt

@@ -3,7 +3,7 @@ class C(val i: Int) {
   operator fun component2() = i + 2
 }
 
-fun doTest(l : java.util.ArrayList<C>): String {
+fun doTest(l : ArrayList<C>): String {
     var s = ""
     for ((a, b) in l) {
       s += {"$a:$b;"}()
@@ -12,7 +12,7 @@ fun doTest(l : java.util.ArrayList<C>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<C>()
+  val l = ArrayList<C>()
   l.add(C(0))
   l.add(C(1))
   l.add(C(2))

compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt

@@ -1,7 +1,7 @@
 operator fun Long.component1() = this + 1
 operator fun Long.component2() = this + 2
 
-fun doTest(l : java.util.ArrayList<Long>): String {
+fun doTest(l : ArrayList<Long>): String {
     var s = ""
     for ((a, b) in l) {
       s += "$a:$b;"
@@ -10,7 +10,7 @@ fun doTest(l : java.util.ArrayList<Long>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<Long>()
+  val l = ArrayList<Long>()
   l.add(0)
   l.add(1)
   l.add(2)

compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,7 +1,7 @@
 operator fun Long.component1() = this + 1
 operator fun Long.component2() = this + 2
 
-fun doTest(l : java.util.ArrayList<Long>): String {
+fun doTest(l : ArrayList<Long>): String {
     var s = ""
     for ((a, b) in l) {
       s += {"$a:$b;"}()
@@ -10,7 +10,7 @@ fun doTest(l : java.util.ArrayList<Long>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<Long>()
+  val l = ArrayList<Long>()
   l.add(0)
   l.add(1)
   l.add(2)

compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt

@@ -2,7 +2,7 @@ class M {
   operator fun Long.component1() = this + 1
   operator fun Long.component2() = this + 2
 
-  fun doTest(l : java.util.ArrayList<Long>): String {
+  fun doTest(l : ArrayList<Long>): String {
       var s = ""
       for ((a, b) in l) {
         s += "$a:$b;"
@@ -12,7 +12,7 @@ class M {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<Long>()
+  val l = ArrayList<Long>()
   l.add(0)
   l.add(1)
   l.add(2)

compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -3,7 +3,7 @@ class M {
   operator fun Long.component2() = this + 2
 }
 
-fun M.doTest(l : java.util.ArrayList<Long>): String {
+fun M.doTest(l : ArrayList<Long>): String {
     var s = ""
     for ((a, b) in l) {
       s += "$a:$b;"
@@ -12,7 +12,7 @@ fun M.doTest(l : java.util.ArrayList<Long>): String {
 }
 
 fun box(): String {
-  val l = java.util.ArrayList<Long>()
+  val l = ArrayList<Long>()
   l.add(0)
   l.add(1)
   l.add(2)

compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt

@@ -1,7 +1,5 @@
 // WITH_RUNTIME
 
-import java.util.*
-
 fun box(): String {
     val hashMap = HashMap<String, Int>()
     hashMap.put("one", 1)

compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt

@@ -1,4 +1,3 @@
-import java.util.HashMap
 
 object O {
     val mmmap = HashMap<String, Int>();

compiler/testData/codegen/box/platformTypes/primitives/assign.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     var x = l[0]
     x = 2

compiler/testData/codegen/box/platformTypes/primitives/compareTo.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0] < 2
     if (x != true) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/dec.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     var x = l[0]
     var y = l[0]

compiler/testData/codegen/box/platformTypes/primitives/div.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(2)
     val x = l[0] / 2
     if (x != 1) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/equals.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0] == 2
     if (x != false) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/hashCode.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0].hashCode()
     if (x != 1) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/inc.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     var x = l[0]
     var y = l[0]

compiler/testData/codegen/box/platformTypes/primitives/minus.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0] - 1
     if (x != 0) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/mod.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(2)
     val x = l[0] % 2
     if (x != 0) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/not.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Boolean>()
+    val l = ArrayList<Boolean>()
     l.add(true)
     val x = !l[0]
     if (x) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/notEquals.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0] != 1
     if (x != false) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/plus.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0] + 1
     if (x != 2) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/plusAssign.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     var x = l[0]
     x += 1

compiler/testData/codegen/box/platformTypes/primitives/rangeTo.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(2)
     val sb = StringBuilder()
     for (i in l[0]..3) {

compiler/testData/codegen/box/platformTypes/primitives/times.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0] * 2
     if (x != 2) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/toShort.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = l[0].toShort()
     if (x != 1.toShort()) return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/toString.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = "${l[0]}"
     if (x != "1") return "Fail: $x}"

compiler/testData/codegen/box/platformTypes/primitives/unaryMinus.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = -l[0]
     if (x != -1) return "Fail: $x"

compiler/testData/codegen/box/platformTypes/primitives/unaryPlus.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    val l = java.util.ArrayList<Int>()
+    val l = ArrayList<Int>()
     l.add(1)
     val x = +l[0]
     if (x != 1) return "Fail: $x}"

compiler/testData/codegen/box/ranges/expression/emptyDownto.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/emptyRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/inexactDownToMinValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/inexactSteppedDownTo.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/inexactSteppedRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/inexactToMaxValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/maxValueMinusTwoToMaxValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/maxValueToMaxValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/maxValueToMinValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/oneElementDownTo.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/oneElementRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/openRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/progressionDownToMinValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMaxValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/progressionMaxValueToMinValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/progressionMinValueToMinValue.kt

@@ -4,7 +4,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI

compiler/testData/codegen/box/ranges/expression/reversedBackSequence.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/reversedEmptyBackSequence.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/reversedEmptyRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/reversedInexactSteppedDownTo.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/reversedRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/reversedSimpleSteppedRange.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()

compiler/testData/codegen/box/ranges/expression/simpleDownTo.kt

@@ -1,7 +1,6 @@
 // Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
 // WITH_RUNTIME
 
-import java.util.ArrayList
 
 fun box(): String {
     val list1 = ArrayList<Int>()