MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Push Down: super should not access over hierarchy (IDEA-20816)

Browse Source
This commit is contained in:
anna
2010-01-29 17:07:20 +03:00
parent b5bb81cdfd
commit 79cf445952
6 changed files with 126 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
+12 -4
View File
@@ -35,13 +35,13 @@ public class PushDownTest extends LightCodeInsightTestCase {
final PsiMember psiMember = (PsiMember)targetElement;
final PsiClass[] classes = ((PsiJavaFile)psiMember.getContainingFile()).getClasses();
final PsiClass currentClass = psiMember.getContainingClass();
assert classes.length > 0;
assert currentClass != null;
final List<MemberInfo> membersToMove = new ArrayList<MemberInfo>();
final PsiField fieldByName = classes[0].findFieldByName("fieldToMove", false);
final PsiField fieldByName = currentClass.findFieldByName("fieldToMove", false);
if (fieldByName != null) {
final MemberInfo memberInfo = new MemberInfo(fieldByName);
memberInfo.setChecked(true);
@@ -52,7 +52,7 @@ public class PushDownTest extends LightCodeInsightTestCase {
memberInfo.setChecked(true);
membersToMove.add(memberInfo);
new PushDownProcessor(getProject(), membersToMove.toArray(new MemberInfo[membersToMove.size()]), classes[0], new DocCommentPolicy(DocCommentPolicy.ASIS)){
new PushDownProcessor(getProject(), membersToMove.toArray(new MemberInfo[membersToMove.size()]), currentClass, new DocCommentPolicy(DocCommentPolicy.ASIS)){
@Override
protected boolean showConflicts(MultiMap<PsiElement,String> conflicts) {
if (failure ? conflicts.isEmpty() : !conflicts.isEmpty()) {
@@ -92,4 +92,12 @@ public class PushDownTest extends LightCodeInsightTestCase {
public void testThisRefInAnonymous() throws Exception {
doTest();
}
public void testSuperOverHierarchyConflict() throws Exception {
doTest(true);
}
public void testSuperOverHierarchy() throws Exception {
doTest();
}
}