From 654411a0b0307a670b3fab8bc39518213c125f9a Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 11 Dec 2014 10:45:15 +0300 Subject: [PATCH] Refactored tests using Array constructor: Some moved to tests with stdlib Some changed to use arrayOfNulls --- compiler/testData/codegen/box/arrays/kt238.kt | 2 +- .../testData/codegen/box/arrays/kt2997.kt | 4 +- compiler/testData/codegen/box/arrays/kt779.kt | 2 +- .../box/controlStructures/continueInFor.kt | 2 +- .../controlStructures/continueToLabelInFor.kt | 2 +- .../forInSmartCastToArray.kt | 6 +- .../box/controlStructures/forIntArray.kt | 4 +- .../box/controlStructures/forUserType.kt | 2 +- .../codegen/box/controlStructures/kt237.kt | 4 +- .../testData/codegen/box/objects/kt3238.kt | 2 +- .../compareTo/extensionArray.kt | 4 +- .../testData/codegen/box/toArray/toArray.kt | 2 +- .../box/toArray/toArrayAlreadyPresent.kt | 10 +- .../arrays/arrayGetAssignMultiIndex.kt | 0 .../arrays/arrayGetMultiIndex.kt | 0 .../{box => boxWithStdlib}/arrays/iterator.kt | 0 .../arrays}/kt1291.kt | 0 .../arrays}/kt4118.kt | 0 .../arrays}/kt945.kt | 0 .../arrays/nonNullArray.kt | 0 .../traits => boxWithStdlib/arrays}/stdlib.kt | 0 .../{box => boxWithStdlib}/classes/kt471.kt | 0 .../{box => boxWithStdlib}/classes/kt633.kt | 0 .../multiDeclForArray}/MultiDeclFor.kt | 0 .../MultiDeclForComponentExtensions.kt | 0 .../MultiDeclForComponentMemberExtensions.kt | 0 ...nentMemberExtensionsInExtensionFunction.kt | 0 .../MultiDeclForValCaptured.kt | 0 .../int/MultiDeclForComponentExtensions.kt | 0 ...tiDeclForComponentExtensionsValCaptured.kt | 0 .../MultiDeclForComponentMemberExtensions.kt | 0 ...nentMemberExtensionsInExtensionFunction.kt | 0 .../long/MultiDeclForComponentExtensions.kt | 0 ...tiDeclForComponentExtensionsValCaptured.kt | 0 .../MultiDeclForComponentMemberExtensions.kt | 0 ...nentMemberExtensionsInExtensionFunction.kt | 0 .../boxingOptimization/unsafeRemoving.kt | 6 +- .../reflection/classWithVararg.kt | 2 +- .../PlatformTypes.B.kt | 2 +- .../dataFlowInfoTraversal/ArrayAccess.kt | 3 + .../dataFlowInfoTraversal/ArrayAccess.txt | 1 + .../tests/dataFlowInfoTraversal/For.kt | 3 + .../tests/dataFlowInfoTraversal/For.txt | 1 + .../tests/jdk-annotations/ArrayListToArray.kt | 5 +- .../jdk-annotations/ArrayListToArray.txt | 1 + .../diagnostics/tests/labels/kt1703.kt | 3 + .../diagnostics/tests/labels/kt1703.txt | 1 + .../diagnostics/tests/regressions/kt312.kt | 3 + .../diagnostics/tests/regressions/kt312.txt | 1 + .../ShadowMultiDeclarationWithFunParameter.kt | 3 + ...ShadowMultiDeclarationWithFunParameter.txt | 1 + .../inference/arrayConstructor.kt | 0 .../inference/arrayConstructor.txt | 0 .../inference}/kt1558.kt | 0 .../inference}/kt1558.txt | 0 .../checkers/JetDiagnosticsTestGenerated.java | 12 -- ...JetDiagnosticsTestWithStdLibGenerated.java | 23 ++- .../jetbrains/jet/codegen/ArrayGenTest.java | 24 --- .../jetbrains/jet/codegen/PackageGenTest.java | 19 -- .../BlackBoxCodegenTestGenerated.java | 168 +---------------- ...lackBoxWithStdlibCodegenTestGenerated.java | 177 +++++++++++++++++- idea/testData/checker/Shadowing.kt | 4 +- .../simpleIfWithComplexAssignmentLHS.kt | 2 +- .../simpleIfWithComplexAssignmentLHS.kt.after | 2 +- .../simpleWhenWithComplexAssignmentLHS.kt | 2 +- ...impleWhenWithComplexAssignmentLHS.kt.after | 2 +- .../unnecessaryParentheses7.kt | 1 + .../unnecessaryParentheses7.kt.after | 1 + 68 files changed, 266 insertions(+), 253 deletions(-) rename compiler/testData/codegen/{box => boxWithStdlib}/arrays/arrayGetAssignMultiIndex.kt (100%) rename compiler/testData/codegen/{box => boxWithStdlib}/arrays/arrayGetMultiIndex.kt (100%) rename compiler/testData/codegen/{box => boxWithStdlib}/arrays/iterator.kt (100%) rename compiler/testData/codegen/{box/functions => boxWithStdlib/arrays}/kt1291.kt (100%) rename compiler/testData/codegen/{box/extensionFunctions => boxWithStdlib/arrays}/kt4118.kt (100%) rename compiler/testData/codegen/{box/primitiveTypes => boxWithStdlib/arrays}/kt945.kt (100%) rename compiler/testData/codegen/{box => boxWithStdlib}/arrays/nonNullArray.kt (100%) rename compiler/testData/codegen/{box/traits => boxWithStdlib/arrays}/stdlib.kt (100%) rename compiler/testData/codegen/{box => boxWithStdlib}/classes/kt471.kt (100%) rename compiler/testData/codegen/{box => boxWithStdlib}/classes/kt633.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/MultiDeclFor.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/MultiDeclForComponentExtensions.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/MultiDeclForComponentMemberExtensions.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/MultiDeclForValCaptured.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/int/MultiDeclForComponentExtensions.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/int/MultiDeclForComponentExtensionsValCaptured.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/int/MultiDeclForComponentMemberExtensions.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/long/MultiDeclForComponentExtensions.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/long/MultiDeclForComponentExtensionsValCaptured.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/long/MultiDeclForComponentMemberExtensions.kt (100%) rename compiler/testData/codegen/{box/multiDecl/forArray => boxWithStdlib/multiDeclForArray}/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/inference/arrayConstructor.kt (100%) rename compiler/testData/diagnostics/{tests => testsWithStdLib}/inference/arrayConstructor.txt (100%) rename compiler/testData/diagnostics/{tests/inference/regressions => testsWithStdLib/inference}/kt1558.kt (100%) rename compiler/testData/diagnostics/{tests/inference/regressions => testsWithStdLib/inference}/kt1558.txt (100%) diff --git a/compiler/testData/codegen/box/arrays/kt238.kt b/compiler/testData/codegen/box/arrays/kt238.kt index 96eaf8f43f5..a3b6a6f4719 100644 --- a/compiler/testData/codegen/box/arrays/kt238.kt +++ b/compiler/testData/codegen/box/arrays/kt238.kt @@ -5,7 +5,7 @@ fun t1 () { } fun t2 () { - val a2 = Array(1,{0}) + val a2 = arrayOfNulls(1) as Array a2[0] = 0 //ok var i = a2[0] //ok } diff --git a/compiler/testData/codegen/box/arrays/kt2997.kt b/compiler/testData/codegen/box/arrays/kt2997.kt index bf272a5e054..e38fce8c3b2 100644 --- a/compiler/testData/codegen/box/arrays/kt2997.kt +++ b/compiler/testData/codegen/box/arrays/kt2997.kt @@ -67,10 +67,10 @@ fun box(): String { if (foo(boolA) != 1) return "fail boolean[]" val cA = CharArray(1) if (foo(cA) != 1) return "fail char[]" - val oA = Array(1) { 1 } + val oA = arrayOfNulls(1) if (foo(oA) != 1) return "fail Any[]" - val sArray = Array(0) { "" } + val sArray = arrayOfNulls(0) if (foo(sArray) != 0) return "fail String[]" return "OK" diff --git a/compiler/testData/codegen/box/arrays/kt779.kt b/compiler/testData/codegen/box/arrays/kt779.kt index 29568a54456..ab496bf2d13 100644 --- a/compiler/testData/codegen/box/arrays/kt779.kt +++ b/compiler/testData/codegen/box/arrays/kt779.kt @@ -1,3 +1,3 @@ val Array.length : Int get() = this.size() -fun box() = if(Array(10, {1}).length == 10) "OK" else "fail" +fun box() = if(arrayOfNulls(10).length == 10) "OK" else "fail" diff --git a/compiler/testData/codegen/box/controlStructures/continueInFor.kt b/compiler/testData/codegen/box/controlStructures/continueInFor.kt index 733503c4397..a4f24ea459a 100644 --- a/compiler/testData/codegen/box/controlStructures/continueInFor.kt +++ b/compiler/testData/codegen/box/controlStructures/continueInFor.kt @@ -90,7 +90,7 @@ fun for_object_list(): Int { } fun for_str_array(): Int { - val a = Array(10) {i -> "$i"} + val a = arrayOfNulls(10) var c = 0 for (i in a) { if (c >= 5) continue diff --git a/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt b/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt index 908afa088ca..2ccc98c632b 100644 --- a/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt +++ b/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt @@ -90,7 +90,7 @@ fun for_object_list(): Int { } fun for_str_array(): Int { - val a = Array(10) {i -> "$i"} + val a = arrayOfNulls(10) var c = 0 @loop for (i in a) { if (c >= 5) continue @loop diff --git a/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt b/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt index 183fe28c63b..c69428486ef 100644 --- a/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt +++ b/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt @@ -7,4 +7,8 @@ fun f(x: Any?): String { return "FAIL" } -fun box(): String = f(Array(1, {"OK"})) +fun box(): String { + val a = arrayOfNulls(1) as Array + a[0] = "OK" + return f(a) +} diff --git a/compiler/testData/codegen/box/controlStructures/forIntArray.kt b/compiler/testData/codegen/box/controlStructures/forIntArray.kt index 02a95f33356..9fc295b3eda 100644 --- a/compiler/testData/codegen/box/controlStructures/forIntArray.kt +++ b/compiler/testData/codegen/box/controlStructures/forIntArray.kt @@ -1,11 +1,11 @@ fun box() : String { - val a = Array (5, {0}) + val a = arrayOfNulls(5) var i = 0 var sum = 0 for(el in 0..4) { a[i] = i++ } - for (el in a) { + for (el in (a as Array)) { sum = sum + el } if(sum != 10) return "a failed" diff --git a/compiler/testData/codegen/box/controlStructures/forUserType.kt b/compiler/testData/codegen/box/controlStructures/forUserType.kt index 4284211a9e4..aff6e3ad88d 100644 --- a/compiler/testData/codegen/box/controlStructures/forUserType.kt +++ b/compiler/testData/codegen/box/controlStructures/forUserType.kt @@ -44,7 +44,7 @@ fun box() : String { } if(sum != 15) return "c4 failed" - val a : Array = Array (5, {0}) + val a : Array = arrayOfNulls(5) as Array for(el in 0..4) { a[i] = i++ } diff --git a/compiler/testData/codegen/box/controlStructures/kt237.kt b/compiler/testData/codegen/box/controlStructures/kt237.kt index 4f4178e4025..fad5157e9eb 100644 --- a/compiler/testData/codegen/box/controlStructures/kt237.kt +++ b/compiler/testData/codegen/box/controlStructures/kt237.kt @@ -5,7 +5,7 @@ fun main(args: Array?) { //do not compile System.out?.println(fff(Unit)) //do not compile System.out?.println(id(y)) //do not compile - System.out?.println(fff(id(y)) == id(foreach(Array(0,{0}),{(e : Int) : Unit -> }))) //do not compile + System.out?.println(fff(id(y)) == id(foreach(arrayOfNulls(0) as Array,{(e : Int) : Unit -> }))) //do not compile } class A() @@ -30,7 +30,7 @@ fun almostFilter(array: Array, action: (Int)-> Int) { } fun box() : String { - val a = Array (3,{-1}) + val a = arrayOfNulls(3) as Array a[0] = 0 a[1] = 1 a[2] = 2 diff --git a/compiler/testData/codegen/box/objects/kt3238.kt b/compiler/testData/codegen/box/objects/kt3238.kt index ef291a4422f..b635d8471a3 100644 --- a/compiler/testData/codegen/box/objects/kt3238.kt +++ b/compiler/testData/codegen/box/objects/kt3238.kt @@ -7,6 +7,6 @@ object Obj { fun box() : String { val klass = Class.forName("Obj\$Inner")!! val cons = klass.getConstructors()!![0] - val inner = cons.newInstance(* Array(0){""}) + val inner = cons.newInstance(*(arrayOfNulls(0) as Array)) return "OK" } diff --git a/compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt b/compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt index f7e864581e1..14af95c1068 100644 --- a/compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt +++ b/compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt @@ -10,7 +10,7 @@ fun checkLess(x: Array, y: Array) = when { fun Array.compareTo(other: Array) = size() - other.size() fun box(): String { - val a = Array(0, {0}) - val b = Array(1, {0}) + val a = arrayOfNulls(0) as Array + val b = arrayOfNulls(1) as Array return checkLess(a, b) } diff --git a/compiler/testData/codegen/box/toArray/toArray.kt b/compiler/testData/codegen/box/toArray/toArray.kt index 6d217ea2db0..ccc23fbf998 100644 --- a/compiler/testData/codegen/box/toArray/toArray.kt +++ b/compiler/testData/codegen/box/toArray/toArray.kt @@ -6,7 +6,7 @@ fun box(): String { val collection = MyCollection(Arrays.asList(2, 3, 9)) as java.util.Collection<*> val array1 = collection.toArray() - val array2 = collection.toArray(Array(3, { 0 })) + val array2 = collection.toArray(arrayOfNulls(3) as Array) if (array1 !is Array) return (array1 as Object).getClass().toString() if (array2 !is Array) return (array2 as Object).getClass().toString() diff --git a/compiler/testData/codegen/box/toArray/toArrayAlreadyPresent.kt b/compiler/testData/codegen/box/toArray/toArrayAlreadyPresent.kt index d8f89680fd0..4f6591cb979 100644 --- a/compiler/testData/codegen/box/toArray/toArrayAlreadyPresent.kt +++ b/compiler/testData/codegen/box/toArray/toArrayAlreadyPresent.kt @@ -1,7 +1,13 @@ import java.util.Arrays class MyCollection(val delegate: Collection): Collection by delegate { - public fun toArray(): Array = Array(3, { it }) + public fun toArray(): Array { + val a = arrayOfNulls(3) + a[0] = 0 + a[1] = 1 + a[2] = 2 + return a + } public fun toArray(array: Array): Array { val asIntArray = array as Array asIntArray[0] = 0 @@ -15,7 +21,7 @@ fun box(): String { val collection = MyCollection(Arrays.asList(2, 3, 9)) as java.util.Collection<*> val array1 = collection.toArray() - val array2 = collection.toArray(Array(3, { 0 })) + val array2 = collection.toArray(arrayOfNulls(3) as Array) if (array1 !is Array) return (array1 as Object).getClass().toString() if (array2 !is Array) return (array2 as Object).getClass().toString() diff --git a/compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt b/compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt similarity index 100% rename from compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt diff --git a/compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt b/compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt similarity index 100% rename from compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt diff --git a/compiler/testData/codegen/box/arrays/iterator.kt b/compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt similarity index 100% rename from compiler/testData/codegen/box/arrays/iterator.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt diff --git a/compiler/testData/codegen/box/functions/kt1291.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt similarity index 100% rename from compiler/testData/codegen/box/functions/kt1291.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt diff --git a/compiler/testData/codegen/box/extensionFunctions/kt4118.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt similarity index 100% rename from compiler/testData/codegen/box/extensionFunctions/kt4118.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt diff --git a/compiler/testData/codegen/box/primitiveTypes/kt945.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt similarity index 100% rename from compiler/testData/codegen/box/primitiveTypes/kt945.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt diff --git a/compiler/testData/codegen/box/arrays/nonNullArray.kt b/compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt similarity index 100% rename from compiler/testData/codegen/box/arrays/nonNullArray.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt diff --git a/compiler/testData/codegen/box/traits/stdlib.kt b/compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt similarity index 100% rename from compiler/testData/codegen/box/traits/stdlib.kt rename to compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt diff --git a/compiler/testData/codegen/box/classes/kt471.kt b/compiler/testData/codegen/boxWithStdlib/classes/kt471.kt similarity index 100% rename from compiler/testData/codegen/box/classes/kt471.kt rename to compiler/testData/codegen/boxWithStdlib/classes/kt471.kt diff --git a/compiler/testData/codegen/box/classes/kt633.kt b/compiler/testData/codegen/boxWithStdlib/classes/kt633.kt similarity index 100% rename from compiler/testData/codegen/box/classes/kt633.kt rename to compiler/testData/codegen/boxWithStdlib/classes/kt633.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/MultiDeclFor.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/MultiDeclFor.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentExtensions.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensions.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForValCaptured.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForValCaptured.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensions.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensionsValCaptured.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensionsValCaptured.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensions.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensions.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensionsValCaptured.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensionsValCaptured.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensions.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt diff --git a/compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt similarity index 100% rename from compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt rename to compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt diff --git a/compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt b/compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt index a1bd06ba233..c1989011177 100644 --- a/compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt +++ b/compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt @@ -10,7 +10,7 @@ fun foo() { val a = A() a.x = 3 - val b = Array(4, { null }) + val b = arrayOfNulls(4) b[100] = 5 val x = 6 : Int? @@ -24,5 +24,5 @@ fun foo() { val c2: Any = if (1 != 1) 0 else "abc" } -// 10 java/lang/Integer.valueOf -// 1 intValue +// 9 java/lang/Integer.valueOf +// 0 intValue diff --git a/compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt b/compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt index 95bf0fa2ed4..249e6a75d7d 100644 --- a/compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt +++ b/compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt @@ -1,4 +1,4 @@ -class Foo(vararg val a: String = Array(1) {"default"}) +class Foo(vararg val a: String = arrayOfNulls(1) as Array) // CLASS: Foo // HAS_DEFAULT_CONSTRUCTOR: true diff --git a/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt b/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt index d7efc560c2c..8218db5f749 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt @@ -15,7 +15,7 @@ fun main(args: Array) { val l: Inv> = inv(list()) val l1: Inv?> = inv(list()) - val a = array(Array(1){0}) + val a = array(arrayOfNulls(1) as Array) a[0] = 1 val a1: Inv> = inv(a) val a2: Inv?> = inv(a) diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt index 5a3b9a940cd..8c2964c1f5e 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt @@ -1,3 +1,6 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! + fun bar(x: Int): Int = x + 1 fun foo() { diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.txt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.txt index 1e3638578a7..af6f5c21c5e 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.txt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.txt @@ -1,4 +1,5 @@ package +kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array internal fun bar(/*0*/ x: kotlin.Int): kotlin.Int internal fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt index 0589735a2ef..ea9e257e1f5 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt @@ -1,3 +1,6 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! + fun bar(x: Int): Int = x + 1 fun foo() { diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.txt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.txt index 1e3638578a7..af6f5c21c5e 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.txt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.txt @@ -1,4 +1,5 @@ package +kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array internal fun bar(/*0*/ x: kotlin.Int): kotlin.Int internal fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt index d1e7a54987c..ccbbf427807 100644 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt +++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt @@ -1,7 +1,10 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER package kotlin1 - import java.util.* +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! + + fun main(args : Array) { val al : ArrayList = ArrayList() diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt index 338de9e7424..e2becbb71d2 100644 --- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt +++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.txt @@ -1,5 +1,6 @@ package package kotlin1 { + kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array internal fun main(/*0*/ args: kotlin.Array): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/labels/kt1703.kt b/compiler/testData/diagnostics/tests/labels/kt1703.kt index d5c18ff9f47..f83a595356d 100644 --- a/compiler/testData/diagnostics/tests/labels/kt1703.kt +++ b/compiler/testData/diagnostics/tests/labels/kt1703.kt @@ -1,3 +1,6 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! + //KT-1703 Reference to label is unresolved fun test() { diff --git a/compiler/testData/diagnostics/tests/labels/kt1703.txt b/compiler/testData/diagnostics/tests/labels/kt1703.txt index 760db653232..63591b466ba 100644 --- a/compiler/testData/diagnostics/tests/labels/kt1703.txt +++ b/compiler/testData/diagnostics/tests/labels/kt1703.txt @@ -1,5 +1,6 @@ package +kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array internal fun test(): kotlin.Unit internal fun use(/*0*/ a: kotlin.Any?): kotlin.Any? internal fun kotlin.Array.forEach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.kt b/compiler/testData/diagnostics/tests/regressions/kt312.kt index 7b1e2a837e9..c87bf39327a 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt312.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt312.kt @@ -1,3 +1,6 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! + // KT-312 Nullability problem when a nullable version of a generic type is returned fun Array.safeGet(index : Int) : T? { diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.txt b/compiler/testData/diagnostics/tests/regressions/kt312.txt index ccd4ad87de6..90d0e9f0967 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt312.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt312.txt @@ -3,4 +3,5 @@ package internal val args: kotlin.Array internal val name: kotlin.String internal val name1: kotlin.String? +kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array internal fun kotlin.Array.safeGet(/*0*/ index: kotlin.Int): T? diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt index af52d6bfa25..97ae30fc2b6 100644 --- a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt +++ b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt @@ -1,3 +1,6 @@ +// !DIAGNOSTICS: -UNUSED_PARAMETER +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! + class A { fun component1() = 42 fun component2() = 42 diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.txt b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.txt index 5e3f432fa10..87f33c5cbaf 100644 --- a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.txt +++ b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.txt @@ -1,5 +1,6 @@ package +kotlin.inline() public fun Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array internal fun foo(/*0*/ a: A, /*1*/ c: kotlin.Int): kotlin.Unit internal final class A { diff --git a/compiler/testData/diagnostics/tests/inference/arrayConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/arrayConstructor.kt rename to compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt diff --git a/compiler/testData/diagnostics/tests/inference/arrayConstructor.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.txt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/arrayConstructor.txt rename to compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.txt diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt rename to compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.txt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/regressions/kt1558.txt rename to compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.txt diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index 1c353a85339..27457ead0d5 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -4906,12 +4906,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("arrayConstructor.kt") - public void testArrayConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/arrayConstructor.kt"); - doTest(fileName); - } - @TestMetadata("cannotCompleteResolveAmbiguity.kt") public void testCannotCompleteResolveAmbiguity() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt"); @@ -5256,12 +5250,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest(fileName); } - @TestMetadata("kt1558.kt") - public void testKt1558() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt"); - doTest(fileName); - } - @TestMetadata("kt1718.kt") public void testKt1718() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt"); diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java index 4d7a2a0642e..27acf3eecf5 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java @@ -30,7 +30,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithStdLib") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class, JetDiagnosticsTestWithStdLibGenerated.Reified.class, JetDiagnosticsTestWithStdLibGenerated.Resolve.class}) +@InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.Inference.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class, JetDiagnosticsTestWithStdLibGenerated.Reified.class, JetDiagnosticsTestWithStdLibGenerated.Resolve.class}) @RunWith(JUnit3RunnerWithInners.class) public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInTestsWithStdLib() throws Exception { @@ -606,6 +606,27 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic } } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/inference") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Inference extends AbstractJetDiagnosticsTestWithStdLib { + public void testAllFilesPresentInInference() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/inference"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("arrayConstructor.kt") + public void testArrayConstructor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt"); + doTest(fileName); + } + + @TestMetadata("kt1558.kt") + public void testKt1558() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java index 427a9b0e0f7..c02e6455269 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java @@ -27,30 +27,6 @@ public class ArrayGenTest extends CodegenTestCase { createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); } - public void testCreateMultiInt() throws Exception { - loadText("fun foo() = Array> (5, { Array(it, {239}) })"); - Method foo = generateFunction(); - Integer[][] invoke = (Integer[][]) foo.invoke(null); - assertEquals(invoke[2].length, 2); - assertEquals(invoke[4].length, 4); - assertEquals(invoke[4][2].intValue(), 239); - } - - public void testCreateMultiIntNullable() throws Exception { - loadText("fun foo() = Array> (5, { arrayOfNulls(it) })"); - Method foo = generateFunction(); - Integer[][] invoke = (Integer[][]) foo.invoke(null); - assertEquals(invoke[2].length, 2); - assertEquals(invoke[4].length, 4); - } - - public void testCreateMultiString() throws Exception { - loadText("fun foo() = Array> (5, { Array(0,{\"\"}) })"); - Method foo = generateFunction(); - Object invoke = foo.invoke(null); - assertTrue(invoke instanceof Object[]); - } - public void testIntGenerics() throws Exception { loadText("class L(var a : T) {} fun foo() = L(5).a"); Method foo = generateFunction(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java index 95fabc853c8..f5880bf6f4c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java @@ -363,17 +363,6 @@ public class PackageGenTest extends CodegenTestCase { assertEquals(10L, data[0]); } - public void testArrayNew() throws Exception { - loadText("fun foo() = Array(4, { it })"); - Method main = generateFunction(); - Integer[] result = (Integer[]) main.invoke(null); - assertEquals(4, result.length); - assertEquals(0, result[0].intValue()); - assertEquals(1, result[1].intValue()); - assertEquals(2, result[2].intValue()); - assertEquals(3, result[3].intValue()); - } - public void testArrayNewNullable() throws Exception { loadText("fun foo() = arrayOfNulls(4)"); Method main = generateFunction(); @@ -387,14 +376,6 @@ public class PackageGenTest extends CodegenTestCase { assertEquals(4, result.length); } - public void testFloatArrayArrayNew() throws Exception { - loadText("fun foo() = Array(4, { FloatArray(5-it) })"); - Method main = generateFunction(); - float[][] result = (float[][]) main.invoke(null); - assertEquals(4, result.length); - assertEquals(2, result[3].length); - } - public void testArraySize() throws Exception { loadText("fun foo(a: Array) = a.size()"); Method main = generateFunction(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java index 7169cfdd29b..444a61bdbfe 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -45,18 +45,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("arrayGetAssignMultiIndex.kt") - public void testArrayGetAssignMultiIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt"); - doTest(fileName); - } - - @TestMetadata("arrayGetMultiIndex.kt") - public void testArrayGetMultiIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt"); - doTest(fileName); - } - @TestMetadata("arrayPlusAssign.kt") public void testArrayPlusAssign() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayPlusAssign.kt"); @@ -129,12 +117,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("iterator.kt") - public void testIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iterator.kt"); - doTest(fileName); - } - @TestMetadata("iteratorBooleanArray.kt") public void testIteratorBooleanArray() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt"); @@ -254,12 +236,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/longAsIndex.kt"); doTest(fileName); } - - @TestMetadata("nonNullArray.kt") - public void testNonNullArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/nonNullArray.kt"); - doTest(fileName); - } } @TestMetadata("compiler/testData/codegen/box/binaryOp") @@ -1340,12 +1316,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt471.kt") - public void testKt471() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt471.kt"); - doTest(fileName); - } - @TestMetadata("kt48.kt") public void testKt48() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt48.kt"); @@ -1382,12 +1352,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt633.kt") - public void testKt633() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt633.kt"); - doTest(fileName); - } - @TestMetadata("kt707.kt") public void testKt707() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt707.kt"); @@ -3236,12 +3200,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt4118.kt") - public void testKt4118() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt4118.kt"); - doTest(fileName); - } - @TestMetadata("kt475.kt") public void testKt475() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt475.kt"); @@ -3612,12 +3570,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt1291.kt") - public void testKt1291() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1291.kt"); - doTest(fileName); - } - @TestMetadata("kt1413.kt") public void testKt1413() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1413.kt"); @@ -4376,7 +4328,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({MultiDecl.ForArray.class, MultiDecl.ForIterator.class, MultiDecl.ForRange.class}) + @InnerTestClasses({MultiDecl.ForIterator.class, MultiDecl.ForRange.class}) @RunWith(JUnit3RunnerWithInners.class) public static class MultiDecl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDecl() throws Exception { @@ -4449,112 +4401,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray") - @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ForArray.Int.class, ForArray.Long.class}) - @RunWith(JUnit3RunnerWithInners.class) - public static class ForArray extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInForArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("MultiDeclFor.kt") - public void testMultiDeclFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclFor.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentExtensions.kt") - public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentExtensions.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentMemberExtensions.kt") - public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensions.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") - public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForValCaptured.kt") - public void testMultiDeclForValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForValCaptured.kt"); - doTest(fileName); - } - - @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/int") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Int extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray/int"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("MultiDeclForComponentExtensions.kt") - public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensions.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") - public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensionsValCaptured.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentMemberExtensions.kt") - public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensions.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") - public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); - doTest(fileName); - } - } - - @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/long") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Long extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray/long"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("MultiDeclForComponentExtensions.kt") - public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensions.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") - public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensionsValCaptured.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentMemberExtensions.kt") - public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensions.kt"); - doTest(fileName); - } - - @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") - public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); - doTest(fileName); - } - } - } - @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ForIterator.LongIterator.class}) @@ -5755,12 +5601,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt945.kt") - public void testKt945() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt945.kt"); - doTest(fileName); - } - @TestMetadata("nullAsNullableIntIsNull.kt") public void testNullAsNullableIntIsNull() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt"); @@ -6689,12 +6529,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("stdlib.kt") - public void testStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/stdlib.kt"); - doTest(fileName); - } - @TestMetadata("traitWithPrivateExtension.kt") public void testTraitWithPrivateExtension() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateExtension.kt"); diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 258cea4a430..fa3b289cf01 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -30,7 +30,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxWithStdlib") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.Annotations.class, BlackBoxWithStdlibCodegenTestGenerated.Arrays.class, BlackBoxWithStdlibCodegenTestGenerated.BoxingOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.CallableReference.class, BlackBoxWithStdlibCodegenTestGenerated.Casts.class, BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.DefaultArguments.class, BlackBoxWithStdlibCodegenTestGenerated.Enum.class, BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.HashPMap.class, BlackBoxWithStdlibCodegenTestGenerated.Intrinsics.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.LazyCodegen.class, BlackBoxWithStdlibCodegenTestGenerated.LocalFunInLambda.class, BlackBoxWithStdlibCodegenTestGenerated.NonLocalReturns.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformNames.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformStatic.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformTypes.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Reflection.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, BlackBoxWithStdlibCodegenTestGenerated.Reified.class, BlackBoxWithStdlibCodegenTestGenerated.StoreStackBeforeInline.class, BlackBoxWithStdlibCodegenTestGenerated.Strings.class, BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, BlackBoxWithStdlibCodegenTestGenerated.When.class, BlackBoxWithStdlibCodegenTestGenerated.WhenEnumOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.WhenStringOptimization.class}) +@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.Annotations.class, BlackBoxWithStdlibCodegenTestGenerated.Arrays.class, BlackBoxWithStdlibCodegenTestGenerated.BoxingOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.CallableReference.class, BlackBoxWithStdlibCodegenTestGenerated.Casts.class, BlackBoxWithStdlibCodegenTestGenerated.Classes.class, BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.DefaultArguments.class, BlackBoxWithStdlibCodegenTestGenerated.Enum.class, BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.HashPMap.class, BlackBoxWithStdlibCodegenTestGenerated.Intrinsics.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.LazyCodegen.class, BlackBoxWithStdlibCodegenTestGenerated.LocalFunInLambda.class, BlackBoxWithStdlibCodegenTestGenerated.MultiDeclForArray.class, BlackBoxWithStdlibCodegenTestGenerated.NonLocalReturns.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformNames.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformStatic.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformTypes.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Reflection.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, BlackBoxWithStdlibCodegenTestGenerated.Reified.class, BlackBoxWithStdlibCodegenTestGenerated.StoreStackBeforeInline.class, BlackBoxWithStdlibCodegenTestGenerated.Strings.class, BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, BlackBoxWithStdlibCodegenTestGenerated.When.class, BlackBoxWithStdlibCodegenTestGenerated.WhenEnumOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.WhenStringOptimization.class}) @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithStdlib() throws Exception { @@ -108,6 +108,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("arrayGetAssignMultiIndex.kt") + public void testArrayGetAssignMultiIndex() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("arrayGetMultiIndex.kt") + public void testArrayGetMultiIndex() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("cloneArray.kt") public void testCloneArray() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt"); @@ -132,17 +144,53 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode doTestWithStdlib(fileName); } + @TestMetadata("iterator.kt") + public void testIterator() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("kt1291.kt") + public void testKt1291() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt3771.kt") public void testKt3771() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt"); doTestWithStdlib(fileName); } + @TestMetadata("kt4118.kt") + public void testKt4118() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt"); + doTestWithStdlib(fileName); + } + @TestMetadata("kt4357.kt") public void testKt4357() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt"); doTestWithStdlib(fileName); } + + @TestMetadata("kt945.kt") + public void testKt945() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("nonNullArray.kt") + public void testNonNullArray() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("stdlib.kt") + public void testStdlib() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt"); + doTestWithStdlib(fileName); + } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization") @@ -753,6 +801,27 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } } + @TestMetadata("compiler/testData/codegen/boxWithStdlib/classes") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Classes extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInClasses() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/classes"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("kt471.kt") + public void testKt471() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt471.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("kt633.kt") + public void testKt633() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt633.kt"); + doTestWithStdlib(fileName); + } + } + @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DataClasses.Copy.class, DataClasses.Equals.class, DataClasses.Hashcode.class, DataClasses.Tostring.class}) @@ -1624,6 +1693,112 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } } + @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({MultiDeclForArray.Int.class, MultiDeclForArray.Long.class}) + @RunWith(JUnit3RunnerWithInners.class) + public static class MultiDeclForArray extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInMultiDeclForArray() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("MultiDeclFor.kt") + public void testMultiDeclFor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentExtensions.kt") + public void testMultiDeclForComponentExtensions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentMemberExtensions.kt") + public void testMultiDeclForComponentMemberExtensions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") + public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForValCaptured.kt") + public void testMultiDeclForValCaptured() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Int extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInInt() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("MultiDeclForComponentExtensions.kt") + public void testMultiDeclForComponentExtensions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") + public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentMemberExtensions.kt") + public void testMultiDeclForComponentMemberExtensions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") + public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + doTestWithStdlib(fileName); + } + } + + @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Long extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInLong() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("MultiDeclForComponentExtensions.kt") + public void testMultiDeclForComponentExtensions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") + public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentMemberExtensions.kt") + public void testMultiDeclForComponentMemberExtensions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt"); + doTestWithStdlib(fileName); + } + + @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") + public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + doTestWithStdlib(fileName); + } + } + } + @TestMetadata("compiler/testData/codegen/boxWithStdlib/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/testData/checker/Shadowing.kt b/idea/testData/checker/Shadowing.kt index a07020700c4..478b1f9d8ea 100644 --- a/idea/testData/checker/Shadowing.kt +++ b/idea/testData/checker/Shadowing.kt @@ -3,9 +3,11 @@ class A { fun component2() = 42 } +fun arrayA(): Array = null!! + fun foo(a: A, c: Int) { val (a, b) = a - val arr = Array(2) { A() } + val arr = arrayA() for ((c, d) in arr) { } } diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt index 95b23707c7f..16e3e9083e5 100644 --- a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt +++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt @@ -1,5 +1,5 @@ fun test(n: Int): Array { - var x: Array = Array(1, {""}) + var x: Array = arrayOfNulls(1) as Array x[0] = if (n > 5) "A" else "B" diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after index 5357d193e43..61aa42f7ad1 100644 --- a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after +++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt.after @@ -1,5 +1,5 @@ fun test(n: Int): Array { - var x: Array = Array(1, {""}) + var x: Array = arrayOfNulls(1) as Array if (n > 5) x[0] = "A" else x[0] = "B" diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt index 61387c22de6..3f35f20e616 100644 --- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt +++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt @@ -1,5 +1,5 @@ fun test(n: Int): Array { - var x: Array = Array(1, {""}) + var x: Array = arrayOfNulls(1) as Array x[0] = when(n) { in 0..10 -> "small" diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after index 627976ee478..f8f055d186e 100644 --- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after +++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt.after @@ -1,5 +1,5 @@ fun test(n: Int): Array { - var x: Array = Array(1, {""}) + var x: Array = arrayOfNulls(1) as Array when(n) { in 0..10 -> x[0] = "small" diff --git a/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt index b4141791cb6..cc68c95a0de 100644 --- a/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt +++ b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt @@ -1,3 +1,4 @@ +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! fun foo(i: Int) { Array(1, { 42 })[(i + i)] } diff --git a/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after index 1a6428284ce..f19a44acf09 100644 --- a/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after +++ b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt.after @@ -1,3 +1,4 @@ +public inline fun Array(n: Int, block: (Int) -> T): Array = null!! fun foo(i: Int) { Array(1, { 42 })[i + i] }