Fixed testdata -- removed package import

compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.B.kt

@@ -1,4 +1,3 @@
-import java.lang
 
 class B1() : A("123") {
     constructor(x1: Int): this() {}

compiler/testData/diagnostics/tests/ResolveToJava.kt

@@ -8,7 +8,6 @@ import <!UNRESOLVED_REFERENCE!>utils<!>.*
 
 import java.io.PrintStream
 import <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Comparable<!> as Com
-import java.util
 
 val l : MutableList<in Int> = ArrayList<Int>()
 
@@ -16,7 +15,6 @@ fun test(<!UNUSED_PARAMETER!>l<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util
   val <!UNUSED_VARIABLE!>x<!> : java.<!UNRESOLVED_REFERENCE!>List<!>
   val <!UNUSED_VARIABLE!>y<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<Int><!>
   val <!UNUSED_VARIABLE!>b<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Object<!>
-  val <!UNUSED_VARIABLE!>a<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>util.List<Int><!>
   val <!UNUSED_VARIABLE!>z<!> : java.<!UNRESOLVED_REFERENCE!>utils<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>
 
   val <!UNUSED_VARIABLE!>f<!> : java.io.File? = null

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt

@@ -6,7 +6,7 @@ val y : Any? = 2
 // FILE: b.kt
 package example
 
-import example.ns
+import example.ns.y
 
 object Obj {
     val y : Any? = 2
@@ -22,14 +22,8 @@ val x : Any? = 1
 
 fun Any?.vars(<!UNUSED_PARAMETER!>a<!>: Any?) : Int {
     var <!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>b<!>: Int = 0
-    if (ns.y is Int) {
-        <!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>ns.y<!>
-    }
-    if (ns.y is Int) {
-        <!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>example.ns.y<!>
-    }
     if (example.ns.y is Int) {
-        <!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>ns.y<!>
+        <!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>y<!>
     }
     if (example.ns.y is Int) {
         <!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>example.ns.y<!>

compiler/testData/resolve/ResolveToJava.resolve

@@ -1,29 +1,28 @@
 import `java::java`java.*
 import java.`java::java.util`util.*
-import java.util
 
 fun foo(~a~a : `kotlin::Array`Array<`kotlin::Int`Int>) : `java::java.util.ArrayList`ArrayList {
   `a`a.`kotlin::Array.get(Int)`get(1)
   `a`a.`kotlin::Array.set(Int, Int)`set(1, 1)
 }
 
-fun foo(o : `java::java.lang.Object`Object, l : `java::java.util`util.`java::java.util.ArrayList`ArrayList) : `java::java.util.ArrayList`ArrayList {}
+fun foo(o : `java::java.lang.Object`Object, l : `java::java`java.`java::java.util`util.`java::java.util.ArrayList`ArrayList) : `java::java.util.ArrayList`ArrayList {}
 
 ~A~class A~A()~()  {
-  fun f(a : `java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
+  fun f(a : `java::java`java.`java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
   fun f(a : `java::java.util.ArrayList`ArrayList) {}
 
 }
 
 class B : `java::java.lang.Object`Object {
 
-  fun f(a : `java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
+  fun f(a : `java::java`java.`java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
   fun f(a : `java::java.util.ArrayList`ArrayList) {}
 
 
   ~foo~fun foo(abc : `A`A) : `A`A {
     `java::java`java.`java::java.lang`lang.`java::java.lang.System`System.`java::java.lang.System.out`out.`java::java.io.PrintStream.print(Int)`print(1)
-    `java::java.util`util.`java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList()
+    `java::java`java.`java::java.util`util.`java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList()
     `java::java`java.`!`Foo
     `java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList()
   }

idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt

@@ -1,8 +0,0 @@
-import java.util
-
-class A {
-    <caret>
-}
-
-// EXIST: { lookupString: "kotlin", itemText: "kotlin", tailText: null, typeText: null }
-// EXIST: { lookupString: "util", itemText: "util", tailText: " (java.util)", typeText: null }

idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr-1.kt

@@ -1,7 +1,5 @@
 package some
 
-import jettesting.data
-
 fun other() {
-    data.topLevelFu<caret>
+    jettesting.data.topLevelFu<caret>
 }

idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr.kt.after

@@ -1,7 +1,5 @@
 package some
 
-import jettesting.data
-
 fun other() {
-    data.topLevelFunction()
+    jettesting.data.topLevelFunction()
 }

idea/idea-completion/testData/weighers/basic/Packages.kt

@@ -1,10 +1,7 @@
-import my.koza
-
 class A {
     val v = ko<caret>
 }
 
 // INVOCATION_COUNT: 2
-// ORDER: koza
 // ORDER: kotlin
 // ORDER: kokoFun

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java

@@ -601,12 +601,6 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             doTest(fileName);
         }
 
-        @TestMetadata("PackageCompletionInClassBody.kt")
-        public void testPackageCompletionInClassBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("PrivatesInSecondPressCompletion.kt")
         public void testPrivatesInSecondPressCompletion() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PrivatesInSecondPressCompletion.kt");

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java

@@ -601,12 +601,6 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             doTest(fileName);
         }
 
-        @TestMetadata("PackageCompletionInClassBody.kt")
-        public void testPackageCompletionInClassBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("PrivatesInSecondPressCompletion.kt")
         public void testPrivatesInSecondPressCompletion() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PrivatesInSecondPressCompletion.kt");

idea/testData/addImport/DropExplicitImports.kt

@@ -5,7 +5,6 @@ import java.sql.*
 import java.util.ArrayList // maybe dropped on adding import with *
 import java.util.Date // should not be dropped because of conflicting java.sql.Date class
 import java.util.HashSet as JavaHashSet // alias import should not be dropped
-import java.util.concurrent // import of package should not be dropped because packages are not imported by *
 
 fun foo() {
     val v1 = JavaHashSet()

idea/testData/addImport/DropExplicitImports.kt.after

@@ -5,7 +5,6 @@ import java.sql.*
 import java.util.*
 import java.util.Date
 import java.util.HashSet as JavaHashSet // alias import should not be dropped
-import java.util.concurrent // import of package should not be dropped because packages are not imported by *
 
 fun foo() {
     val v1 = JavaHashSet()

idea/testData/addImport/ImportPackage.kt

@@ -1,4 +0,0 @@
-// IMPORT: java.util
-package p
-
-fun foo(): util.ArrayList<String> {}

idea/testData/addImport/ImportPackage.kt.after

@@ -1,6 +0,0 @@
-// IMPORT: java.util
-package p
-
-import java.util
-
-fun foo(): util.ArrayList<String> {}

idea/testData/addImport/PackageAlreadyImported.kt

@@ -1,6 +0,0 @@
-// IMPORT: java.util
-package p
-
-import java.util
-
-fun foo(): util.ArrayList<String> {}

idea/testData/addImport/PackageAlreadyImported.kt.after

@@ -1,6 +0,0 @@
-// IMPORT: java.util
-package p
-
-import java.util
-
-fun foo(): util.ArrayList<String> {}

idea/testData/checker/ResolveToJava.kt

@@ -1,6 +1,5 @@
 import java.*
 import java.util.*
-import java.util
 import <error>utils</error>.*
 
 import java.io.PrintStream
@@ -14,7 +13,7 @@ fun test(<warning>l</warning> : List<Int>) {
   val <warning>x</warning> : java.<error>List</error>
   val <warning>y</warning> : List<Int>
   val <warning>b</warning> : <warning>java.lang.Object</warning>
-  val <warning>a</warning> : <warning>util.List<Int></warning>
+  val <warning>a</warning> : <warning>java.util.List<Int></warning>
   val <warning>z</warning> : java.<error>utils</error>.<error>List</error><Int>
 
   val <warning>f</warning> : java.io.File? = null

idea/testData/copyPaste/imports/PackageView.expected.kt

@@ -1,5 +1,3 @@
 package to
 
-import a.b
+val c = a.b.B()
-
-val c = b.B()

idea/testData/copyPaste/imports/PackageView.expected.names

@@ -1 +0,0 @@
-a.b

idea/testData/copyPaste/imports/PackageView.kt

@@ -1,5 +1,3 @@
 package a
 
-import a.b
+<selection>val c = a.b.B()</selection>
-
-<selection>val c = b.B()</selection>

idea/testData/decompiler/navigation/library/extra.kt

@@ -1,6 +1,4 @@
 package testData.libraries
 
-import kotlin as gogland
+public fun func(str : kotlin.String) {
-
-public fun func(str : gogland.String) {
 }

idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt

@@ -6,6 +6,6 @@ fun foo() {
 }
 
 // extra.kt
-//public fun <1>func(str : gogland.String) {
+//public fun <1>func(str : kotlin.String) {
 // main.kt
 //public fun <2>func(a : Int, b : String = "55") {

idea/testData/editor/optimizeImports/CurrentPackage.kt

@@ -1,9 +1,8 @@
 package ppp
 
 import ppp.*
-import ppp.ppp1
 
 open class C
 
 class D : C()
-class E : ppp1.C1()
+class E : ppp.ppp1.C1()

idea/testData/editor/optimizeImports/CurrentPackage.kt.after

@@ -1,8 +1,6 @@
 package ppp
 
-import ppp.ppp1
-
 open class C
 
 class D : C()
-class E : ppp1.C1()
+class E : ppp.ppp1.C1()

idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt

@@ -1,4 +0,0 @@
-package test1.test2.test3
-
-public class Class1 {
-}

idea/testData/editor/optimizeImports/KotlinPackage.kt

@@ -1,6 +0,0 @@
-import test1
-import test1.test2
-import test1.test2.test3
-import test1.test2.test3.Class1
-
-val s: test2.test3.Class1? = null

idea/testData/editor/optimizeImports/KotlinPackage.kt.after

@@ -1,3 +0,0 @@
-import test1.test2
-
-val s: test2.test3.Class1? = null

idea/testData/editor/optimizeImports/PartiallyQualified.kt

@@ -1,6 +0,0 @@
-import java
-import java.util
-import java.util.Map
-import java.util.Map.Entry
-
-var x : util.Map.Entry<util.List<String>, String>? = null

idea/testData/editor/optimizeImports/PartiallyQualified.kt.after

@@ -1,3 +0,0 @@
-import java.util
-
-var x : util.Map.Entry<util.List<String>, String>? = null

idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after

@@ -1,9 +1,7 @@
-import java.sql
-
 // WITH_RUNTIME
 
 fun getEntry() : Map.Entry<kotlin.Array<String>, java.sql.Array> {
     throw Error()
 }
 
-val x: Map.Entry<Array<String>, sql.Array> = getEntry()
+val x: Map.Entry<Array<String>, java.sql.Array> = getEntry()

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt

@@ -3,14 +3,12 @@ import java.lang.*
 import java.lang.Comparable
 import java.lang.Comparable
 import java.lang.Comparable as Foo
-import java.lang
-import java.lang as jl
 
 fun <T> a() : java.lang.Comparable<T><caret>? {
     return null
 }
 
-fun b() : lang.Comparable<String> {
+fun b() : java.lang.Comparable<String> {
     throw Exception()
 }
 
@@ -18,7 +16,7 @@ fun c() : Foo<String> {
     throw Exception()
 }
 
-fun d() : jl.Comparable<String>? {
+fun d() : java.lang.Comparable<String>? {
     return null
 }
 

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after

@@ -1,7 +1,5 @@
 // "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
 import java.lang.*
-import java.lang
-import java.lang as jl
 
 fun <T> a() : Comparable<T>? {
     return null

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt

@@ -3,14 +3,12 @@ import java.lang.*
 import java.lang.Comparable
 import java.lang.Comparable
 import java.lang.Comparable as Foo
-import java.lang
-import java.lang as jl
 
 fun <T> a() : java.lang.Comparable<T>? {
     return null
 }
 
-fun b() : lang.Comparable<String> {
+fun b() : java.lang.Comparable<String> {
     throw Exception()
 }
 
@@ -18,7 +16,7 @@ fun c() : Foo<String> {
     throw Exception()
 }
 
-fun d() : jl.Comparable<String><caret>? {
+fun d() : java.lang.Comparable<String><caret>? {
     return null
 }
 

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after

@@ -1,7 +1,5 @@
 // "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
 import java.lang.*
-import java.lang
-import java.lang as jl
 
 fun <T> a() : Comparable<T>? {
     return null

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt

@@ -3,14 +3,12 @@ import java.lang.*
 import java.lang.Comparable
 import java.lang.Comparable
 import java.lang.Comparable<caret> as Foo
-import java.lang
-import java.lang as jl
 
 fun <T> a() : java.lang.Comparable<T>? {
     return null
 }
 
-fun b() : lang.Comparable<String> {
+fun b() : java.lang.Comparable<String> {
     throw Exception()
 }
 
@@ -18,7 +16,7 @@ fun c() : Foo<String> {
     throw Exception()
 }
 
-fun d() : jl.Comparable<String>? {
+fun d() : java.lang.Comparable<String>? {
     return null
 }
 

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after

@@ -1,7 +1,5 @@
 // "Change all usages of 'java.lang.Comparable<T>' in this file to 'kotlin.Comparable<T>'" "true"
 import java.lang.*
-import java.lang
-import java.lang as jl
 
 fun <T> a() : Comparable<T>? {
     return null

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt

@@ -3,14 +3,12 @@ import java.lang.*
 import java.lang.Iterable
 import java.lang.Iterable
 import java.lang.Iterable as Foo
-import java.lang
-import java.lang as jl
 
 fun <T> a() : java.lang.Iterable<T>? {
     return null
 }
 
-fun b() : lang.Iterable<String>? {
+fun b() : java.lang.Iterable<String>? {
     return null
 }
 
@@ -18,7 +16,7 @@ fun c() : Foo<String><caret> {
     throw Exception()
 }
 
-fun d() : jl.Iterable<String>? {
+fun d() : java.lang.Iterable<String>? {
     return null
 }
 

idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after

@@ -1,7 +1,5 @@
 // "Change all usages of 'java.lang.Iterable<T>' in this file to a Kotlin class" "true"
 import java.lang.*
-import java.lang
-import java.lang as jl
 
 fun <T> a() : Iterable<T>? {
     return null

idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt

@@ -1,5 +1,3 @@
-import b.a
-
 fun bar() {
-    val t: a.A = a.A()
+    val t: b.a.A = b.a.A()
 }

idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt

@@ -1,10 +1,8 @@
 package c
 
-import b.a
-
 fun bar() {
-    val t: a.A = a.A()
+    val t: b.a.A = b.a.A()
-    a.foo()
+    b.a.foo()
-    println(a.x)
+    println(b.a.x)
-    a.x = ""
+    b.a.x = ""
 }

idea/testData/refactoring/rename/renameKotlinClass/after/Second.kt

@@ -1,14 +1,13 @@
 package testing.rename2
 
 import testing.rename.Third
-import testing.rename
 import java.util.ArrayList
 
 // Extends testing.rename.Third
 public class Second : Third() {
   val temp : testing.rename.Third = Third()
 
-  fun tempName(param : Third) : rename.Third {
+  fun tempName(param : Third) : testing.rename.Third {
     val local = Third()
     val otherLocal = param
     val arr = ArrayList<Third>()

idea/testData/refactoring/rename/renameKotlinClass/before/Second.kt

@@ -1,14 +1,13 @@
 package testing.rename2
 
 import testing.rename.First
-import testing.rename
 import java.util.ArrayList
 
 // Extends testing.rename.First
 public class Second : First() {
   val temp : testing.rename.First = First()
 
-  fun tempName(param : First) : rename.First {
+  fun tempName(param : First) : testing.rename.First {
     val local = First()
     val otherLocal = param
     val arr = ArrayList<First>()

idea/testData/shortenRefs/ClassNameConflict.kt.after

@@ -1,5 +1,3 @@
-import java.lang.reflect
-
 fun foo(array: Array<String>){}
 
-val v: reflect.Array
+val v: java.lang.reflect.Array

idea/testData/shortenRefs/constructor/LeaveQualified.kt.after

@@ -1,4 +1,3 @@
-import java.sql
 import java.util.Date
 
-val x = sql.Date(1)
+val x = java.sql.Date(1)

idea/testData/shortenRefs/constructor/LeaveQualified1.kt.after

@@ -1,7 +1,5 @@
-import java.io
-
 fun File(): String = ""
 
 class A {
-    val x = io.File()
+    val x = java.io.File()
 }

idea/testData/shortenRefs/constructor/LeaveQualified2.kt.after

@@ -1,7 +1,5 @@
-import java.util
-
 fun Random(): Int = 1
 
 class A {
-    val x = util.Random()
+    val x = java.util.Random()
 }

idea/testData/shortenRefs/constructor/LeaveQualified3.kt.after

@@ -1,6 +1,4 @@
-import java.util
-
 fun foo(){
     val Random = {}
-    val x = util.Random()
+    val x = java.util.Random()
 }

idea/testData/shortenRefs/constructor/LeaveQualified5.kt.after

@@ -1,8 +1,6 @@
-import java.io
-
 fun File(p: Int): String = ""
 fun File(p: String): String = ""
 
 class A {
-    val x = io.File()
+    val x = java.io.File()
 }

idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after

@@ -1,4 +1,3 @@
-import java.sql
 import java.util.Date
 
-val x = sql.Date(1)
+val x = java.sql.Date(1)

idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after

@@ -1,4 +1,3 @@
-import java.sql
 import java.util.Date
 
-class A : sql.Date
+class A : java.sql.Date

idea/testData/shortenRefs/type/GenericType3.kt.after

@@ -1,3 +1 @@
-import java.sql
+val x: Map.Entry<Array<String>, java.sql.Array>
-
-val x: Map.Entry<Array<String>, sql.Array>

idea/testData/shortenRefs/type/LeaveQualified.kt.after

@@ -1,4 +1,3 @@
-import java.sql
 import java.util.Date
 
-class A : sql.Date
+class A : java.sql.Date

idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after

@@ -1,7 +1,6 @@
-import java.sql
 import java.util.Date
 import java.util.HashMap
 
 class A {
-    val x: HashMap<Date, sql.Date>
+    val x: HashMap<Date, java.sql.Date>
 }

idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java

@@ -209,12 +209,6 @@ public class AddImportTestGenerated extends AbstractAddImportTest {
         doTest(fileName);
     }
 
-    @TestMetadata("ImportPackage.kt")
-    public void testImportPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportPackage.kt");
-        doTest(fileName);
-    }
-
     @TestMetadata("ImportSecondFunction.kt")
     public void testImportSecondFunction() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportSecondFunction.kt");
@@ -257,12 +251,6 @@ public class AddImportTestGenerated extends AbstractAddImportTest {
         doTest(fileName);
     }
 
-    @TestMetadata("PackageAlreadyImported.kt")
-    public void testPackageAlreadyImported() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/PackageAlreadyImported.kt");
-        doTest(fileName);
-    }
-
     @TestMetadata("PackageDoesNotConflictWithClass.kt")
     public void testPackageDoesNotConflictWithClass() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/PackageDoesNotConflictWithClass.kt");

idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java

@@ -125,12 +125,6 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
-    @TestMetadata("KotlinPackage.kt")
-    public void testKotlinPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KotlinPackage.kt");
-        doTest(fileName);
-    }
-
     @TestMetadata("Kt1850FullQualified.kt")
     public void testKt1850FullQualified() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850FullQualified.kt");
@@ -173,12 +167,6 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
-    @TestMetadata("PartiallyQualified.kt")
-    public void testPartiallyQualified() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/PartiallyQualified.kt");
-        doTest(fileName);
-    }
-
     @TestMetadata("RemoveImportsIfGeneral.kt")
     public void testRemoveImportsIfGeneral() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt");

libraries/stdlib/test/language/RangeIterationJVMTest.kt

@@ -1,7 +1,5 @@
 package language
 
-import java.lang as j
-
 import java.lang.Integer.MAX_VALUE as MaxI
 import java.lang.Integer.MIN_VALUE as MinI
 import java.lang.Byte.MAX_VALUE as MaxB
@@ -35,29 +33,29 @@ public class RangeIterationJVMTest {
     }
 
     @test fun infiniteSteps() {
-        doTest(0.0..5.0 step j.Double.POSITIVE_INFINITY, 0.0, 5.0, j.Double.POSITIVE_INFINITY, listOf(0.0))
+        doTest(0.0..5.0 step java.lang.Double.POSITIVE_INFINITY, 0.0, 5.0, java.lang.Double.POSITIVE_INFINITY, listOf(0.0))
-        doTest(0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY, 0.0.toFloat(), 5.0.toFloat(), j.Float.POSITIVE_INFINITY,
+        doTest(0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY, 0.0.toFloat(), 5.0.toFloat(), java.lang.Float.POSITIVE_INFINITY,
                listOf<Float>(0.0.toFloat()))
-        doTest(5.0 downTo 0.0 step j.Double.POSITIVE_INFINITY, 5.0, 0.0, j.Double.NEGATIVE_INFINITY, listOf(5.0))
+        doTest(5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY, 5.0, 0.0, java.lang.Double.NEGATIVE_INFINITY, listOf(5.0))
-        doTest(5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY, 5.0.toFloat(), 0.0.toFloat(), j.Float.NEGATIVE_INFINITY,
+        doTest(5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY, 5.0.toFloat(), 0.0.toFloat(), java.lang.Float.NEGATIVE_INFINITY,
                listOf<Float>(5.0.toFloat()))
     }
 
     @test fun nanEnds() {
-        doTest(j.Double.NaN..5.0, j.Double.NaN, 5.0, 1.0, listOf())
+        doTest(java.lang.Double.NaN..5.0, java.lang.Double.NaN, 5.0, 1.0, listOf())
-        doTest(j.Float.NaN.toFloat()..5.0.toFloat(), j.Float.NaN, 5.0.toFloat(), 1.0.toFloat(), listOf())
+        doTest(java.lang.Float.NaN.toFloat()..5.0.toFloat(), java.lang.Float.NaN, 5.0.toFloat(), 1.0.toFloat(), listOf())
-        doTest(j.Double.NaN downTo 0.0, j.Double.NaN, 0.0, -1.0, listOf())
+        doTest(java.lang.Double.NaN downTo 0.0, java.lang.Double.NaN, 0.0, -1.0, listOf())
-        doTest(j.Float.NaN.toFloat() downTo 0.0.toFloat(), j.Float.NaN, 0.0.toFloat(), -1.0.toFloat(), listOf())
+        doTest(java.lang.Float.NaN.toFloat() downTo 0.0.toFloat(), java.lang.Float.NaN, 0.0.toFloat(), -1.0.toFloat(), listOf())
 
-        doTest(0.0..j.Double.NaN, 0.0, j.Double.NaN, 1.0, listOf())
+        doTest(0.0..java.lang.Double.NaN, 0.0, java.lang.Double.NaN, 1.0, listOf())
-        doTest(0.0.toFloat()..j.Float.NaN, 0.0.toFloat(), j.Float.NaN, 1.0.toFloat(), listOf())
+        doTest(0.0.toFloat()..java.lang.Float.NaN, 0.0.toFloat(), java.lang.Float.NaN, 1.0.toFloat(), listOf())
-        doTest(5.0 downTo j.Double.NaN, 5.0, j.Double.NaN, -1.0, listOf())
+        doTest(5.0 downTo java.lang.Double.NaN, 5.0, java.lang.Double.NaN, -1.0, listOf())
-        doTest(5.0.toFloat() downTo j.Float.NaN, 5.0.toFloat(), j.Float.NaN, -1.0.toFloat(), listOf())
+        doTest(5.0.toFloat() downTo java.lang.Float.NaN, 5.0.toFloat(), java.lang.Float.NaN, -1.0.toFloat(), listOf())
 
-        doTest(j.Double.NaN..j.Double.NaN, j.Double.NaN, j.Double.NaN, 1.0, listOf())
+        doTest(java.lang.Double.NaN..java.lang.Double.NaN, java.lang.Double.NaN, java.lang.Double.NaN, 1.0, listOf())
-        doTest(j.Float.NaN..j.Float.NaN, j.Float.NaN, j.Float.NaN, 1.0.toFloat(), listOf())
+        doTest(java.lang.Float.NaN..java.lang.Float.NaN, java.lang.Float.NaN, java.lang.Float.NaN, 1.0.toFloat(), listOf())
-        doTest(j.Double.NaN downTo j.Double.NaN, j.Double.NaN, j.Double.NaN, -1.0, listOf())
+        doTest(java.lang.Double.NaN downTo java.lang.Double.NaN, java.lang.Double.NaN, java.lang.Double.NaN, -1.0, listOf())
-        doTest(j.Float.NaN downTo j.Float.NaN, j.Float.NaN, j.Float.NaN, -1.0.toFloat(), listOf())
+        doTest(java.lang.Float.NaN downTo java.lang.Float.NaN, java.lang.Float.NaN, java.lang.Float.NaN, -1.0.toFloat(), listOf())
     }
 
     @test fun maxValueToMaxValue() {