From 8dff5238583f57ea4b8c84d8481b61b8b7c96246 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 17 Jan 2013 17:38:46 +0400
Subject: [PATCH] Add some regression tests for obsolete issues

Regenerate tests
---
 .../diagnostics/tests/inner/outerProtectedMember.kt | 13 +++++++++++++
 compiler/testData/diagnostics/tests/inner/traits.kt | 11 +++++++++++
 .../jet/checkers/JetDiagnosticsTestGenerated.java   | 10 ++++++++++
 .../jet/checkers/JetPsiCheckerTestGenerated.java    |  4 ++--
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt
 create mode 100644 compiler/testData/diagnostics/tests/inner/traits.kt

diff --git a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt
new file mode 100644
index 00000000000..f296afce973
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt
@@ -0,0 +1,13 @@
+// KT-2100
+
+trait I {
+    val x : String
+}
+
+class Foo {
+    protected val x : String = ""
+
+    inner class Inner : I {
+        override val x : String = this@Foo.x
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/traits.kt b/compiler/testData/diagnostics/tests/inner/traits.kt
new file mode 100644
index 00000000000..22ae17ed3c0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inner/traits.kt
@@ -0,0 +1,11 @@
+// KT-1188
+
+trait Foo {
+    val b : Bar
+    val b1 : Foo.Bar
+    trait Bar {}
+}
+
+trait Foo2 : Foo {
+    val bb1 : Foo.Bar
+}
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index d5c81e6650f..87425ffcd03 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2475,6 +2475,16 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/inner/outerGenericParam.kt");
             }
             
+            @TestMetadata("outerProtectedMember.kt")
+            public void testOuterProtectedMember() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt");
+            }
+            
+            @TestMetadata("traits.kt")
+            public void testTraits() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/inner/traits.kt");
+            }
+            
             @TestMetadata("visibility.kt")
             public void testVisibility() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/inner/visibility.kt");
diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
index b99ed04b0b4..504d0a242be 100644
--- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
@@ -413,12 +413,12 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         public void testPropertiesWithBackingFields() throws Exception {
             doTestWithInfos("idea/testData/checker/infos/PropertiesWithBackingFields.kt");
         }
-
+        
         @TestMetadata("VariableAsFunction.kt")
         public void testVariableAsFunction() throws Exception {
             doTestWithInfos("idea/testData/checker/infos/VariableAsFunction.kt");
         }
-
+        
         @TestMetadata("WrapIntoRef.kt")
         public void testWrapIntoRef() throws Exception {
             doTestWithInfos("idea/testData/checker/infos/WrapIntoRef.kt");