From 9830140a15b5026783d7913d18c93dea73dc5287 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 27 Jul 2016 15:01:40 +0300
Subject: [PATCH] Make constructor parameter a property: additional test for
 private property in superclass (cherry picked from commit dd30bd5)

---
 .../makeConstructorParameterProperty/override.kt       | 10 ++++++++++
 .../kotlin/idea/quickfix/QuickFixTestGenerated.java    |  6 ++++++
 2 files changed, 16 insertions(+)
 create mode 100644 idea/testData/quickfix/makeConstructorParameterProperty/override.kt

diff --git a/idea/testData/quickfix/makeConstructorParameterProperty/override.kt b/idea/testData/quickfix/makeConstructorParameterProperty/override.kt
new file mode 100644
index 00000000000..e5949aedcc3
--- /dev/null
+++ b/idea/testData/quickfix/makeConstructorParameterProperty/override.kt
@@ -0,0 +1,10 @@
+// "Make constructor parameter a property" "false"
+// ERROR: Cannot access 'foo': it is invisible (private in a supertype) in 'A'
+
+open class Base(private val foo: String)
+
+class A(foo: String) : Base(foo) {
+    fun bar() {
+        val a = foo<caret>
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index b103d0e2c06..be05ab826eb 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -5361,6 +5361,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("override.kt")
+        public void testOverride() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/makeConstructorParameterProperty/override.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("val.kt")
         public void testVal() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/makeConstructorParameterProperty/val.kt");