From ad99b079b9a004715bf872a1ab637b6b17e45428 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Wed, 17 Jun 2015 14:41:27 +0300
Subject: [PATCH] Update intention tests: don't use java.util.Collections.*

Because their behaviour depends on annotations that we are going to drop
---
 .../quickfix/typeAddition/publicValWithoutReturnType.kt      | 4 +++-
 .../typeAddition/publicValWithoutReturnType.kt.after         | 4 +++-
 .../typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt  | 4 +++-
 .../publicValWithoutReturnTypeCaretOnPublic.kt.after         | 4 +++-
 idea/testData/quickfix/typeImports/hasThisImport.kt          | 5 ++---
 idea/testData/quickfix/typeImports/hasThisImport.kt.after    | 5 ++---
 idea/testData/quickfix/typeImports/toImport1.kt              | 4 ++--
 idea/testData/quickfix/typeImports/toImport1.kt.after        | 2 +-
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
index 82fa2d52425..55b12a520be 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
@@ -1,4 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public val <caret>l = java.util.Collections.emptyList<Int>()
\ No newline at end of file
+public fun emptyList<T>(): List<T> = null!!
+
+public val <caret>l = emptyList<Int>()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
index a495563212b..9c7196dc386 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
@@ -1,4 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public val l: List<Int><caret> = java.util.Collections.emptyList<Int>()
\ No newline at end of file
+public fun emptyList<T>(): List<T> = null!!
+
+public val l: List<Int><caret> = emptyList<Int>()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
index 3f88fce44ed..cd4342cced8 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
@@ -1,4 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-<caret>public val l = java.util.Collections.emptyList<Int>()
+public fun emptyList<T>(): List<T> = null!!
+
+<caret>public val l = emptyList<Int>()
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
index 8959c88affa..32333dbbcd4 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
@@ -1,4 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public val l: List<Int><caret> = java.util.Collections.emptyList<Int>()
+public fun emptyList<T>(): List<T> = null!!
+
+public val l: List<Int><caret> = emptyList<Int>()
diff --git a/idea/testData/quickfix/typeImports/hasThisImport.kt b/idea/testData/quickfix/typeImports/hasThisImport.kt
index b395e997cfc..891f584aa1f 100644
--- a/idea/testData/quickfix/typeImports/hasThisImport.kt
+++ b/idea/testData/quickfix/typeImports/hasThisImport.kt
@@ -1,11 +1,10 @@
 // "Remove initializer from property" "true"
 package a
 
-import java.util.Collections
-import java.util.List
+public fun emptyList<T>(): List<T> = null!!
 
 class M {
     interface A {
-        val l = <caret>Collections.emptyList<Int>()
+        val l = <caret>emptyList<Int>()
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/hasThisImport.kt.after b/idea/testData/quickfix/typeImports/hasThisImport.kt.after
index 0f0ab1954df..86f8eec7051 100644
--- a/idea/testData/quickfix/typeImports/hasThisImport.kt.after
+++ b/idea/testData/quickfix/typeImports/hasThisImport.kt.after
@@ -1,11 +1,10 @@
 // "Remove initializer from property" "true"
 package a
 
-import java.util.Collections
-import java.util.List
+public fun emptyList<T>(): List<T> = null!!
 
 class M {
     interface A {
-        val l: kotlin.List<Int><caret>
+        val l: List<Int><caret>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/toImport1.kt b/idea/testData/quickfix/typeImports/toImport1.kt
index eef2956b4e8..64a4fb36ba3 100644
--- a/idea/testData/quickfix/typeImports/toImport1.kt
+++ b/idea/testData/quickfix/typeImports/toImport1.kt
@@ -1,10 +1,10 @@
 // "Remove initializer from property" "true"
 package a
 
-import java.util.Collections
+public fun emptyList<T>(): List<T> = null!!
 
 class M {
     interface A {
-        abstract val l = <caret>Collections.emptyList<Int>()
+        abstract val l = <caret>emptyList<Int>()
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/toImport1.kt.after b/idea/testData/quickfix/typeImports/toImport1.kt.after
index adc3e9018d8..b51ac42f817 100644
--- a/idea/testData/quickfix/typeImports/toImport1.kt.after
+++ b/idea/testData/quickfix/typeImports/toImport1.kt.after
@@ -1,7 +1,7 @@
 // "Remove initializer from property" "true"
 package a
 
-import java.util.Collections
+public fun emptyList<T>(): List<T> = null!!
 
 class M {
     interface A {