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

show refactoring conflicts in usage view

Browse Source
This commit is contained in:
Anna Kozlova
2009-09-16 21:42:50 +04:00
parent 29f569e32a
commit 3a3b500f9c
56 changed files with 542 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java
View File

@@ -8,6 +8,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.search.ProjectScope;
import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor;
@@ -16,7 +17,7 @@ import com.intellij.testFramework.PsiTestUtil;
import com.intellij.usageView.UsageInfo;
import java.io.File;
import java.util.List;
import java.util.Map;
/**
* @author yole
@@ -113,8 +114,8 @@ public class MoveClassToInnerTest extends CodeInsightTestCase {
PsiClass targetClass = myJavaFacade.findClass(targetClassName, ProjectScope.getAllScope(myProject));
MoveClassToInnerProcessor processor = new MoveClassToInnerProcessor(myProject, classToMove, targetClass, true, true, null);
UsageInfo[] usages = processor.findUsages();
List<String> conflicts = processor.getConflicts(usages);
assertSameElements(conflicts, expectedConflicts);
Map<PsiElement,String> conflicts = processor.getConflicts(usages);
assertSameElements(conflicts.values() , expectedConflicts);
}
private void performAction(String[] classNames, String targetClassName) throws Exception{