From f5d40a1c98f52c703848f98b847a1393f5139b62 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dsavvinov@gmail.com>
Date: Wed, 11 Oct 2017 14:06:54 +0300
Subject: [PATCH] Fix testdata in varargs tests

Testdata have been changed since 1.2. due to KT-20171.
---
 .../diagnostics/tests/checkArguments/SpreadVarargs.kt     | 8 ++++----
 .../collectionLiterals/collectionLiteralsWithVarargs.kt   | 2 +-
 .../overloadConflicts/varargsInDifferentPositions.kt      | 2 +-
 .../tests/resolve/overloadConflicts/varargsMixed.kt       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
index 2337f8ca911..5f1d3560379 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
@@ -10,7 +10,7 @@ fun main(args : Array<String>) {
     join(1, "2", "3")
     join(<!NON_VARARG_SPREAD!>*<!>1, "2")
     join(1, *<!TYPE_MISMATCH!>"2"<!>)
-    join(x = 1, a = "2")
+    join(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>"2"<!>)
     join(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
     join(x = 1, a = *a)
     join(x = 1, a = *<!TYPE_MISMATCH!>b<!>)
@@ -25,13 +25,13 @@ fun main(args : Array<String>) {
     join(1, "4", *a, *<!TYPE_MISMATCH!>b<!>, "3")
     join(a = *a, x = 1)
     join(a = *<!TYPE_MISMATCH!>b<!>, x = 1)
-    join(a = <!TYPE_MISMATCH!>a<!>, x = 1)
+    join(a = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>a<!>, x = 1)
 
     joinG<String>(1, "2")
     joinG<String>(<!NON_VARARG_SPREAD!>*<!>1, "2")
     joinG<String>(1, *<!TYPE_MISMATCH!>"2"<!>)
     joinG<String>(x = 1, a = *a)
-    joinG<String>(x = 1, a = "2")
+    joinG<String>(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>"2"<!>)
     joinG<String>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
     joinG<String>(1, *a)
     joinG<String>(1, *a, "3")
@@ -44,7 +44,7 @@ fun main(args : Array<String>) {
     joinG(<!NON_VARARG_SPREAD!>*<!>1, "2")
     <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinG<!>(1, *<!TYPE_MISMATCH!>"2"<!>)
     joinG(x = 1, a = *a)
-    joinG(x = 1, a = "2")
+    joinG(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>"2"<!>)
     <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinG<!>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
     joinG(1, *a)
     joinG(1, *a, "3")
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
index f91f05ed3a4..06cbb746bf8 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
@@ -22,7 +22,7 @@ fun test1_2() {}
 @Ann2(*[])
 fun test2() {}
 
-@Ann3(a = *[0f, <!DIVISION_BY_ZERO!>1 / 0f<!>])
+@Ann3(a = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION!>[0f, <!DIVISION_BY_ZERO!>1 / 0f<!>]<!>)
 fun test3() {}
 
 @Ann5(Ann4(*["/"]))
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.kt
index 7463310c55d..12885accb55 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.kt
@@ -7,6 +7,6 @@ fun overloadedFun(arg: String, vararg args: String) = X1
 fun overloadedFun(arg: String, vararg args: String, flag: Boolean = true) = X2
 
 val test1a: X1 = overloadedFun("", "")
-val test1b: X1 = overloadedFun("", args = "")
+val test1b: X1 = overloadedFun("", args = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
 val test1c: X2 = overloadedFun("", "", "", flag = true)
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
index 8a034c321c6..e1475d985ce 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
@@ -8,5 +8,5 @@ fun overloadedFun5(s: String, vararg ss: String) = X2
 
 val test1 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("")
 val test2 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("", "")
-val test3: X2 = overloadedFun5(s = "", ss = "")
-val test4: X1 = overloadedFun5(ss = "")
\ No newline at end of file
+val test3: X2 = overloadedFun5(s = "", ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
+val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
\ No newline at end of file