From 37fb8d630617802f50d80261f181e52c3f9845d4 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 20 Sep 2016 16:46:44 +0300
Subject: [PATCH] Fix tests for looking implementations from Java - no search
 for Kotlin declaration from usages

Probably because of this commit: https://github.com/JetBrains/intellij-community/commit/7d95ff4d86e584d66d558559a1a4678920281ca1
---
 .../ImplementJavaInnerInterface.java          | 12 ++++++--
 .../ImplementJavaInnerInterfaceFromUsage.java | 28 +++++++++++++++++++
 .../ImplementJavaInnerInterfaceFromUsage.kt   |  3 ++
 ...KotlinGotoImplementationMultifileTest.java |  4 +++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java
 create mode 100644 idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt

diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java
index e19ca2deb08..366aa88a04f 100644
--- a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java
+++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java
@@ -1,6 +1,6 @@
 public class ImplementJavaInnerInterface {
     interface Test {
-        void foo();
+        void <caret>foo();
     }
 
     void test() {
@@ -12,10 +12,18 @@ public class ImplementJavaInnerInterface {
         };
     }
 
+    public static class OtherJava implements Test {
+        @Override
+        public void foo() {
+
+        }
+    }
+
     void usage(Test test) {
-        test.<caret>foo();
+        test.foo();
     }
 }
 
+// REF: (in ImplementJavaInnerInterface.OtherJava).foo()
 // REF: (in KotlinTest).foo()
 // REF: <anonymous>.foo()
\ No newline at end of file
diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java
new file mode 100644
index 00000000000..75bc43ee196
--- /dev/null
+++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java
@@ -0,0 +1,28 @@
+public class ImplementJavaInnerInterfaceFromUsage {
+    interface Test {
+        void foo();
+    }
+
+    void test() {
+        Test test = new Test() {
+            @Override
+            public void foo() {
+
+            }
+        };
+    }
+
+    public static class OtherJava implements Test {
+        @Override
+        public void foo() {
+
+        }
+    }
+
+    void usage(Test test) {
+        test.<caret>foo();
+    }
+}
+
+// REF: (in ImplementJavaInnerInterfaceFromUsage.OtherJava).foo()
+// REF: <anonymous>.foo()
\ No newline at end of file
diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt
new file mode 100644
index 00000000000..fb882f3e629
--- /dev/null
+++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt
@@ -0,0 +1,3 @@
+class KotlinTest : ImplementJavaInnerInterfaceFromUsage.Test {
+    override fun foo() {}
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
index c874b7a7bce..eec13a97bdd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
@@ -66,6 +66,10 @@ public class KotlinGotoImplementationMultifileTest extends KotlinLightCodeInsigh
         doJavaKotlinTest();
     }
 
+    public void testImplementJavaInnerInterfaceFromUsage() throws Exception {
+        doJavaKotlinTest();
+    }
+
     private void doKotlinJavaTest() throws Exception {
         doMultifileTest(getTestName(false) + ".kt", getTestName(false) + ".java");
     }