From cb08d976d35a99268e6a96fca7fec2bebf598186 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <Dmitry.Petrov@jetbrains.com>
Date: Tue, 7 Jun 2016 12:14:40 +0300
Subject: [PATCH] Tests for importing type aliases

---
 .../diagnostics/tests/typealias/import.kt     | 24 +++++++++++++++++++
 .../diagnostics/tests/typealias/import.txt    | 23 ++++++++++++++++++
 .../checkers/DiagnosticsTestGenerated.java    |  6 +++++
 3 files changed, 53 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/typealias/import.kt
 create mode 100644 compiler/testData/diagnostics/tests/typealias/import.txt

diff --git a/compiler/testData/diagnostics/tests/typealias/import.kt b/compiler/testData/diagnostics/tests/typealias/import.kt
new file mode 100644
index 00000000000..53769ee9cea
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/import.kt
@@ -0,0 +1,24 @@
+// FILE: file1.kt
+package package1
+
+typealias S = String
+
+// FILE: file2.kt
+package package2
+
+typealias I = Int
+
+class Outer {
+    typealias A = Any
+}
+
+// FILE: test.kt
+package package3
+
+import package1.*
+import package2.I
+import package2.Outer.A
+
+val testS: S = ""
+val testI: I = 42
+val testA: A = Any()
diff --git a/compiler/testData/diagnostics/tests/typealias/import.txt b/compiler/testData/diagnostics/tests/typealias/import.txt
new file mode 100644
index 00000000000..1a889dbfad4
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/import.txt
@@ -0,0 +1,23 @@
+package
+
+package package1 {
+    public typealias S = kotlin.String
+}
+
+package package2 {
+    public typealias I = kotlin.Int
+
+    public final class Outer {
+        public typealias A = kotlin.Any
+        public constructor Outer()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+package package3 {
+    public val testA: package2.Outer.A [= kotlin.Any]
+    public val testI: package2.I [= kotlin.Int] = 42
+    public val testS: package1.S [= kotlin.String] = ""
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 918e6be9825..e42abc55631 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -19398,6 +19398,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("import.kt")
+            public void testImport() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typealias/import.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("inSupertypesList.kt")
             public void testInSupertypesList() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typealias/inSupertypesList.kt");