functional expressions & @FunctionalInterface based conflicts for pull up/push down refactorings

java/java-tests/testData/refactoring/pullUp/StillFunctional.java

@@ -0,0 +1,9 @@
+@FunctionalInterface
+interface I {
+  void foo();
+}
+
+class IImpl implements I {
+  public void foo(){}
+  public void g<caret>et() {}
+}

java/java-tests/testData/refactoring/pullUp/StillFunctional_after.java

@@ -0,0 +1,10 @@
+@FunctionalInterface
+interface I {
+  void foo();
+
+    default void get() {}
+}
+
+class IImpl implements I {
+  public void foo(){}
+}

java/java-tests/testData/refactoring/pushDown/FunctionalInterface.java

@@ -0,0 +1,10 @@
+@FunctionalInterface
+interface Base {
+    default void foo() {
+        System.out.println("Hi there.");
+    }
+    void ba<caret>r();
+}
+
+class Child implements Base {
+}

java/java-tests/testData/refactoring/pushDown/FunctionalInterface_after.java

@@ -0,0 +1,10 @@
+@FunctionalInterface
+interface Base {
+    default void foo() {
+        System.out.println("Hi there.");
+    }
+}
+
+class Child implements Base {
+    public abstract void bar();
+}

java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java

@@ -95,7 +95,12 @@ public class PullUpTest extends LightRefactoringTestCase {
 
   public void testNotFunctionalAnymore() {
     setLanguageLevel(LanguageLevel.JDK_1_8);
-    doTest(true, "Functional expression demands functional interface to have exact one method", new RefactoringTestUtil.MemberDescriptor("get", PsiMethod.class));
+    doTest(true, "Functional expression demands functional interface to have exact one method", new RefactoringTestUtil.MemberDescriptor("get", PsiMethod.class, true));
+  }
+
+  public void testStillFunctional() {
+    setLanguageLevel(LanguageLevel.JDK_1_8);
+    doTest(true, new RefactoringTestUtil.MemberDescriptor("get", PsiMethod.class, false));
   }
 
   public void testAsDefault() {

java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java

@@ -16,12 +16,14 @@
 package com.intellij.refactoring;
 
 import com.intellij.codeInsight.TargetElementUtilBase;
+import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.memberPushDown.PushDownProcessor;
 import com.intellij.refactoring.util.DocCommentPolicy;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
 import com.intellij.refactoring.util.classMembers.MemberInfoStorage;
+import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.containers.MultiMap;
 
@@ -55,6 +57,7 @@ public class PushDownTest extends LightRefactoringTestCase {
   public void testExtensionMethodToClass() { doTest(); }
 
   public void testFunctionalExpression() { doTest(true);}
+  public void testFunctionalInterface() { doTest(true);}
   public void testFunctionalExpressionDefaultMethod() { doTest();}
 
   private void doTest() {
@@ -125,4 +128,9 @@ public class PushDownTest extends LightRefactoringTestCase {
 
     checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
   }
+
+  @Override
+  protected Sdk getProjectJDK() {
+    return IdeaTestUtil.getMockJdk18();
+  }
 }