From b741c82a660ecd6fe18b8a7576e13b8cd428f9b9 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 31 Aug 2016 18:50:06 +0300
Subject: [PATCH] Fix completion tests after moving collection types in JS

---
 idea/idea-completion/testData/basic/common/InImport.kt      | 6 +++---
 .../testData/basic/common/StandardJetArrayFirst.kt          | 5 ++++-
 .../testData/basic/common/extensions/JavaTypeExtension.kt   | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/idea/idea-completion/testData/basic/common/InImport.kt b/idea/idea-completion/testData/basic/common/InImport.kt
index c3d655f475c..9ba1e9cf6eb 100644
--- a/idea/idea-completion/testData/basic/common/InImport.kt
+++ b/idea/idea-completion/testData/basic/common/InImport.kt
@@ -1,10 +1,10 @@
 package Test
 
-import java.util.<caret>
+import kotlin.<caret>
 
 class Test {
 
 }
 
-// EXIST: AbstractList, Date
-// EXIST_JAVA_ONLY: Random, concurrent
\ No newline at end of file
+// EXIST: Unit, Nothing, collections
+// EXIST_JAVA_ONLY: assert, concurrent
\ No newline at end of file
diff --git a/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt b/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
index 0d0a8651b8c..554ec6a1b6c 100644
--- a/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
+++ b/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
@@ -6,7 +6,10 @@ fun main(args: Array<String>) {
 // WITH_ORDER
 // EXIST: { lookupString:"Array", tailText:"<T> (kotlin)" }
 // EXIST_JAVA_ONLY: { lookupString:"Array", tailText:" (java.sql)" }
-// EXIST: { lookupString:"ArrayList", tailText:"<E> (java.util)" }
+
+// todo: unify following two after introducing collection type aliases
+// EXIST_JS_ONLY: { lookupString:"ArrayList", tailText:"<E> (kotlin.collections)" }
+// EXIST: { lookupString:"ArrayList", tailText:"<E> (java.util)"}
 
 
 
diff --git a/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt b/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt
index 17bef4440fa..843fd56403e 100644
--- a/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt
+++ b/idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt
@@ -1,9 +1,11 @@
+import java.util.* // temporary until typealiases for collection are introduced in JVM
+
 fun <T> Iterable<T>.first() : T? {
     return this.iterator()?.next()
 }
 
 fun main(args : Array<String>) {
-    val test = java.util.HashSet<Int>()
+    val test = HashSet<Int>()
     test.<caret>
 }