cs: detect delete group; tests

2026-09-18 09:34:34 +07:00 · 2010-09-10 17:44:39 +04:00
parent fb2b6ed995
commit c29910440d
14 changed files with 260 additions and 29 deletions
@@ -0,0 +1,14 @@
+public class Parent {
+  public void foo(float j, int i, String s) {
+    System.out.println(j + s + i);
+  }
+}
+
+class Child extends Parent {
+  public void foo(float j, <selection> int i,</selection> String s ) {
+  }
+
+  void bar() {
+    foo(1.0, 1, "aaa");
+  }
+}
@@ -0,0 +1,14 @@
+public class Parent {
+  public void foo(float j, String s) {
+    System.out.println(j + s + i);
+  }
+}
+
+class Child extends Parent {
+  public void foo(float j, String s) {
+  }
+
+  void bar() {
+    foo(1.0,  "aaa");
+  }
+}
@@ -0,0 +1,5 @@
+class Test {
+  void foo(int i<caret>) {
+    System.out.println(i);
+  }
+}
@@ -0,0 +1,10 @@
+public class Parent {
+  public void foo(int i) {
+    System.out.println(i);
+  }
+}
+
+class Child extends Parent {
+  public void foo(int i<caret>) {
+  }
+}
@@ -0,0 +1,14 @@
+public class Parent {
+  public void foo(int i) {
+    System.out.println(i);
+  }
+}
+
+class Child extends Parent {
+  public void foo(int i<caret>) {
+  }
+
+  void bar() {
+    foo(1);
+  }
+}
@@ -0,0 +1,14 @@
+public class Parent {
+  public void foo(int i, int param) {
+    System.out.println(i);
+  }
+}
+
+class Child extends Parent {
+  public void foo(int i, int param) {
+  }
+
+  void bar() {
+    foo(1,intellijidearulezzz);
+  }
+}
@@ -0,0 +1,10 @@
+public class Parent {
+  public void foo(int i, int param) {
+    System.out.println(i);
+  }
+}
+
+class Child extends Parent {
+  public void foo(int i, int param) {
+  }
+}
@@ -0,0 +1,5 @@
+class Test {
+  void foo(int i, int param) {
+    System.out.println(i);
+  }
+}
@@ -0,0 +1,5 @@
+class Test {
+  void foo(int i<caret>) {
+    System.out.println(i);
+  }
+}
@@ -0,0 +1,5 @@
+class Test {
+  void foo(int iparam) {
+    System.out.println(iparam);
+  }
+}
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2000-2010 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.intention.IntentionAction;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actions.EditorActionUtil;
+import com.intellij.psi.PsiManager;
+import com.intellij.refactoring.changeSignature.ChangeSignatureGestureDetector;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+
+/**
+ * User: anna
+ * Date: Sep 9, 2010
+ */
+public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase {
+  private void doTest(Runnable run) {
+    myFixture.configureByFile("/refactoring/changeSignatureGesture/" + getTestName(false) + ".java");
+    final ChangeSignatureGestureDetector detector = ChangeSignatureGestureDetector.getInstance(getProject());
+    final Document document = myFixture.getEditor().getDocument();
+    try {
+      PsiManager.getInstance(getProject()).addPsiTreeChangeListener(detector);
+      detector.addDocListener(document);
+      run.run();
+      myFixture.doHighlighting();
+      final IntentionAction intention = myFixture.findSingleIntention("Change signature ...");
+      myFixture.launchAction(intention);
+      myFixture.checkResultByFile("/refactoring/changeSignatureGesture/" + getTestName(false) + "_after.java");
+    }
+    finally {
+      detector.removeDocListener(document);
+      PsiManager.getInstance(getProject()).removePsiTreeChangeListener(detector);
+    }
+  }
+
+  public void testSimple() {
+    doTypingTest("param");
+  }
+
+  public void testNewParam() {
+    doTypingTest(", int param");
+  }
+
+  public void testNewParamInSuper() {
+    doTypingTest(", int param");
+  }
+
+  public void testNewParamInSuperUsed() {
+    doTypingTest(", int param");
+  }
+
+  private void doTypingTest(final String param) {
+    doTest(new Runnable() {
+      @Override
+      public void run() {
+        myFixture.type(param);
+      }
+    });
+  }
+
+  public void testDeleteParamInSuperUsed() {
+    doDeleteTest();
+  }
+
+  private void doDeleteTest() {
+    doTest(new Runnable() {
+      @Override
+      public void run() {
+        final Editor editor = myFixture.getEditor();
+        final Document document = editor.getDocument();
+        final int selectionStart = editor.getSelectionModel().getSelectionStart();
+        final int selectionEnd = editor.getSelectionModel().getSelectionEnd();
+        CommandProcessor.getInstance().setCurrentCommandGroupId(EditorActionUtil.DELETE_COMMAND_GROUP);
+        document.deleteString(selectionStart, selectionEnd);
+        editor.getCaretModel().moveToOffset(selectionStart);
+      }
+    });
+  }
+
+  @Override
+  protected String getBasePath() {
+    return JavaTestUtil.getRelativeJavaTestDataPath();
+  }
+}