inplace members rename tests

(cherry picked from commit 9db66026eb65ef943da08f6dcf42b0f2a80fe03e)

java/java-tests/testData/refactoring/renameInplace/ClassWithMultipleConstructors.java

@@ -0,0 +1,13 @@
+public class Constructor {
+  public Constructor() {
+  }
+
+  public Constructor(int i) {
+    System.out.println(i);
+  }
+
+  void foo() {
+    final Constr<caret>uctor constructor = new Constructor();
+    System.out.println(constructor);
+  }
+}

java/java-tests/testData/refactoring/renameInplace/ClassWithMultipleConstructors_after.java

@@ -0,0 +1,13 @@
+public class Bar {
+  public Bar() {
+  }
+
+  public Bar(int i) {
+    System.out.println(i);
+  }
+
+  void foo() {
+    final Bar bar = new Bar();
+    System.out.println(bar);
+  }
+}

java/java-tests/testData/refactoring/renameInplace/ConflictingMethodName.java

@@ -0,0 +1,12 @@
+class Foo {
+  void foo(){}
+  void bar() {
+    foo();
+  }
+}
+
+class FooImpl extends Foo {
+  void f<caret>oo() {
+    super.foo();
+  }
+}

java/java-tests/testData/refactoring/renameInplace/ConflictingMethodName_after.java

@@ -0,0 +1,12 @@
+class Foo {
+  void foo(){}
+  void bar() {
+    foo();
+  }
+}
+
+class FooImpl extends Foo {
+  void foo() {
+    super.foo();
+  }
+}

java/java-tests/testData/refactoring/renameInplace/Constructor.java

@@ -0,0 +1,8 @@
+public class Constructor {
+  public Constructor() {
+  }
+  void foo() {
+    final Constructor constructor = new Co<caret>nstructor();
+    System.out.println(constructor);
+  }
+}

java/java-tests/testData/refactoring/renameInplace/Constructor_after.java

@@ -0,0 +1,8 @@
+public class Bar {
+  public Bar() {
+  }
+  void foo() {
+    final Bar bar = new Bar();
+    System.out.println(bar);
+  }
+}

java/java-tests/testData/refactoring/renameInplace/MultipleConstructors.java

@@ -0,0 +1,13 @@
+public class Constructor {
+  public Constructor() {
+  }
+
+  public Constructor(int i) {
+    System.out.println(i);
+  }
+
+  void foo() {
+    final Constructor constructor = new Co<caret>nstructor();
+    System.out.println(constructor);
+  }
+}

java/java-tests/testData/refactoring/renameInplace/MultipleConstructors_after.java

@@ -0,0 +1,13 @@
+public class Bar {
+  public Bar() {
+  }
+
+  public Bar(int i) {
+    System.out.println(i);
+  }
+
+  void foo() {
+    final Bar bar = new Bar();
+    System.out.println(bar);
+  }
+}

java/java-tests/testData/refactoring/renameInplace/SuperMethod.java

@@ -0,0 +1,12 @@
+class Foo {
+  void foo(){}
+  void bar() {
+    foo();
+  }
+}
+
+class FooImpl extends Foo {
+  void f<caret>oo() {
+    super.foo();
+  }
+}

java/java-tests/testData/refactoring/renameInplace/SuperMethod_after.java

@@ -0,0 +1,12 @@
+class Foo {
+  void xxx(){}
+  void bar() {
+    xxx();
+  }
+}
+
+class FooImpl extends Foo {
+  void xxx() {
+    super.xxx();
+  }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.refactoring;
+
+import com.intellij.JavaTestUtil;
+import com.intellij.codeInsight.TargetElementUtilBase;
+import com.intellij.psi.PsiElement;
+import com.intellij.refactoring.rename.inplace.MemberInplaceRenameHandler;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
+
+/**
+ * User: anna
+ * Date: 12/4/11
+ */
+public class RenameMembersInplaceTest extends LightCodeInsightTestCase {
+  private static final String BASE_PATH = "/refactoring/renameInplace/";
+
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
+  public void testConstructor() throws Exception {
+    doTestInplaceRename("Bar");
+  }
+
+  public void testSuperMethod() throws Exception {
+    doTestInplaceRename("xxx");
+  }
+
+  public void testMultipleConstructors() throws Exception {
+    doTestInplaceRename("Bar");
+  }
+
+  public void testClassWithMultipleConstructors() throws Exception {
+    doTestInplaceRename("Bar");
+  }
+
+  public void testConflictingMethodName() throws Exception {
+    try {
+      doTestInplaceRename("bar");
+    }
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
+      assertEquals("Method bar() is already defined in the class <b><code>Foo</code></b>.", e.getMessage());
+      checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
+      return;
+    }
+    fail("Conflict was not detected");
+  }
+
+  private void doTestInplaceRename(final String newName) throws Exception {
+    configureByFile(BASE_PATH + "/" + getTestName(false) + ".java");
+
+    final PsiElement element = TargetElementUtilBase.findTargetElement(myEditor, TargetElementUtilBase.getInstance().getAllAccepted());
+    assertNotNull(element);
+
+    CodeInsightTestUtil.doInlineRename(new MemberInplaceRenameHandler(), newName, getEditor(), element);
+
+    checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
+  }
+}

platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestUtil.java

@@ -180,16 +180,11 @@ public class CodeInsightTestUtil {
           finalEditor.getDocument().replaceString(range.getStartOffset(), range.getEndOffset(), newName);
         }
       }.execute().throwException();
-      assert renamer != null;
-      renamer.finish();
 
       state = TemplateManagerImpl.getTemplateState(editor);
       assert state != null;
       state.gotoEnd(false);
     }
-    catch (Exception er) {
-      er.printStackTrace();
-    }
     finally {
       templateManager.setTemplateTesting(false);
     }