1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
/*
* Copyright 2000-2014 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.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.move.moveInner.MoveInnerDialog;
import com.intellij.refactoring.move.moveInner.MoveInnerImpl;
import com.intellij.refactoring.move.moveInner.MoveInnerProcessor;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author dsl
*/
public class MoveInnerTest extends MultiFileTestCase {
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
}
@NotNull
@Override
protected String getTestRoot() {
return "/refactoring/moveInner/";
}
public void testScr13730() throws Exception {
doTest(createAction("pack1.TopLevel.StaticInner", "StaticInner", false, null, false, false, null));
}
public void testScr15142() throws Exception {
doTest(createAction("xxx.Outer.Inner", "Inner", false, null, false, false, null));
}
public void testNonJavaFiles() throws Exception {
doTest(createAction("pack1.Outer.Inner", "Inner", false, null, true, true, null));
}
public void testXmlReferences() throws Exception {
doTest(createAction("pack1.Outer.Inner", "Inner", false, null, true, true, null));
}
public void testScr22592() throws Exception {
doTest(createAction("xxx.Outer.Inner", "Inner", true, "outer", false, false, null));
}
public void testInnerClassInheritance() throws Exception {
try {
doTest(createAction("p.A.B", "B", false, null, false, false, null));
fail("Conflict was not detected");
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals("class <b><code>p.A.C</code></b> will become inaccessible from class <b><code>p.A.B</code></b>", e.getMessage());
}
}
public void testInnerClassSelfRef() throws Exception {
doTest(createAction("p.A.B", "B", false, null, false, false, null));
}
public void testScr30106() throws Exception {
doTest(createAction("p.A.B", "B", true, "outer", false, false, null));
}
public void testConstructorVisibility() throws Exception { // IDEADEV-19561
doTest(createAction("p.A.B", "B", false, null, false, false, null));
}
public void testFieldAccessInSuper() throws Exception {
doTest(createAction("p.A.B", "B", true, "a", false, false, null));
}
public void testToOtherPackage() throws Exception {
doTest(createAction("package1.OuterClass.InnerClass", "InnerClass", false, null, false, false, "package2"));
}
public void testImportStaticOfEnum() throws Exception { // IDEADEV-28619
doTest(createAction("p.A.E", "E", false, null, false, false, null));
}
public void testEnumConstructorVisibility() throws Exception { // IDEADEV-28619
doTest(createAction("p.A.E", "E", false, null, false, false, "p2"));
}
public void testQualifyThisHierarchy() throws Exception {
final String innerClassName = "pack1.DImpl.MyRunnable";
doTest(new MyPerformAction(innerClassName, "MyRunnable", false, "d",
false, false, null) {
@Override
protected boolean isPassOuterClass() {
final PsiClass outerClass = getJavaFacade().findClass("pack1.DImpl", GlobalSearchScope.moduleScope(myModule));
assertNotNull(outerClass);
final PsiClass innerClass = getJavaFacade().findClass(innerClassName, GlobalSearchScope.moduleScope(myModule));
assertNotNull(innerClass);
return MoveInnerDialog.isThisNeeded(innerClass, outerClass);
}
});
}
private PerformAction createAction(@NonNls final String innerClassName,
@NonNls final String newClassName,
final boolean passOuterClass,
@NonNls final String parameterName,
final boolean searchInComments,
final boolean searchInNonJava,
@NonNls @Nullable final String packageName) {
return new MyPerformAction(innerClassName, newClassName, passOuterClass, parameterName, searchInComments, searchInNonJava, packageName);
}
private class MyPerformAction implements PerformAction {
private final String myInnerClassName;
private final String myPackageName;
private final String myNewClassName;
private final boolean myPassOuterClass;
private final String myParameterName;
private final boolean mySearchInComments;
private final boolean mySearchInNonJava;
public MyPerformAction(String innerClassName, String newClassName, boolean passOuterClass, String parameterName, boolean searchInComments,
boolean searchInNonJava,
String packageName) {
myInnerClassName = innerClassName;
myPackageName = packageName;
myNewClassName = newClassName;
myPassOuterClass = passOuterClass;
myParameterName = parameterName;
mySearchInComments = searchInComments;
mySearchInNonJava = searchInNonJava;
}
@Override
public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
final JavaPsiFacade manager = getJavaFacade();
final PsiClass aClass = manager.findClass(myInnerClassName, GlobalSearchScope.moduleScope(myModule));
final MoveInnerProcessor moveInnerProcessor = new MoveInnerProcessor(myProject, null);
final PsiElement targetContainer = myPackageName != null ? findDirectory(myPackageName) : MoveInnerImpl.getTargetContainer(aClass, false);
assertNotNull(targetContainer);
moveInnerProcessor.setup(aClass, myNewClassName, isPassOuterClass(), myParameterName, mySearchInComments, mySearchInNonJava, targetContainer);
moveInnerProcessor.run();
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
FileDocumentManager.getInstance().saveAllDocuments();
}
protected boolean isPassOuterClass() {
return myPassOuterClass;
}
private PsiElement findDirectory(final String packageName) {
final PsiPackage aPackage = JavaPsiFacade.getInstance(myPsiManager.getProject()).findPackage(packageName);
assert aPackage != null;
final PsiDirectory[] directories = aPackage.getDirectories();
return directories [0];
}
}
}
|
