From da8fdbd23eead80826556758dd6cf14f5a247da9 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 10 Dec 2014 21:21:20 +0300 Subject: [PATCH] More tests for varargs updated --- compiler/testData/builtin-classes.txt | 8 ++++---- .../annotations/packageMembers/EnumArrayArgument.txt | 12 ++++++------ .../packageMembers/StringArrayArgument.txt | 12 ++++++------ .../kotlinSignature/MethodWithVararg.txt | 2 +- .../error/VarargReplacedWithNotVararg.txt | 2 +- .../propagation/parameter/InheritVararg.txt | 4 ++-- .../propagation/parameter/InheritVarargInteger.txt | 4 ++-- .../propagation/parameter/InheritVarargNotNull.txt | 4 ++-- .../genericWithTypeVariables/FunParamVaragParam.txt | 2 +- .../fun/nonGeneric/FunVarargInteger.txt | 2 +- .../compiledKotlin/fun/vararg/VarargString.txt | 2 +- .../compiledKotlin/fun/vararg/nonLastVararg.txt | 2 +- .../signaturePropagation/InheritExtensionAndNot.txt | 2 +- .../annotation/AnnotationDescriptorResolveTest.java | 2 +- .../insertMultipleSomeWithClashingName.kt.after | 2 +- .../insertTypeWithClashingName.kt.after | 2 +- .../typeMismatch/beforeTooManyArgumentsException.kt | 2 +- .../webDemoCanvasExamples/cases/Creatures.kt | 4 ++-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 2a1dcefd3cc..d463960cec8 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -1470,8 +1470,8 @@ public final annotation class inline : kotlin.Annotation { public final annotation class inlineOptions : kotlin.Annotation { /*primary*/ public constructor inlineOptions(/*0*/ vararg value: kotlin.InlineOption /*kotlin.Array*/) - internal final val value: kotlin.Array - internal final fun (): kotlin.Array + internal final val value: kotlin.Array + internal final fun (): kotlin.Array } public final annotation class noinline : kotlin.Annotation { @@ -1480,8 +1480,8 @@ public final annotation class noinline : kotlin.Annotation { public final annotation class suppress : kotlin.Annotation { /*primary*/ public constructor suppress(/*0*/ vararg names: kotlin.String /*kotlin.Array*/) - internal final val names: kotlin.Array - internal final fun (): kotlin.Array + internal final val names: kotlin.Array + internal final fun (): kotlin.Array } public final annotation class tailRecursive : kotlin.Annotation { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt index f1e6eefb146..3f2a11ef5eb 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt @@ -1,12 +1,12 @@ package test -test.Anno(t = {ElementType.PACKAGE}: kotlin.Array) internal val bar: kotlin.Int = 42 +test.Anno(t = {ElementType.PACKAGE}: kotlin.Array) internal val bar: kotlin.Int = 42 internal fun (): kotlin.Int -test.Anno(t = {}: kotlin.Array) internal fun baz(): kotlin.Unit -test.Anno(t = {ElementType.METHOD, ElementType.FIELD}: kotlin.Array) internal fun foo(): kotlin.Unit +test.Anno(t = {}: kotlin.Array) internal fun baz(): kotlin.Unit +test.Anno(t = {ElementType.METHOD, ElementType.FIELD}: kotlin.Array) internal fun foo(): kotlin.Unit internal final annotation class Anno : kotlin.Annotation { - /*primary*/ public constructor Anno(/*0*/ vararg t: java.lang.annotation.ElementType /*kotlin.Array*/) - internal final val t: kotlin.Array - internal final fun (): kotlin.Array + /*primary*/ public constructor Anno(/*0*/ vararg t: java.lang.annotation.ElementType /*kotlin.Array*/) + internal final val t: kotlin.Array + internal final fun (): kotlin.Array } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt index aa570235bf5..393ad8f6997 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt @@ -1,12 +1,12 @@ package test -test.Anno(t = {"prosper"}: kotlin.Array) internal val bar: kotlin.Int = 42 +test.Anno(t = {"prosper"}: kotlin.Array) internal val bar: kotlin.Int = 42 internal fun (): kotlin.Int -test.Anno(t = {}: kotlin.Array) internal fun baz(): kotlin.Unit -test.Anno(t = {"live", "long"}: kotlin.Array) internal fun foo(): kotlin.Unit +test.Anno(t = {}: kotlin.Array) internal fun baz(): kotlin.Unit +test.Anno(t = {"live", "long"}: kotlin.Array) internal fun foo(): kotlin.Unit internal final annotation class Anno : kotlin.Annotation { - /*primary*/ public constructor Anno(/*0*/ vararg t: kotlin.String /*kotlin.Array*/) - internal final val t: kotlin.Array - internal final fun (): kotlin.Array + /*primary*/ public constructor Anno(/*0*/ vararg t: kotlin.String /*kotlin.Array*/) + internal final val t: kotlin.Array + internal final fun (): kotlin.Array } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt index 09642e53898..c62282fdfaf 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt @@ -2,5 +2,5 @@ package test public open class MethodWithVararg { /*primary*/ public constructor MethodWithVararg() - public open fun foo(/*0*/ vararg s: kotlin.String /*kotlin.Array*/): kotlin.Unit + public open fun foo(/*0*/ vararg s: kotlin.String /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt index 2daa2f2e0a5..0e8eae32846 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt @@ -2,5 +2,5 @@ package test public open class VarargReplacedWithNotVararg { /*primary*/ public constructor VarargReplacedWithNotVararg() - public open fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit + public open fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt index cd042b28f87..b229baa0968 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt @@ -4,11 +4,11 @@ public trait InheritVararg { public trait Sub : test.InheritVararg.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } public trait Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt index edfdd9be785..e0c7c1d7209 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt @@ -4,11 +4,11 @@ public trait InheritVarargInteger { public trait Sub : test.InheritVarargInteger.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array*/): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array*/): kotlin.Unit } public trait Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array*/): kotlin.Unit + public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt index 3aaae6178ac..93c4f71826c 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt @@ -4,11 +4,11 @@ public trait InheritVarargNotNull { public trait Sub : test.InheritVarargNotNull.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit + public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit } public trait Super { public abstract fun dummy(): kotlin.Unit - public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit + public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt index bb47d16b9aa..ce2e91558ee 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt @@ -1,3 +1,3 @@ package test -internal fun funParamVarargParam(/*0*/ a: kotlin.Int, /*1*/ vararg b: P /*kotlin.Array

*/): kotlin.Int +internal fun funParamVarargParam(/*0*/ a: kotlin.Int, /*1*/ vararg b: P /*kotlin.Array*/): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt index ec5e328e07d..9c4cdd1c078 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.txt @@ -1,3 +1,3 @@ package test -internal fun varargCharSequence(/*0*/ a: kotlin.Int, /*1*/ vararg b: java.lang.Integer /*kotlin.Array*/): kotlin.Int +internal fun varargCharSequence(/*0*/ a: kotlin.Int, /*1*/ vararg b: java.lang.Integer /*kotlin.Array*/): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.txt b/compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.txt index 9aed729f5bb..75e7b7b32c2 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.txt @@ -2,5 +2,5 @@ package test public open class VarargString { /*primary*/ public constructor VarargString() - public open fun vararg(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit + public open fun vararg(/*0*/ vararg p0: kotlin.String? /*kotlin.Array*/): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt b/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt index 9e2f0fc05fb..37092ff97d9 100644 --- a/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt +++ b/compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.txt @@ -1,4 +1,4 @@ package test -internal fun f(/*0*/ vararg t: kotlin.String /*kotlin.Array*/, /*1*/ f: () -> kotlin.Unit): kotlin.Unit +internal fun f(/*0*/ vararg t: kotlin.String /*kotlin.Array*/, /*1*/ f: () -> kotlin.Unit): kotlin.Unit internal fun f(/*0*/ vararg t: kotlin.Int /*kotlin.IntArray*/, /*1*/ f: () -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt index 2864f67824c..36d03fcb7d9 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt @@ -13,6 +13,6 @@ public trait Super1 { } public trait Super2 { - public abstract fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit + public abstract fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array*/): kotlin.Unit public abstract fun foo(/*0*/ p: kotlin.String): kotlin.Unit } diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java index fb32bab8081..047de71edc8 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java @@ -63,7 +63,7 @@ public class AnnotationDescriptorResolveTest extends AbstractAnnotationDescripto public void testStringArrayVarargAnnotation() throws IOException { String content = getContent("AnnStringVararg(\"a\", \"b\")"); - String expectedAnnotation = "AnnStringVararg(a = {\"a\", \"b\"}: Array)"; + String expectedAnnotation = "AnnStringVararg(a = {\"a\", \"b\"}: Array)"; doTest(content, expectedAnnotation); } diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after index c7ba4e8d1af..4558f192696 100644 --- a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after +++ b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after @@ -2,7 +2,7 @@ class Array fun test() { - bar, Int, kotlin.Array>(foo(""), 0, foo("")) + bar, Int, kotlin.Array>(foo(""), 0, foo("")) } fun foo(vararg x: String) = x diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after index 76925c8001a..f155cebca12 100644 --- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after +++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after @@ -2,7 +2,7 @@ class Array fun test() { - bar>(foo("")) + bar>(foo("")) } fun foo(vararg x: String) = x diff --git a/idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt b/idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt index 77bc10f704f..16b7dfc01b8 100644 --- a/idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt +++ b/idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt @@ -1,5 +1,5 @@ // "???" "false" -//ERROR: Type mismatch.
Required:kotlin.Array<kotlin.String>
Found:kotlin.Array<kotlin.Int>
+//ERROR: Type mismatch.
Required:kotlin.Array<out kotlin.String>
Found:kotlin.Array<out kotlin.Int>
//this test checks that there is no ArrayIndexOutOfBoundsException when there are more arguments than parameters fun array1(vararg a : T) = a diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt index 5fccda39be7..75c6ae1dda9 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt @@ -288,7 +288,7 @@ class CanvasState(val canvas: HTMLCanvasElement) { } class RadialGradientGenerator(val context: CanvasContext) { - val gradients = ArrayList>>() + val gradients = ArrayList>>() var current = 0 fun newColorStops(vararg colorStops: Pair) { @@ -304,7 +304,7 @@ class RadialGradientGenerator(val context: CanvasContext) { newColorStops(Pair(0.0, "rgb(250,147,250)"), Pair(0.5, "rgb(255,80,255)"), Pair(1.0, "rgb(250,0,217)")) } - fun getNext(): Array> { + fun getNext(): Array> { val result = gradients.get(current) current = (current + 1) % gradients.size() return result