From dde2d08cfc484daee07327ede943e4d141f2e981 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 11 Nov 2019 17:01:27 +0300
Subject: [PATCH] FIR resolve: add extra test for generic with bounds in Java

---
 .../resolve/expresssions/genericDecorator.kt  | 19 +++++++++++++++++++
 .../resolve/expresssions/genericDecorator.txt | 11 +++++++++++
 .../fir/FirDiagnosticsTestGenerated.java      |  5 +++++
 3 files changed, 35 insertions(+)
 create mode 100644 compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.kt
 create mode 100644 compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.txt

diff --git a/compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.kt b/compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.kt
new file mode 100644
index 00000000000..98958c167f4
--- /dev/null
+++ b/compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.kt
@@ -0,0 +1,19 @@
+// FILE: LookupElement.java
+
+public abstract class LookupElement {
+    public abstract String getLookupString();
+}
+
+// FILE: Decorator.java
+
+public abstract class Decorator<T extends LookupElement> extends LookupElement {
+    public T getDelegate() {
+        return null;
+    }
+}
+
+// FILE: test.kt
+
+class MyDecorator : Decorator<LookupElement> {
+    override fun getLookupString(): String = delegate.lookupString
+}
\ No newline at end of file
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.txt b/compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.txt
new file mode 100644
index 00000000000..23394588f1f
--- /dev/null
+++ b/compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.txt
@@ -0,0 +1,11 @@
+FILE: test.kt
+    public final class MyDecorator : R|Decorator<LookupElement>| {
+        public constructor(): R|MyDecorator| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final override fun getLookupString(): R|kotlin/String| {
+            ^getLookupString R|/Decorator.delegate|.R|/LookupElement.lookupString|
+        }
+
+    }
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
index 8a1da123510..9e1b3a00580 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
@@ -359,6 +359,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/resolve/testData/resolve/expresssions/extensionPropertyInLambda.kt");
         }
 
+        @TestMetadata("genericDecorator.kt")
+        public void testGenericDecorator() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolve/expresssions/genericDecorator.kt");
+        }
+
         @TestMetadata("genericPropertyAccess.kt")
         public void testGenericPropertyAccess() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/expresssions/genericPropertyAccess.kt");