From 38d374d4b916d57fbbeaf366d813a426a3d91772 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 19 Jan 2016 16:05:34 +0300
Subject: [PATCH] Added test for nested class

---
 .../imports/ImportNestedWithDifferentName.kt  | 10 ++++++++++
 .../imports/ImportNestedWithDifferentName.txt | 19 +++++++++++++++++++
 .../checkers/DiagnosticsTestGenerated.java    |  6 ++++++
 3 files changed, 35 insertions(+)
 create mode 100644 compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.kt
 create mode 100644 compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.txt

diff --git a/compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.kt b/compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.kt
new file mode 100644
index 00000000000..f5d156292aa
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.kt
@@ -0,0 +1,10 @@
+package a
+
+import a.A.Nested as X
+
+interface A {
+    class Nested
+
+    val a: Nested
+    val b: X
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.txt b/compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.txt
new file mode 100644
index 00000000000..b0fae7b8f20
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.txt
@@ -0,0 +1,19 @@
+package
+
+package a {
+
+    public interface A {
+        public abstract val a: a.A.Nested
+        public abstract val b: a.A.Nested
+        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
+
+        public final class Nested {
+            public constructor Nested()
+            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
+        }
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 2bb974f401a..b9c27728631 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -7599,6 +7599,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("ImportNestedWithDifferentName.kt")
+            public void testImportNestedWithDifferentName() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportNestedWithDifferentName.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ImportObjectAndUseAsSupertype.kt")
             public void testImportObjectAndUseAsSupertype() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt");