test++, compilation fixed again

2025-12-16 22:51:17 +07:00 · 2009-09-10 20:48:45 +04:00
parent f9dbab8f6d
commit 58fee2c041
114 changed files with 17 additions and 12 deletions
--- a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java
@@ -0,0 +1,203 @@
+package com.intellij.refactoring;
+
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
+import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.pom.java.LanguageLevel;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.refactoring.inheritanceToDelegation.InheritanceToDelegationProcessor;
+import com.intellij.util.ArrayUtil;
+import com.intellij.JavaTestUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+
+/**
+ * @author dsl
+ */
+public class InheritanceToDelegationTest extends MultiFileTestCase {
+  private LanguageLevel myPreviousLanguageLevel;
+
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
+
+  protected void setUp() throws Exception {
+    super.setUp();
+    myPreviousLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
+    LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
+  }
+
+  protected void tearDown() throws Exception {
+    LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPreviousLanguageLevel);
+    super.tearDown();
+  }
+
+  protected Sdk getTestProjectJdk() {
+    return JavaSdkImpl.getMockJdk15("java 1.5");
+  }
+
+  protected String getTestRoot() {
+    return "/refactoring/inheritanceToDelegation/";
+  }
+
+  public void testSimpleInsertion() throws Exception {
+    doTest(createPerformAction("B", "myDelegate", "MyA", "A", new int[]{0, 1}, ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testSimpleGenerics() throws Exception {
+    doTest(createPerformAction("B", "myDelegate", "MyA", "A", new int[]{0, 1}, ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testSuperCalls() throws Exception {
+    doTest(createPerformAction("B", "myDelegate", "MyA", "A", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testGetter() throws Exception {
+    doTest(createPerformAction("B", "myDelegate", "MyA", "A", new int[]{0, 1}, ArrayUtil.EMPTY_STRING_ARRAY, true, true));
+  }
+
+  public void testSubClass() throws Exception {
+    doTest(
+      createPerformAction("A", "myDelegate", "MyDelegatedBase", "DelegatedBase", new int[]{0}, ArrayUtil.EMPTY_STRING_ARRAY, true,
+          true));
+  }
+
+  public void testSubClassNoMethods() throws Exception {
+    doTest(
+      createPerformAction("A", "myDelegate", "MyDelegatedBase", "DelegatedBase", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, true, true));
+  }
+
+  public void testInterfaces() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyBase", "Base", new int[]{0}, new String[]{"I"}, true, true));
+  }
+
+  public void testInnerClass() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyBase", "Base", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testAbstractBase() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyBase", "Base", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testAbstractBase1() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyBase", "Base", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, false, false));
+  }
+
+  public void testHierarchy() throws Exception {
+    doTest(createPerformAction("X", "myDelegate", "MyBase", "Base", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, false, false));
+  }
+
+  public void testOverridenMethods() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyBase", "Base", new int[]{0}, ArrayUtil.EMPTY_STRING_ARRAY, false, false));
+  }
+
+  public void testAnnotations() throws Exception {
+    doTest(createPerformAction("B", "myDelegate", "MyA", "A", new int[]{0}, ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testInnerClassForInterface() throws Exception {
+    doTest(createPerformAction("A", "myBaseInterface", "MyBaseInterface", "BaseInterface",
+        new int[]{0}, ArrayUtil.EMPTY_STRING_ARRAY, false, false));
+  }
+
+  public void testInnerClassForInterfaceAbstract() throws Exception {
+    doTest(createPerformAction("A", "myBaseInterface", "MyBaseInterface", "BaseInterface",
+        new int[]{0}, ArrayUtil.EMPTY_STRING_ARRAY, false, false));
+  }
+
+  public void testSubinterface() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyJ", "J", new int[0], ArrayUtil.EMPTY_STRING_ARRAY, true, true));
+  }
+
+  public void testInterfaceDelegation() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyIntf", "Intf", new int[]{0}, ArrayUtil.EMPTY_STRING_ARRAY, true, true));
+  }
+
+  // IDEADEV-19675
+  public void testInterfaceImplicitImplementation() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyIntf", "Intf", new int[]{}, ArrayUtil.EMPTY_STRING_ARRAY, true, true));
+  }
+
+  // IDEADEV-19699
+  public void testMultipleInterfaceDelegation() throws Exception {
+    doTest(createPerformAction("A", "myDelegate", "MyIntf", "Intf2", new int[]{}, ArrayUtil.EMPTY_STRING_ARRAY, true, false));
+  }
+
+  public void testScr20557() throws Exception {
+    doTest(createPerformAction2("xxx.SCR20557", "myResultSet", "MyResultSet", "java.sql.ResultSet",
+        new String[]{"getDate"}, ArrayUtil.EMPTY_STRING_ARRAY, false, false));
+  }
+
+
+  private PerformAction createPerformAction(
+    final String className, final String fieldName, final String innerClassName,
+    final String baseClassName, final int[] methodIndices, final String[] delegatedInterfaceNames,
+    final boolean delegateOtherMembers, final boolean generateGetter) {
+    return new PerformAction() {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+        PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(getProject()));
+        assertNotNull("Class " + className + " not found", aClass);
+        PsiClass baseClass = myJavaFacade.findClass(baseClassName, GlobalSearchScope.projectScope(getProject()));
+        assertNotNull("Base class " + baseClassName + " not found", baseClass);
+        final PsiMethod[] methods = baseClass.getMethods();
+        final PsiMethod[] delegatedMethods = new PsiMethod[methodIndices.length];
+        for (int i = 0; i < methodIndices.length; i++) {
+          delegatedMethods[i] = methods[methodIndices[i]];
+        }
+        final PsiClass[] delegatedInterfaces = new PsiClass[delegatedInterfaceNames.length];
+        for (int i = 0; i < delegatedInterfaceNames.length; i++) {
+          String delegatedInterfaceName = delegatedInterfaceNames[i];
+          PsiClass anInterface = myJavaFacade.findClass(delegatedInterfaceName, GlobalSearchScope.projectScope(getProject()));
+          assertNotNull(anInterface);
+          delegatedInterfaces[i] = anInterface;
+        }
+        new InheritanceToDelegationProcessor(
+          myProject,
+          aClass, baseClass, fieldName, innerClassName, delegatedInterfaces, delegatedMethods, delegateOtherMembers,
+          generateGetter).run();
+      }
+    };
+  }
+
+  private PerformAction createPerformAction2(
+    final String className, final String fieldName, final String innerClassName,
+    final String baseClassName, final String[] methodNames, final String[] delegatedInterfaceNames,
+    final boolean delegateOtherMembers, final boolean generateGetter) {
+    return new PerformAction() {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+        PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(getProject()));
+        assertNotNull("Class " + className + " not found", aClass);
+        PsiClass baseClass = myJavaFacade.findClass(baseClassName, GlobalSearchScope.projectScope(getProject()));
+        assertNotNull("Base class " + baseClassName + " not found", baseClass);
+        final PsiMethod[] delegatedMethods;
+        final List<PsiMethod> methodsList = new ArrayList<PsiMethod>();
+        for (String name : methodNames) {
+          final PsiMethod[] methodsByName = baseClass.findMethodsByName(name, false);
+          methodsList.addAll(Arrays.asList(methodsByName));
+        }
+        delegatedMethods = methodsList.toArray(new PsiMethod[methodsList.size()]);
+
+        final PsiClass[] delegatedInterfaces = new PsiClass[delegatedInterfaceNames.length];
+        for (int i = 0; i < delegatedInterfaceNames.length; i++) {
+          String delegatedInterfaceName = delegatedInterfaceNames[i];
+          PsiClass anInterface = myJavaFacade.findClass(delegatedInterfaceName, GlobalSearchScope.projectScope(getProject()));
+          assertNotNull(anInterface);
+          delegatedInterfaces[i] = anInterface;
+        }
+        new InheritanceToDelegationProcessor(
+          myProject,
+          aClass, baseClass, fieldName, innerClassName, delegatedInterfaces, delegatedMethods, delegateOtherMembers,
+          generateGetter).run();
+        //FileDocumentManager.getInstance().saveAllDocuments();
+      }
+    };
+  }
+
+}