From 491ca582b3a6716c14e4874c635fc5e9aee075a6 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 16 Nov 2016 23:37:57 +0300
Subject: [PATCH] Include collection type aliases into mock-runtime as they are
 used extremely often in tests

---
 build.xml                                                | 2 ++
 compiler/testData/diagnostics/tests/PackageQualified.kt  | 2 +-
 compiler/testData/diagnostics/tests/PackageQualified.txt | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index c04099ead38..87db1fa1fcd 100644
--- a/build.xml
+++ b/build.xml
@@ -1254,6 +1254,8 @@
         <mkdir dir="${output}/mock-runtime-src"/>
         <copy file="${basedir}/core/runtime.jvm/src/kotlin/TypeAliases.kt" todir="${output}/mock-runtime-src"/>
         <copy file="${basedir}/core/runtime.jvm/src/kotlin/text/TypeAliases.kt" todir="${output}/mock-runtime-src/text"/>
+        <copy file="${basedir}/libraries/stdlib/src/kotlin/collections/TypeAliases.kt" todir="${output}/mock-runtime-src/collections"/>
+        <copy file="${basedir}/libraries/stdlib/src/kotlin/jvm/JvmVersion.kt" todir="${output}/mock-runtime-src"/>
         <copy file="${basedir}/libraries/stdlib/src/kotlin/util/Standard.kt" todir="${output}/mock-runtime-src"/>
         <copy file="${basedir}/libraries/stdlib/src/kotlin/internal/Annotations.kt" todir="${output}/mock-runtime-src"/>
 
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.kt b/compiler/testData/diagnostics/tests/PackageQualified.kt
index 4e859691e7c..85fdd903ed0 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.kt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.kt
@@ -6,7 +6,7 @@ package foobar.a
 
     val a : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<Int><!>? = null
     val a2 : <!UNRESOLVED_REFERENCE!>util<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>? = null
-    val a3 : <!UNRESOLVED_REFERENCE!>ArrayList<!><Int>? = null
+    val a3 : <!UNRESOLVED_REFERENCE!>LinkedList<!><Int>? = null
 
 // FILE: b.kt
 package foobar
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.txt b/compiler/testData/diagnostics/tests/PackageQualified.txt
index 4e8e71cb3af..1f848e1ebad 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.txt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.txt
@@ -60,7 +60,7 @@ package foobar {
     package foobar.a {
         public val a: java.util.List<kotlin.Int>? = null
         public val a2: [ERROR : util.List<Int>]<kotlin.Int>?
-        public val a3: [ERROR : ArrayList<Int>]<kotlin.Int>?
+        public val a3: [ERROR : LinkedList<Int>]<kotlin.Int>?
         public val b: kotlin.collections.List<kotlin.Int>? = null
         public val b1: [ERROR : util.List<Int>]<kotlin.Int>?
     }