From 7c828b9ff74ce99d248b7c4e2848dadf7ad6c43d Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Tue, 4 Sep 2012 16:51:28 +0400
Subject: [PATCH] diagnostic tests changes after collections mapping

---
 compiler/testData/codegen/regressions/kt1120.kt          | 1 -
 compiler/testData/codegen/regressions/kt1406.kt          | 1 -
 compiler/testData/codegen/regressions/kt1800.kt          | 1 -
 compiler/testData/codegen/regressions/kt2390.kt          | 1 -
 compiler/testData/codegen/regressions/kt2399.kt          | 1 -
 compiler/testData/codegen/regressions/kt504.jet          | 5 ++---
 compiler/testData/codegen/regressions/kt903.jet          | 3 +--
 compiler/testData/codegen/regressions/kt910.kt           | 3 +--
 compiler/testData/diagnostics/tests/Builders.kt          | 2 +-
 .../testData/diagnostics/tests/CovariantOverrideType.kt  | 6 ++----
 .../testData/diagnostics/tests/NamespaceQualified.kt     | 8 ++++----
 .../testData/diagnostics/tests/ResolveOfJavaGenerics.kt  | 2 +-
 compiler/testData/diagnostics/tests/ResolveToJava.kt     | 6 +++---
 .../testData/diagnostics/tests/cast/AsErasedError.kt     | 3 ---
 compiler/testData/diagnostics/tests/cast/AsErasedFine.kt | 3 ---
 compiler/testData/diagnostics/tests/cast/AsErasedStar.kt | 2 --
 .../testData/diagnostics/tests/cast/AsErasedWarning.kt   | 2 --
 .../tests/cast/IsErasedAllowParameterSubtype.kt          | 3 ---
 .../tests/cast/IsErasedAllowSameClassParameter.kt        | 3 ---
 .../tests/cast/IsErasedAllowSameParameterParameter.kt    | 3 ---
 .../diagnostics/tests/cast/IsErasedDisallowFromAny.kt    | 2 --
 .../diagnostics/tests/cast/IsErasedDisallowFromOut.kt    | 2 --
 compiler/testData/diagnostics/tests/cast/IsErasedStar.kt | 2 --
 .../diagnostics/tests/cast/WhenErasedDisallowFromAny.kt  | 2 --
 .../diagnostics/tests/controlFlowAnalysis/kt1027.kt      | 2 --
 .../diagnostics/tests/controlFlowAnalysis/kt1066.kt      | 2 --
 .../tests/declarationChecks/DataFlowInMultiDeclInFor.kt  | 2 --
 .../tests/inference/conflictingSubstitutions.kt          | 4 ++--
 .../diagnostics/tests/inference/listConstructor.kt       | 2 +-
 .../testData/diagnostics/tests/inference/mapFunction.kt  | 4 ++--
 .../diagnostics/tests/inference/regressions/kt1127.kt    | 2 --
 .../diagnostics/tests/inference/regressions/kt1145.kt    | 2 +-
 .../diagnostics/tests/inference/regressions/kt1410.kt    | 9 +++------
 .../diagnostics/tests/inference/regressions/kt1558.kt    | 4 ----
 .../diagnostics/tests/inference/regressions/kt1718.kt    | 1 -
 .../diagnostics/tests/inference/regressions/kt2179.kt    | 6 +++---
 .../diagnostics/tests/inference/regressions/kt2286.kt    | 2 +-
 .../diagnostics/tests/inference/regressions/kt2324.kt    | 2 +-
 .../diagnostics/tests/inference/regressions/kt2484.kt    | 1 -
 compiler/testData/diagnostics/tests/j+k/kt2394.kt        | 2 --
 compiler/testData/diagnostics/tests/regressions/Jet53.kt | 1 -
 compiler/testData/diagnostics/tests/regressions/kt258.kt | 2 +-
 compiler/testData/diagnostics/tests/regressions/kt459.kt | 2 +-
 compiler/testData/diagnostics/tests/regressions/kt469.kt | 4 ++--
 compiler/testData/diagnostics/tests/regressions/kt549.kt | 2 +-
 compiler/testData/diagnostics/tests/regressions/kt860.kt | 2 +-
 .../tests/scopes/initializerScopeOfExtensionProperty.kt  | 2 --
 .../diagnostics/tests/scopes/kt1579_map_entry.kt         | 5 ++---
 .../diagnostics/tests/substitutions/kt1558-short.kt      | 1 -
 compiler/testData/writeSignature/ListOfCharSequence.kt   | 4 +---
 compiler/testData/writeSignature/ListOfStar.kt           | 3 +--
 .../constructor/ConstructorCollectionParameter.kt        | 1 -
 52 files changed, 39 insertions(+), 104 deletions(-)

diff --git a/compiler/testData/codegen/regressions/kt1120.kt b/compiler/testData/codegen/regressions/kt1120.kt
index d3dda284044..a6f2fa1601e 100644
--- a/compiler/testData/codegen/regressions/kt1120.kt
+++ b/compiler/testData/codegen/regressions/kt1120.kt
@@ -1,5 +1,4 @@
 import java.util.concurrent.ConcurrentLinkedQueue
-import java.util.List
 
 public object RefreshQueue {
     private val queue = ConcurrentLinkedQueue<List<String>>
diff --git a/compiler/testData/codegen/regressions/kt1406.kt b/compiler/testData/codegen/regressions/kt1406.kt
index 1334ab1ebad..d053b779247 100644
--- a/compiler/testData/codegen/regressions/kt1406.kt
+++ b/compiler/testData/codegen/regressions/kt1406.kt
@@ -1,6 +1,5 @@
 package pack
 
-import java.util.Collection
 import java.util.ArrayList
 import java.util.regex.Pattern
 
diff --git a/compiler/testData/codegen/regressions/kt1800.kt b/compiler/testData/codegen/regressions/kt1800.kt
index 5fd36ba0939..305fc47fb88 100644
--- a/compiler/testData/codegen/regressions/kt1800.kt
+++ b/compiler/testData/codegen/regressions/kt1800.kt
@@ -1,7 +1,6 @@
 //KT-1800 error/NonExistentClass generated on runtime
 package i
 
-import java.util.Collection
 import java.util.ArrayList
 
 public class User(val firstName: String,
diff --git a/compiler/testData/codegen/regressions/kt2390.kt b/compiler/testData/codegen/regressions/kt2390.kt
index eb76ee84747..18366e5222f 100644
--- a/compiler/testData/codegen/regressions/kt2390.kt
+++ b/compiler/testData/codegen/regressions/kt2390.kt
@@ -1,4 +1,3 @@
-import java.util.Collection
 
 class JsonObject() {
 }
diff --git a/compiler/testData/codegen/regressions/kt2399.kt b/compiler/testData/codegen/regressions/kt2399.kt
index 8f4de76c99e..bb2f2d150a7 100644
--- a/compiler/testData/codegen/regressions/kt2399.kt
+++ b/compiler/testData/codegen/regressions/kt2399.kt
@@ -1,4 +1,3 @@
-import java.util.Collection
 import java.util.ArrayList
 
 class JsonObject {
diff --git a/compiler/testData/codegen/regressions/kt504.jet b/compiler/testData/codegen/regressions/kt504.jet
index 06071953ad1..1a634bcf793 100644
--- a/compiler/testData/codegen/regressions/kt504.jet
+++ b/compiler/testData/codegen/regressions/kt504.jet
@@ -1,12 +1,11 @@
 import java.util.HashMap
-import java.util.Map
 import java.io.*
 
-fun <K, V> Map<K, V>.set(key : K, value : V) = put(key, value)
+fun <K, V> MutableMap<K, V>.set(key : K, value : V) = put(key, value)
 
 fun box() : String {
 
-    val commands : Map<String, String> = HashMap()
+    val commands : MutableMap<String, String> = HashMap()
 
     commands["c1"]  = "239"
     if(commands["c1"] != "239") return "fail"
diff --git a/compiler/testData/codegen/regressions/kt903.jet b/compiler/testData/codegen/regressions/kt903.jet
index 4e7a8e0410b..73f481547e9 100644
--- a/compiler/testData/codegen/regressions/kt903.jet
+++ b/compiler/testData/codegen/regressions/kt903.jet
@@ -1,11 +1,10 @@
 import java.util.ArrayList
-import java.util.List
 
 fun Int.plus(a: Int?) = this + a.sure()
 
 public open class PerfectNumberFinder() {
         open public fun isPerfect(number : Int) : Boolean {
-            var factors : List<Int?> = ArrayList<Int?>()
+            var factors : MutableList<Int?> = ArrayList<Int?>()
             factors?.add(1)
             factors?.add(number)
             for (i in 2..(Math.sqrt((number).toDouble()) - 1).toInt())
diff --git a/compiler/testData/codegen/regressions/kt910.kt b/compiler/testData/codegen/regressions/kt910.kt
index c9b8f23d511..b4317a88821 100644
--- a/compiler/testData/codegen/regressions/kt910.kt
+++ b/compiler/testData/codegen/regressions/kt910.kt
@@ -1,4 +1,3 @@
-import java.util.Set
 import java.util.HashSet
 
 fun foo() : Int =
@@ -9,7 +8,7 @@ fun foo() : Int =
         "s"
     }
 
-fun bar(set : Set<Int>) : Set<Int> =
+fun bar(set : MutableSet<Int>) : Set<Int> =
     try {
         set
     }
diff --git a/compiler/testData/diagnostics/tests/Builders.kt b/compiler/testData/diagnostics/tests/Builders.kt
index c130650b6af..f5979bded5b 100644
--- a/compiler/testData/diagnostics/tests/Builders.kt
+++ b/compiler/testData/diagnostics/tests/Builders.kt
@@ -148,7 +148,7 @@ fun html(init : HTML.() -> Unit) : HTML {
 }
 
 // An excerpt from the Standard Library
-fun <K, V> Map<K, V>.set(key : K, value : V) = this.put(key, value)
+fun <K, V> MutableMap<K, V>.set(key : K, value : V) = this.put(key, value)
 
 fun println(message : Any?) {
   System.out.println(message)
diff --git a/compiler/testData/diagnostics/tests/CovariantOverrideType.kt b/compiler/testData/diagnostics/tests/CovariantOverrideType.kt
index 3496cc1e761..94e0624b2f4 100644
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.kt
+++ b/compiler/testData/diagnostics/tests/CovariantOverrideType.kt
@@ -1,4 +1,3 @@
-
 trait A {
     fun foo() : Int = 1
     fun foo2() : Int = 1
@@ -21,8 +20,7 @@ abstract class B() : A {
     override val <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>a1<!> = 1.toDouble()
 
     abstract override fun <X> g() : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Int<!>
-    abstract override fun <X> g1() : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>java.util.List<X><!>
+    abstract override fun <X> g1() : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>List<X><!>
 
     abstract override val <X> g : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Iterator<Int><!>
-}
-
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/NamespaceQualified.kt b/compiler/testData/diagnostics/tests/NamespaceQualified.kt
index 1d5802a12b1..1701d4e6d9e 100644
--- a/compiler/testData/diagnostics/tests/NamespaceQualified.kt
+++ b/compiler/testData/diagnostics/tests/NamespaceQualified.kt
@@ -4,8 +4,8 @@
 package foobar.a
     import java.*
 
-    val a : util.List<Int>? = null
-    val a1 : <!UNRESOLVED_REFERENCE!>List<!><Int>? = null
+    val a : <!CLASS_HAS_KOTLIN_ANALOG!>util.List<Int><!>? = null
+    val a1 : List<Int>? = null
 
 // FILE: b.kt
 package foobar
@@ -18,7 +18,7 @@ abstract class Foo<T>() {
 package foobar.a
     import java.util.*
 
-    val b : List<Int>? = a
+    val b : List<Int>? = <!TYPE_MISMATCH!>a<!>
     val b1 : <!UNRESOLVED_REFERENCE!>util<!>.List<Int>? = a
 
 // FILE: b.kt
@@ -64,4 +64,4 @@ abstract class Collection<E> : Iterable<E> {
       }
       return iteratee.done()
   }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
index 0641d8f3c4e..b4dff1caec1 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
@@ -5,7 +5,7 @@ fun test(<!UNUSED_PARAMETER!>a<!> : annotation.RetentionPolicy) {
 
 fun test() {
   java.util.Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()
-  val <!UNUSED_VARIABLE!>a<!> : java.util.Collection<String>? = java.util.Collections.emptyList()
+  val <!UNUSED_VARIABLE!>a<!> : Collection<String>? = java.util.Collections.emptyList()
 }
 
 fun test(<!UNUSED_PARAMETER!>a<!> : <!CLASS_HAS_KOTLIN_ANALOG!>java.lang.Comparable<Int><!>) {
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.kt b/compiler/testData/diagnostics/tests/ResolveToJava.kt
index 08bc4f37305..1e6e3c60fbf 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.kt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.kt
@@ -9,11 +9,11 @@ import <!CLASS_HAS_KOTLIN_ANALOG!>java.lang.Comparable<!> as Com
 
 val l : List<in Int> = ArrayList<Int>()
 
-fun test(<!UNUSED_PARAMETER!>l<!> : java.util.List<Int>) {
+fun test(<!UNUSED_PARAMETER!>l<!> : <!CLASS_HAS_KOTLIN_ANALOG!>java.util.List<Int><!>) {
   val <!UNUSED_VARIABLE!>x<!> : java.<!UNRESOLVED_REFERENCE!>List<!>
-  val <!UNUSED_VARIABLE!>y<!> : java.util.List<Int>
+  val <!UNUSED_VARIABLE!>y<!> : <!CLASS_HAS_KOTLIN_ANALOG!>java.util.List<Int><!>
   val <!UNUSED_VARIABLE!>b<!> : <!CLASS_HAS_KOTLIN_ANALOG!>java.lang.Object<!>
-  val <!UNUSED_VARIABLE!>a<!> : util.List<Int>
+  val <!UNUSED_VARIABLE!>a<!> : <!CLASS_HAS_KOTLIN_ANALOG!>util.List<Int><!>
   val <!UNUSED_VARIABLE!>z<!> : java.<!UNRESOLVED_REFERENCE!>utils<!>.List<Int>
 
   val <!UNUSED_VARIABLE!>f<!> : java.io.File? = null
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedError.kt b/compiler/testData/diagnostics/tests/cast/AsErasedError.kt
index 1b5e19f1c54..5df45d2862f 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedError.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedError.kt
@@ -1,5 +1,2 @@
 
-import java.util.List;
-import java.util.Collection;
-
 fun ff(c: Collection<String>) = c <!CAST_NEVER_SUCCEEDS!>as<!> List<Int>
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedFine.kt b/compiler/testData/diagnostics/tests/cast/AsErasedFine.kt
index 294d77e864c..eae2d06ecfc 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedFine.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedFine.kt
@@ -1,5 +1,2 @@
 
-import java.util.List;
-import java.util.Collection;
-
 fun ff(c: Collection<String>) = c as List<String>
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedStar.kt b/compiler/testData/diagnostics/tests/cast/AsErasedStar.kt
index ea5debdbfe8..95738530389 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedStar.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedStar.kt
@@ -1,5 +1,3 @@
 
-import java.util.List;
-
 fun ff(l: Any) = l as List<*>
 
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt
index de7374eda34..e1783da3078 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt
@@ -1,4 +1,2 @@
 
-import java.util.List;
-
 fun ff(a: Any) = <!UNCHECKED_CAST!>a as List<String><!>
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt
index b27d3256df2..913e4a10a90 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt
@@ -1,7 +1,4 @@
 
-import java.util.Collection;
-import java.util.List;
-
 open class A
 
 class B : A()
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt
index 06005450ebc..66f5125f9d3 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt
@@ -1,6 +1,3 @@
 
-import java.util.Collection;
-import java.util.List;
-
 fun ff(l: Collection<String>) = l is List<String>
 
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt
index e41590a1013..84ebcbc217d 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt
@@ -1,6 +1,3 @@
 
-import java.util.Collection;
-import java.util.List;
-
 fun ff<T>(l: Collection<T>) = l is List<T>
 
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt
index 6bc9e638c2d..e60b7338913 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt
@@ -1,4 +1,2 @@
 
-import java.util.List;
-
 fun ff(l: Any) = l is <!CANNOT_CHECK_FOR_ERASED!>List<String><!>
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt
index b87c8350ea4..23f269c0eb4 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt
@@ -1,4 +1,2 @@
 
-import java.util.List
-
 fun f(a : List<out Any>) = a is <!CANNOT_CHECK_FOR_ERASED!>List<out Int><!>
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedStar.kt b/compiler/testData/diagnostics/tests/cast/IsErasedStar.kt
index 3d53f78fbc6..a315b2c6b9a 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedStar.kt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedStar.kt
@@ -1,4 +1,2 @@
 
-import java.util.List;
-
 fun ff(l: Any) = l is List<*>
diff --git a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt
index 612f67f517f..ccc6101725c 100644
--- a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt
+++ b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt
@@ -1,6 +1,4 @@
 
-import java.util.List;
-
 fun ff(l: Any) = when(l) {
     is <!CANNOT_CHECK_FOR_ERASED!>List<String><!> -> 1
     else <!SYNTAX!>2<!>
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt
index f80bfc91be0..2c628672684 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt
@@ -2,8 +2,6 @@
 
 package kt1027
 
-import java.util.List
-
 fun foo(<!UNUSED_PARAMETER!>c<!>: List<Int>) {
     var <!UNUSED_VARIABLE!>i<!> = 2
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt
index aa6eb588534..60304fd2db5 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt
@@ -2,8 +2,6 @@
 
 package kt1066
 
-import java.util.Set
-
 fun randomDigit() = 0.toChar()
 
 fun foo(excluded: Set<Char>) {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt
index 0b8cac68f51..12d12e75a0c 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt
@@ -1,8 +1,6 @@
 // KT-2667 Support multi-declarations in for-loops in control flow analysis
 package d
 
-import java.util.List
-
 class A {
     fun component1() = 1
     fun component2() = 2
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
index 1c2d8a25779..8f916b354c6 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
@@ -3,8 +3,8 @@ package conflictingSubstitutions
 
 import java.util.*
 
-fun <R> elemAndList(r: R, <!UNUSED_PARAMETER!>t<!>: List<R>): R = r
-fun <R> R.elemAndListWithReceiver(r: R, <!UNUSED_PARAMETER!>t<!>: List<R>): R = r
+fun <R> elemAndList(r: R, <!UNUSED_PARAMETER!>t<!>: MutableList<R>): R = r
+fun <R> R.elemAndListWithReceiver(r: R, <!UNUSED_PARAMETER!>t<!>: MutableList<R>): R = r
 
 fun test() {
     val <!UNUSED_VARIABLE!>s<!> = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>elemAndList<!>(11, list("72"))
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.kt b/compiler/testData/diagnostics/tests/inference/listConstructor.kt
index d3c3ee5a622..149171de1b7 100644
--- a/compiler/testData/diagnostics/tests/inference/listConstructor.kt
+++ b/compiler/testData/diagnostics/tests/inference/listConstructor.kt
@@ -22,7 +22,7 @@ fun test() {
 
 fun arrayList<T>(vararg values: T) : ArrayList<T> = values.toCollection(ArrayList<T>(values.size))
 
-fun <in T, C: Collection<in T>> Array<T>.toCollection(result: C) : C {
+fun <in T, C: MutableCollection<in T>> Array<T>.toCollection(result: C) : C {
     for (element in this) result.add(element)
     return result
 }
diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.kt b/compiler/testData/diagnostics/tests/inference/mapFunction.kt
index ba0b42dbcc3..7e9cf3eea8a 100644
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.kt
+++ b/compiler/testData/diagnostics/tests/inference/mapFunction.kt
@@ -27,6 +27,6 @@ fun foo() {
 
 fun <T> array(vararg t : T) : Array<T> = t
 
-fun <T, R> Array<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : java.util.List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+fun <T, R> Array<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : java.util.List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
index aafb168960c..3ddce693ea7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
@@ -2,8 +2,6 @@
 
 package d
 
-import java.util.List
-
 fun <T> asList(<!UNUSED_PARAMETER!>t<!>: T) : List<T>? {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 fun main(args : Array<String>) {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt
index 96fd76aa83f..9668995c487 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt
@@ -8,6 +8,6 @@ fun test(numbers: Iterable<Int>) {
 }
 
 //from library
-fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : java.util.List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+fun <T, R> Iterable<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 fun <T> Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt
index fd6db81a874..a8041192cc3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt
@@ -2,10 +2,7 @@
 //+JDK
 package d
 
-import java.util.Collection
-import java.util.List
-
-public fun <T> Collection<out T>.filterToMy(result : List<in T>, filter : (T) -> Boolean) : Collection<out T> {
+public fun <T> Collection<out T>.filterToMy(result : MutableList<in T>, filter : (T) -> Boolean) : Collection<out T> {
     for (t in this){
         if (filter(t)){
             result.add(t)
@@ -14,11 +11,11 @@ public fun <T> Collection<out T>.filterToMy(result : List<in T>, filter : (T) ->
     return this
 }
 
-fun foo(result: List<in String>, val collection: Collection<String>, prefix : String){
+fun foo(result: MutableList<in String>, val collection: Collection<String>, prefix : String){
     collection.filterToMy(result, {it.startsWith(prefix)})
 }
 
-fun test(result: List<in Any>, val collection: Collection<String>, prefix : String){
+fun test(result: MutableList<in Any>, val collection: Collection<String>, prefix : String){
     val c = collection.filterToMy(result, {it.startsWith(prefix)})
     c: Collection<out String>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt
index cee9259d894..6f1a50b4e29 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt
@@ -1,10 +1,6 @@
 //KT-1558 Exception while analyzing
 package j
 
-//+JDK
-import java.util.List
-
-
 fun testArrays(val ci: List<Int?>, val cii: List<Int?>) {
     val c1: Array<Int?> = cii.sure().toArray(<!FUNCTION_CALL_EXPECTED!><!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>Array<!><Int?><!>)
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt
index 1ec0751d434..71ae969b3b3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt
@@ -1,7 +1,6 @@
 //KT-1718 compiler error when not using temporary variable
 package n
 
-import java.util.List
 import java.util.ArrayList
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt
index c3284ec0909..06d638aa124 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt
@@ -25,17 +25,17 @@ fun test() {
 
 fun arrayList<T>(vararg values: T) : ArrayList<T> = values.toCollection(ArrayList<T>(values.size))
 
-fun <T, R> java.util.Collection<T>.map(transform : (T) -> R) : java.util.List<R> {
+fun <T, R> Collection<T>.map(transform : (T) -> R) : List<R> {
     return mapTo(java.util.ArrayList<R>(this.size), transform)
 }
 
-fun <T, R, C: Collection<in R>> java.util.Collection<T>.mapTo(result: C, transform : (T) -> R) : C {
+fun <T, R, C: MutableCollection<in R>> Collection<T>.mapTo(result: C, transform : (T) -> R) : C {
   for (item in this)
     result.add(transform(item))
   return result
 }
 
-fun <in T, C: Collection<in T>> Array<T>.toCollection(result: C) : C {
+fun <in T, C: MutableCollection<in T>> Array<T>.toCollection(result: C) : C {
     for (element in this) result.add(element)
     return result
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
index 1c2ba422f10..545c9ac68a3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
@@ -4,7 +4,7 @@ package n
 
 abstract class Buggy {
 
-    abstract val coll : java.util.Collection<Int>
+    abstract val coll : Collection<Int>
 
     fun getThree(): Int? {
         return coll.find{ it > 3 }  // works fine
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt
index 04f892021ac..bc5ecb51bc4 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt
@@ -27,7 +27,7 @@ fun assertEquals(<!UNUSED_PARAMETER!>expected<!>: Any?, <!UNUSED_PARAMETER!>actu
 
 fun arrayList<T>(vararg values: T) : ArrayList<T> = values.toCollection(ArrayList<T>(values.size))
 
-fun <in T, C: Collection<in T>> Array<T>.toCollection(result: C) : C {
+fun <in T, C: MutableCollection<in T>> Array<T>.toCollection(result: C) : C {
     for (element in this) result.add(element)
     return result
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt
index d5beed6abfb..cfa7459e9b3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt
@@ -2,7 +2,6 @@
 
 package a
 //+JDK
-import java.util.List
 
 fun <T> Array<T>.forEach(operation: (T) -> Unit) : Unit = for (element in this) operation(element)
 
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2394.kt b/compiler/testData/diagnostics/tests/j+k/kt2394.kt
index bd12781a8d3..4af0147148b 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2394.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2394.kt
@@ -1,8 +1,6 @@
 //KT-2394 java.lang.Iterable<T> should be visible as jet.Iterable<out T>
 package d
 
-import java.util.Collection
-
 fun foo(iterable: Iterable<Int>, iterator: Iterator<Int>, comparable: Comparable<Any>) {
     iterable : Iterable<Any>
     iterator : Iterator<Any>
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet53.kt b/compiler/testData/diagnostics/tests/regressions/Jet53.kt
index a1f96ddae0f..0a24a6acda6 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet53.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet53.kt
@@ -1,5 +1,4 @@
 
 import java.util.Collections
-import java.util.List
 
 val ab = Collections.emptyList<Int>() : List<Int>?
diff --git a/compiler/testData/diagnostics/tests/regressions/kt258.kt b/compiler/testData/diagnostics/tests/regressions/kt258.kt
index 2a7d59b52ae..3611bcfbec6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt258.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt258.kt
@@ -7,4 +7,4 @@ fun test() {
   attributes["href"] = "1" // inference fails, but it shouldn't
 }
 
-fun <K, V> java.util.Map<K, V>.set(<!UNUSED_PARAMETER!>key<!> : K, <!UNUSED_PARAMETER!>value<!> : V) {}//= this.put(key, value)
+fun <K, V> MutableMap<K, V>.set(<!UNUSED_PARAMETER!>key<!> : K, <!UNUSED_PARAMETER!>value<!> : V) {}//= this.put(key, value)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt459.kt b/compiler/testData/diagnostics/tests/regressions/kt459.kt
index 11a4e5aa520..0cfd2467988 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt459.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt459.kt
@@ -5,4 +5,4 @@ fun test() {
   attributes["href"] = "1" // inference fails, but it shouldn't
 }
 
-fun <K, V> java.util.Map<K, V>.set(<!UNUSED_PARAMETER!>key<!> : K, <!UNUSED_PARAMETER!>value<!> : V) {}//= this.put(key, value)
+fun <K, V> Map<K, V>.set(<!UNUSED_PARAMETER!>key<!> : K, <!UNUSED_PARAMETER!>value<!> : V) {}//= this.put(key, value)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt469.kt b/compiler/testData/diagnostics/tests/regressions/kt469.kt
index e386ab4e9b8..1341919aff3 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt469.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt469.kt
@@ -4,14 +4,14 @@ package kt469
 //KT-512 plusAssign() : Unit does not work properly
 import java.util.*
 
-fun bar(list : List<Int>) {
+fun bar(list : MutableList<Int>) {
     for (i in 1..10) {
         list += i // error
     }
     System.out.println(list)
 }
 
-fun <T> List<T>.plusAssign(t : T) {
+fun <T> MutableList<T>.plusAssign(t : T) {
     add(t)
 }
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt549.kt b/compiler/testData/diagnostics/tests/regressions/kt549.kt
index 28050cccb2b..bc69d91b48d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt549.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt549.kt
@@ -2,7 +2,7 @@
 
 package demo
 
-  fun filter<T>(list : Array<T>, filter :  (T) -> Boolean) : java.util.List<T> {
+  fun filter<T>(list : Array<T>, filter :  (T) -> Boolean) : List<T> {
     val answer = java.util.ArrayList<T>();
     for (l in list) {
       if (filter(l)) answer.add(l)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.kt b/compiler/testData/diagnostics/tests/regressions/kt860.kt
index 5f5e2a352b9..5e383cf5b9d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.kt
@@ -4,7 +4,7 @@ package kotlin.util
 
 import java.util.*
 
-fun <T, U: Collection<in T>> Iterator<T>.to(container: U) : U {
+fun <T, U: MutableCollection<in T>> Iterator<T>.to(container: U) : U {
     while(hasNext())
         container.add(next())
     return container
diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt
index 1f30884832b..a315e6b805d 100644
--- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt
+++ b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt
@@ -1,7 +1,5 @@
 package i
 
-import java.util.List
-
 val <T> List<T>.length = <!UNRESOLVED_REFERENCE!>size<!>()
 
 val <T> List<T>.length1 : Int get() = size()
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt
index 4632e875dee..e95964a5239 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt
@@ -1,7 +1,7 @@
 //FILE:a.kt
 //+JDK
 package a
-import java.util.Map.*
+import jet.Map.*
 
 fun foo(b : Entry<String, String>) = b
 
@@ -9,12 +9,11 @@ fun foo(b : Entry<String, String>) = b
 //+JDK
 package b
 
-import java.util.Map.Entry
+import jet.Map.Entry
 fun bar(b : Entry<String, String>) = b
 
 //FILE:c.kt
 //+JDK
 package c
 
-import java.util.Map
 fun fff(b: Map.Entry<String, String>) = b
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt
index 047b53e0877..9d50593cb6a 100644
--- a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt
@@ -1,4 +1,3 @@
-import java.util.List
 
 fun testArrays(ci : List<Int>) {
     ci.toArray<Int>(<!UNRESOLVED_REFERENCE!>x<!>)
diff --git a/compiler/testData/writeSignature/ListOfCharSequence.kt b/compiler/testData/writeSignature/ListOfCharSequence.kt
index f3bbb608f2d..c9226dec0e7 100644
--- a/compiler/testData/writeSignature/ListOfCharSequence.kt
+++ b/compiler/testData/writeSignature/ListOfCharSequence.kt
@@ -1,9 +1,7 @@
-import java.util.List
-import java.lang.CharSequence
 
 fun foo(p: List<CharSequence>) = 1
 
 // method: namespace::foo
 // jvm signature:     (Ljava/util/List;)I
 // generic signature: (Ljava/util/List<Ljava/lang/CharSequence;>;)I
-// kotlin signature:  (Ljava/util/List<Mjava/lang/CharSequence;>;)I // TODO: skip Kotlin signature
+// kotlin signature:  (Ljava/util/List<Ljava/lang/CharSequence;>;)I // TODO: skip Kotlin signature
diff --git a/compiler/testData/writeSignature/ListOfStar.kt b/compiler/testData/writeSignature/ListOfStar.kt
index 41d0aa3c844..532114a7ec0 100644
--- a/compiler/testData/writeSignature/ListOfStar.kt
+++ b/compiler/testData/writeSignature/ListOfStar.kt
@@ -1,7 +1,6 @@
-import java.util.List
-
 fun listOfStar(): List<*> = throw Exception()
 
+
 // method: namespace::listOfStar
 // jvm signature:     ()Ljava/util/List;
 // generic signature: ()Ljava/util/List<+Ljava/lang/Object;>;
diff --git a/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt b/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt
index 0fcf0d63681..c2fcf9280d3 100644
--- a/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt
+++ b/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt
@@ -1,4 +1,3 @@
-import java.util.Collection
 
 class TestingKotlinCollections(val arguments: Collection<String>)