From 8efbf4fc328f8681890b4267ad7e7efa02e6497b Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sun, 13 Sep 2015 04:27:53 +0300 Subject: [PATCH] Fixed testdata -- removed package import --- .../SecondaryConstructors.B.kt | 1 - .../diagnostics/tests/ResolveToJava.kt | 2 -- .../SmartcastsForStableIdentifiers.kt | 10 ++---- .../testData/resolve/ResolveToJava.resolve | 9 +++-- .../common/PackageCompletionInClassBody.kt | 8 ----- .../TopLevelFunctionInQualifiedExpr-1.kt | 4 +-- .../TopLevelFunctionInQualifiedExpr.kt.after | 4 +-- .../testData/weighers/basic/Packages.kt | 3 -- .../test/JSBasicCompletionTestGenerated.java | 6 ---- .../test/JvmBasicCompletionTestGenerated.java | 6 ---- .../testData/addImport/DropExplicitImports.kt | 1 - .../addImport/DropExplicitImports.kt.after | 1 - idea/testData/addImport/ImportPackage.kt | 4 --- .../testData/addImport/ImportPackage.kt.after | 6 ---- .../addImport/PackageAlreadyImported.kt | 6 ---- .../addImport/PackageAlreadyImported.kt.after | 6 ---- idea/testData/checker/ResolveToJava.kt | 3 +- .../copyPaste/imports/PackageView.expected.kt | 4 +-- .../imports/PackageView.expected.names | 1 - .../testData/copyPaste/imports/PackageView.kt | 4 +-- .../decompiler/navigation/library/extra.kt | 4 +-- .../usercode/SameNameInDifferentSources.kt | 2 +- .../editor/optimizeImports/CurrentPackage.kt | 3 +- .../optimizeImports/CurrentPackage.kt.after | 4 +-- .../KotlinPackage.dependency.kt | 4 --- .../editor/optimizeImports/KotlinPackage.kt | 6 ---- .../optimizeImports/KotlinPackage.kt.after | 3 -- .../optimizeImports/PartiallyQualified.kt | 6 ---- .../PartiallyQualified.kt.after | 3 -- .../classNameClashing.kt.after | 4 +-- .../mapPlatformClassToKotlin1.kt | 6 ++-- .../mapPlatformClassToKotlin1.kt.after | 2 -- .../mapPlatformClassToKotlin2.kt | 6 ++-- .../mapPlatformClassToKotlin2.kt.after | 2 -- .../mapPlatformClassToKotlin3.kt | 6 ++-- .../mapPlatformClassToKotlin3.kt.after | 2 -- .../mapPlatformClassToKotlin4.kt | 6 ++-- .../mapPlatformClassToKotlin4.kt.after | 2 -- .../after/c/noImports.kt | 4 +-- .../movePackage/after/c/noImports.kt | 10 +++--- .../rename/renameKotlinClass/after/Second.kt | 3 +- .../rename/renameKotlinClass/before/Second.kt | 3 +- .../shortenRefs/ClassNameConflict.kt.after | 4 +-- .../constructor/LeaveQualified.kt.after | 3 +- .../constructor/LeaveQualified1.kt.after | 4 +-- .../constructor/LeaveQualified2.kt.after | 4 +-- .../constructor/LeaveQualified3.kt.after | 4 +-- .../constructor/LeaveQualified5.kt.after | 4 +-- .../leaveQualifiedConstructor.kt.after | 3 +- .../imports/leaveQualifiedType.kt.after | 3 +- .../shortenRefs/type/GenericType3.kt.after | 4 +-- .../shortenRefs/type/LeaveQualified.kt.after | 3 +- .../type/TwoClassesSameNames.kt.after | 3 +- .../addImport/AddImportTestGenerated.java | 12 ------- .../imports/OptimizeImportsTestGenerated.java | 12 ------- .../test/language/RangeIterationJVMTest.kt | 34 +++++++++---------- 56 files changed, 58 insertions(+), 219 deletions(-) delete mode 100644 idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt delete mode 100644 idea/testData/addImport/ImportPackage.kt delete mode 100644 idea/testData/addImport/ImportPackage.kt.after delete mode 100644 idea/testData/addImport/PackageAlreadyImported.kt delete mode 100644 idea/testData/addImport/PackageAlreadyImported.kt.after delete mode 100644 idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt delete mode 100644 idea/testData/editor/optimizeImports/KotlinPackage.kt delete mode 100644 idea/testData/editor/optimizeImports/KotlinPackage.kt.after delete mode 100644 idea/testData/editor/optimizeImports/PartiallyQualified.kt delete mode 100644 idea/testData/editor/optimizeImports/PartiallyQualified.kt.after diff --git a/compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.B.kt b/compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.B.kt index b80d0404af8..3ca776babb1 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.B.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.B.kt @@ -1,4 +1,3 @@ -import java.lang class B1() : A("123") { constructor(x1: Int): this() {} diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.kt b/compiler/testData/diagnostics/tests/ResolveToJava.kt index cc583a3b7eb..267ca7df9b5 100644 --- a/compiler/testData/diagnostics/tests/ResolveToJava.kt +++ b/compiler/testData/diagnostics/tests/ResolveToJava.kt @@ -8,7 +8,6 @@ import utils.* import java.io.PrintStream import java.lang.Comparable as Com -import java.util val l : MutableList = ArrayList() @@ -16,7 +15,6 @@ fun test(l : java.util val x : java.List val y : java.util.List val b : java.lang.Object - val a : util.List val z : java.utils.List val f : java.io.File? = null diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt index e6acb8f3e2f..81340fd5293 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt +++ b/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(a: Any?) : Int { var b: Int = 0 - if (ns.y is Int) { - b = ns.y - } - if (ns.y is Int) { - b = example.ns.y - } if (example.ns.y is Int) { - b = ns.y + b = y } if (example.ns.y is Int) { b = example.ns.y diff --git a/compiler/testData/resolve/ResolveToJava.resolve b/compiler/testData/resolve/ResolveToJava.resolve index 3425af5d16d..2e46dd3b2b9 100644 --- a/compiler/testData/resolve/ResolveToJava.resolve +++ b/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() } diff --git a/idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt b/idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt deleted file mode 100644 index c24078107b8..00000000000 --- a/idea/idea-completion/testData/basic/common/PackageCompletionInClassBody.kt +++ /dev/null @@ -1,8 +0,0 @@ -import java.util - -class A { - -} - -// EXIST: { lookupString: "kotlin", itemText: "kotlin", tailText: null, typeText: null } -// EXIST: { lookupString: "util", itemText: "util", tailText: " (java.util)", typeText: null } diff --git a/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr-1.kt b/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr-1.kt index cdd7fd054a1..1d5642137c0 100644 --- a/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr-1.kt +++ b/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr-1.kt @@ -1,7 +1,5 @@ package some -import jettesting.data - fun other() { - data.topLevelFu + jettesting.data.topLevelFu } diff --git a/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr.kt.after b/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr.kt.after index d823bc4112b..39c7fdc4842 100644 --- a/idea/idea-completion/testData/handlers/multifile/TopLevelFunctionInQualifiedExpr.kt.after +++ b/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() } diff --git a/idea/idea-completion/testData/weighers/basic/Packages.kt b/idea/idea-completion/testData/weighers/basic/Packages.kt index ec105cb0951..a18318dc4ef 100644 --- a/idea/idea-completion/testData/weighers/basic/Packages.kt +++ b/idea/idea-completion/testData/weighers/basic/Packages.kt @@ -1,10 +1,7 @@ -import my.koza - class A { val v = ko } // INVOCATION_COUNT: 2 -// ORDER: koza // ORDER: kotlin // ORDER: kokoFun diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java index 08dc413f2da..ed6e8e38524 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java +++ b/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"); diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java index 1e35f2a0593..d7e5f2b3b06 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java +++ b/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"); diff --git a/idea/testData/addImport/DropExplicitImports.kt b/idea/testData/addImport/DropExplicitImports.kt index f883b5c0556..1bac7c758cd 100644 --- a/idea/testData/addImport/DropExplicitImports.kt +++ b/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() diff --git a/idea/testData/addImport/DropExplicitImports.kt.after b/idea/testData/addImport/DropExplicitImports.kt.after index dd73768403a..6e7b6ada8f1 100644 --- a/idea/testData/addImport/DropExplicitImports.kt.after +++ b/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() diff --git a/idea/testData/addImport/ImportPackage.kt b/idea/testData/addImport/ImportPackage.kt deleted file mode 100644 index 611d7c1a16e..00000000000 --- a/idea/testData/addImport/ImportPackage.kt +++ /dev/null @@ -1,4 +0,0 @@ -// IMPORT: java.util -package p - -fun foo(): util.ArrayList {} diff --git a/idea/testData/addImport/ImportPackage.kt.after b/idea/testData/addImport/ImportPackage.kt.after deleted file mode 100644 index 5a241e73832..00000000000 --- a/idea/testData/addImport/ImportPackage.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -// IMPORT: java.util -package p - -import java.util - -fun foo(): util.ArrayList {} diff --git a/idea/testData/addImport/PackageAlreadyImported.kt b/idea/testData/addImport/PackageAlreadyImported.kt deleted file mode 100644 index 5a241e73832..00000000000 --- a/idea/testData/addImport/PackageAlreadyImported.kt +++ /dev/null @@ -1,6 +0,0 @@ -// IMPORT: java.util -package p - -import java.util - -fun foo(): util.ArrayList {} diff --git a/idea/testData/addImport/PackageAlreadyImported.kt.after b/idea/testData/addImport/PackageAlreadyImported.kt.after deleted file mode 100644 index 5a241e73832..00000000000 --- a/idea/testData/addImport/PackageAlreadyImported.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -// IMPORT: java.util -package p - -import java.util - -fun foo(): util.ArrayList {} diff --git a/idea/testData/checker/ResolveToJava.kt b/idea/testData/checker/ResolveToJava.kt index 6fe47e93ad6..69b17b51ca9 100644 --- a/idea/testData/checker/ResolveToJava.kt +++ b/idea/testData/checker/ResolveToJava.kt @@ -1,6 +1,5 @@ import java.* import java.util.* -import java.util import utils.* import java.io.PrintStream @@ -14,7 +13,7 @@ fun test(l : List) { val x : java.List val y : List val b : java.lang.Object - val a : util.List + val a : java.util.List val z : java.utils.List val f : java.io.File? = null diff --git a/idea/testData/copyPaste/imports/PackageView.expected.kt b/idea/testData/copyPaste/imports/PackageView.expected.kt index bde3b0bee44..4d4e887ceaf 100644 --- a/idea/testData/copyPaste/imports/PackageView.expected.kt +++ b/idea/testData/copyPaste/imports/PackageView.expected.kt @@ -1,5 +1,3 @@ package to -import a.b - -val c = b.B() \ No newline at end of file +val c = a.b.B() \ No newline at end of file diff --git a/idea/testData/copyPaste/imports/PackageView.expected.names b/idea/testData/copyPaste/imports/PackageView.expected.names index 4e1c325aa34..e69de29bb2d 100644 --- a/idea/testData/copyPaste/imports/PackageView.expected.names +++ b/idea/testData/copyPaste/imports/PackageView.expected.names @@ -1 +0,0 @@ -a.b diff --git a/idea/testData/copyPaste/imports/PackageView.kt b/idea/testData/copyPaste/imports/PackageView.kt index 3ee1c041d0e..cf6866f7f2a 100644 --- a/idea/testData/copyPaste/imports/PackageView.kt +++ b/idea/testData/copyPaste/imports/PackageView.kt @@ -1,5 +1,3 @@ package a -import a.b - -val c = b.B() \ No newline at end of file +val c = a.b.B() \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/library/extra.kt b/idea/testData/decompiler/navigation/library/extra.kt index da2d67ed71b..3c89c06e307 100644 --- a/idea/testData/decompiler/navigation/library/extra.kt +++ b/idea/testData/decompiler/navigation/library/extra.kt @@ -1,6 +1,4 @@ package testData.libraries -import kotlin as gogland - -public fun func(str : gogland.String) { +public fun func(str : kotlin.String) { } \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt index e48ef5ef832..6aca2ca2370 100644 --- a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt +++ b/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") { diff --git a/idea/testData/editor/optimizeImports/CurrentPackage.kt b/idea/testData/editor/optimizeImports/CurrentPackage.kt index adab8e061ff..6182b0149e7 100644 --- a/idea/testData/editor/optimizeImports/CurrentPackage.kt +++ b/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() \ No newline at end of file +class E : ppp.ppp1.C1() \ No newline at end of file diff --git a/idea/testData/editor/optimizeImports/CurrentPackage.kt.after b/idea/testData/editor/optimizeImports/CurrentPackage.kt.after index 8a9963300e5..43d070d7a36 100644 --- a/idea/testData/editor/optimizeImports/CurrentPackage.kt.after +++ b/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() \ No newline at end of file +class E : ppp.ppp1.C1() \ No newline at end of file diff --git a/idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt b/idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt deleted file mode 100644 index 8ef61e7a946..00000000000 --- a/idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt +++ /dev/null @@ -1,4 +0,0 @@ -package test1.test2.test3 - -public class Class1 { -} diff --git a/idea/testData/editor/optimizeImports/KotlinPackage.kt b/idea/testData/editor/optimizeImports/KotlinPackage.kt deleted file mode 100644 index e9355f74d38..00000000000 --- a/idea/testData/editor/optimizeImports/KotlinPackage.kt +++ /dev/null @@ -1,6 +0,0 @@ -import test1 -import test1.test2 -import test1.test2.test3 -import test1.test2.test3.Class1 - -val s: test2.test3.Class1? = null diff --git a/idea/testData/editor/optimizeImports/KotlinPackage.kt.after b/idea/testData/editor/optimizeImports/KotlinPackage.kt.after deleted file mode 100644 index 301ba8c8c89..00000000000 --- a/idea/testData/editor/optimizeImports/KotlinPackage.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -import test1.test2 - -val s: test2.test3.Class1? = null diff --git a/idea/testData/editor/optimizeImports/PartiallyQualified.kt b/idea/testData/editor/optimizeImports/PartiallyQualified.kt deleted file mode 100644 index 896cd41558b..00000000000 --- a/idea/testData/editor/optimizeImports/PartiallyQualified.kt +++ /dev/null @@ -1,6 +0,0 @@ -import java -import java.util -import java.util.Map -import java.util.Map.Entry - -var x : util.Map.Entry, String>? = null diff --git a/idea/testData/editor/optimizeImports/PartiallyQualified.kt.after b/idea/testData/editor/optimizeImports/PartiallyQualified.kt.after deleted file mode 100644 index e6d7d1141f6..00000000000 --- a/idea/testData/editor/optimizeImports/PartiallyQualified.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -import java.util - -var x : util.Map.Entry, String>? = null diff --git a/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after index 6d7576d9876..ec5193318d2 100644 --- a/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after +++ b/idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after @@ -1,9 +1,7 @@ -import java.sql - // WITH_RUNTIME fun getEntry() : Map.Entry, java.sql.Array> { throw Error() } -val x: Map.Entry, sql.Array> = getEntry() +val x: Map.Entry, java.sql.Array> = getEntry() diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt index b8bfbfa1e48..5edcf66dd98 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt +++ b/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 a() : java.lang.Comparable? { return null } -fun b() : lang.Comparable { +fun b() : java.lang.Comparable { throw Exception() } @@ -18,7 +16,7 @@ fun c() : Foo { throw Exception() } -fun d() : jl.Comparable? { +fun d() : java.lang.Comparable? { return null } diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after index ebe61646898..50bdd4a9c83 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after +++ b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after @@ -1,7 +1,5 @@ // "Change all usages of 'java.lang.Comparable' in this file to 'kotlin.Comparable'" "true" import java.lang.* -import java.lang -import java.lang as jl fun a() : Comparable? { return null diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt index 3384f96bad3..4fac7cbfccb 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt +++ b/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 a() : java.lang.Comparable? { return null } -fun b() : lang.Comparable { +fun b() : java.lang.Comparable { throw Exception() } @@ -18,7 +16,7 @@ fun c() : Foo { throw Exception() } -fun d() : jl.Comparable? { +fun d() : java.lang.Comparable? { return null } diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after index ebe61646898..50bdd4a9c83 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after +++ b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after @@ -1,7 +1,5 @@ // "Change all usages of 'java.lang.Comparable' in this file to 'kotlin.Comparable'" "true" import java.lang.* -import java.lang -import java.lang as jl fun a() : Comparable? { return null diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt index e746de92152..8ce848c83bc 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt +++ b/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 as Foo -import java.lang -import java.lang as jl fun a() : java.lang.Comparable? { return null } -fun b() : lang.Comparable { +fun b() : java.lang.Comparable { throw Exception() } @@ -18,7 +16,7 @@ fun c() : Foo { throw Exception() } -fun d() : jl.Comparable? { +fun d() : java.lang.Comparable? { return null } diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after index ebe61646898..50bdd4a9c83 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after +++ b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after @@ -1,7 +1,5 @@ // "Change all usages of 'java.lang.Comparable' in this file to 'kotlin.Comparable'" "true" import java.lang.* -import java.lang -import java.lang as jl fun a() : Comparable? { return null diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt index bb30344477b..135ad45482e 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt +++ b/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 a() : java.lang.Iterable? { return null } -fun b() : lang.Iterable? { +fun b() : java.lang.Iterable? { return null } @@ -18,7 +16,7 @@ fun c() : Foo { throw Exception() } -fun d() : jl.Iterable? { +fun d() : java.lang.Iterable? { return null } diff --git a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after index 0348015a7ca..66e8f14dffa 100644 --- a/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after +++ b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after @@ -1,7 +1,5 @@ // "Change all usages of 'java.lang.Iterable' in this file to a Kotlin class" "true" import java.lang.* -import java.lang -import java.lang as jl fun a() : Iterable? { return null diff --git a/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt b/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt index 08f88cf630d..34cadcafc5b 100644 --- a/idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/after/c/noImports.kt +++ b/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() } diff --git a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt index ab9987296a5..ba21a605581 100644 --- a/idea/testData/refactoring/move/kotlin/movePackage/movePackage/after/c/noImports.kt +++ b/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() - a.foo() - println(a.x) - a.x = "" + val t: b.a.A = b.a.A() + b.a.foo() + println(b.a.x) + b.a.x = "" } diff --git a/idea/testData/refactoring/rename/renameKotlinClass/after/Second.kt b/idea/testData/refactoring/rename/renameKotlinClass/after/Second.kt index c925c15a2eb..920e04e2101 100644 --- a/idea/testData/refactoring/rename/renameKotlinClass/after/Second.kt +++ b/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() diff --git a/idea/testData/refactoring/rename/renameKotlinClass/before/Second.kt b/idea/testData/refactoring/rename/renameKotlinClass/before/Second.kt index d706e5d2367..d7d2e505faa 100644 --- a/idea/testData/refactoring/rename/renameKotlinClass/before/Second.kt +++ b/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() diff --git a/idea/testData/shortenRefs/ClassNameConflict.kt.after b/idea/testData/shortenRefs/ClassNameConflict.kt.after index fb6927d6d07..271f9dd56b1 100644 --- a/idea/testData/shortenRefs/ClassNameConflict.kt.after +++ b/idea/testData/shortenRefs/ClassNameConflict.kt.after @@ -1,5 +1,3 @@ -import java.lang.reflect - fun foo(array: Array){} -val v: reflect.Array \ No newline at end of file +val v: java.lang.reflect.Array \ No newline at end of file diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after b/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after index 598f17649c7..d8a45a690b4 100644 --- a/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after +++ b/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) diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified1.kt.after b/idea/testData/shortenRefs/constructor/LeaveQualified1.kt.after index 95b558b552b..649e81a40d2 100644 --- a/idea/testData/shortenRefs/constructor/LeaveQualified1.kt.after +++ b/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() } diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified2.kt.after b/idea/testData/shortenRefs/constructor/LeaveQualified2.kt.after index a3429f3587c..fb504edad84 100644 --- a/idea/testData/shortenRefs/constructor/LeaveQualified2.kt.after +++ b/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() } diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified3.kt.after b/idea/testData/shortenRefs/constructor/LeaveQualified3.kt.after index e231a04e2b4..45ec568b883 100644 --- a/idea/testData/shortenRefs/constructor/LeaveQualified3.kt.after +++ b/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() } diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified5.kt.after b/idea/testData/shortenRefs/constructor/LeaveQualified5.kt.after index 78b3622f497..362cabe8006 100644 --- a/idea/testData/shortenRefs/constructor/LeaveQualified5.kt.after +++ b/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() } diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after index 598f17649c7..d8a45a690b4 100644 --- a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after +++ b/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) diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after index 06c610ca86f..32a596fd4f8 100644 --- a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after +++ b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after @@ -1,4 +1,3 @@ -import java.sql import java.util.Date -class A : sql.Date \ No newline at end of file +class A : java.sql.Date \ No newline at end of file diff --git a/idea/testData/shortenRefs/type/GenericType3.kt.after b/idea/testData/shortenRefs/type/GenericType3.kt.after index 327c6170359..d0379492698 100644 --- a/idea/testData/shortenRefs/type/GenericType3.kt.after +++ b/idea/testData/shortenRefs/type/GenericType3.kt.after @@ -1,3 +1 @@ -import java.sql - -val x: Map.Entry, sql.Array> \ No newline at end of file +val x: Map.Entry, java.sql.Array> \ No newline at end of file diff --git a/idea/testData/shortenRefs/type/LeaveQualified.kt.after b/idea/testData/shortenRefs/type/LeaveQualified.kt.after index 5ca06872d01..168f5ce822c 100644 --- a/idea/testData/shortenRefs/type/LeaveQualified.kt.after +++ b/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 diff --git a/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after b/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after index 9843a31dff8..9af4d36a26e 100644 --- a/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after +++ b/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 + val x: HashMap } diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java index bcdaa72004a..4e8c86a96b8 100644 --- a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java +++ b/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"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java index c1095c58203..a67caad5ec9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java +++ b/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"); diff --git a/libraries/stdlib/test/language/RangeIterationJVMTest.kt b/libraries/stdlib/test/language/RangeIterationJVMTest.kt index 72c4675e720..506954168f3 100644 --- a/libraries/stdlib/test/language/RangeIterationJVMTest.kt +++ b/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.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY, 0.0.toFloat(), 5.0.toFloat(), j.Float.POSITIVE_INFINITY, + 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 java.lang.Float.POSITIVE_INFINITY, 0.0.toFloat(), 5.0.toFloat(), java.lang.Float.POSITIVE_INFINITY, listOf(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.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY, 5.0.toFloat(), 0.0.toFloat(), j.Float.NEGATIVE_INFINITY, + 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 java.lang.Float.POSITIVE_INFINITY, 5.0.toFloat(), 0.0.toFloat(), java.lang.Float.NEGATIVE_INFINITY, listOf(5.0.toFloat())) } @test fun nanEnds() { - doTest(j.Double.NaN..5.0, j.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(j.Double.NaN downTo 0.0, j.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.Double.NaN..5.0, java.lang.Double.NaN, 5.0, 1.0, listOf()) + doTest(java.lang.Float.NaN.toFloat()..5.0.toFloat(), java.lang.Float.NaN, 5.0.toFloat(), 1.0.toFloat(), listOf()) + doTest(java.lang.Double.NaN downTo 0.0, java.lang.Double.NaN, 0.0, -1.0, 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.toFloat()..j.Float.NaN, 0.0.toFloat(), j.Float.NaN, 1.0.toFloat(), listOf()) - doTest(5.0 downTo j.Double.NaN, 5.0, j.Double.NaN, -1.0, listOf()) - doTest(5.0.toFloat() downTo j.Float.NaN, 5.0.toFloat(), j.Float.NaN, -1.0.toFloat(), listOf()) + doTest(0.0..java.lang.Double.NaN, 0.0, java.lang.Double.NaN, 1.0, listOf()) + doTest(0.0.toFloat()..java.lang.Float.NaN, 0.0.toFloat(), java.lang.Float.NaN, 1.0.toFloat(), listOf()) + doTest(5.0 downTo java.lang.Double.NaN, 5.0, java.lang.Double.NaN, -1.0, 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(j.Float.NaN..j.Float.NaN, j.Float.NaN, j.Float.NaN, 1.0.toFloat(), listOf()) - doTest(j.Double.NaN downTo j.Double.NaN, j.Double.NaN, j.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.Double.NaN..java.lang.Double.NaN, java.lang.Double.NaN, java.lang.Double.NaN, 1.0, listOf()) + doTest(java.lang.Float.NaN..java.lang.Float.NaN, java.lang.Float.NaN, java.lang.Float.NaN, 1.0.toFloat(), listOf()) + doTest(java.lang.Double.NaN downTo java.lang.Double.NaN, java.lang.Double.NaN, java.lang.Double.NaN, -1.0, 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() {