pull up: ensure substituted (IDEA-140710)

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

@@ -0,0 +1,10 @@
+abstract class C<T> {
+    abstract void foo(T t);
+}
+
+class B<T> extends C<T> {
+    @Override
+    void f<caret>oo(T t) {
+
+    }
+}

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

@@ -0,0 +1,11 @@
+abstract class C<T> {
+    abstract void foo(T t);
+
+    @Override
+    void foo(T t) {
+
+    }
+}
+
+class B<T> extends C<T> {
+}

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

@@ -40,6 +40,8 @@ import java.util.Arrays;
 public class PullUpTest extends LightRefactoringTestCase {
   private static final String BASE_PATH = "/refactoring/pullUp/";
 
+  private static final String IGNORE_CONFLICTS = "IGNORE"; 
+
   public void testQualifiedThis() {
     doTest(new RefactoringTestUtil.MemberDescriptor("Inner", PsiClass.class));
   }
@@ -163,6 +165,11 @@ public class PullUpTest extends LightRefactoringTestCase {
   public void testPreserveOverride() {
     doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
   }
+
+  public void testSubstituteOverrideToMerge() {
+    doTest(false, IGNORE_CONFLICTS, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
+  }
+
   public void testAsDefaultMethodOverAbstract() {
     doTest(false, "Class <b><code>Test.Printer</code></b> already contains a method <b><code>foo()</code></b>", new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
   }
@@ -231,7 +238,7 @@ public class PullUpTest extends LightRefactoringTestCase {
       fail(conflictsMap.values().iterator().next());
     }
 
-    if (conflictMessage != null) {
+    if (conflictMessage != null && !IGNORE_CONFLICTS.equals(conflictMessage)) {
       assertEquals(conflictMessage, conflictsMap.values().iterator().next());
       return;
     }