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

encapsulate fields: tests

Browse Source
This commit is contained in:
anna
2009-10-26 17:46:36 +03:00
parent 3973debce5
commit d58e748cba
5 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/java-tests/testData/refactoring/encapsulateFields/hideOuterclassMethod/after/Test.java Normal file
View File

@@ -0,0 +1,17 @@
public class A {
static int getI() {
return 23;
}
static class B {
static private int i = 42;
static int m() {
return getI();
}
}
public static void main(String[] args) {
System.out.println(B.m());
}
}

17
java/java-tests/testData/refactoring/encapsulateFields/hideOuterclassMethod/before/Test.java Normal file
View File

@@ -0,0 +1,17 @@
public class A {
static int getI() {
return 23;
}
static class B {
static private int i = 42;
static int m() {
return getI();
}
}
public static void main(String[] args) {
System.out.println(B.m());
}
}

15
java/java-tests/testData/refactoring/encapsulateFields/hideOverriderMethod/after/Test.java Normal file
View File

@@ -0,0 +1,15 @@
public class A {
public int i;
}
class B extends A {
public int getI() {
return 42;
}
public static void main(String[] args) {
A a = new B();
a.i = 23;
System.out.println(a.i);
}
}

15
java/java-tests/testData/refactoring/encapsulateFields/hideOverriderMethod/before/Test.java Normal file
View File

@@ -0,0 +1,15 @@
public class A {
public int i;
}
class B extends A {
public int getI() {
return 42;
}
public static void main(String[] args) {
A a = new B();
a.i = 23;
System.out.println(a.i);
}
}

16
java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java
View File

@@ -30,6 +30,14 @@ public class EncapsulateFieldsTest extends MultiFileTestCase{
doTest("i", "There already is a method <b><code>Super setI(int)</code></b> which differs from setter <b><code>setI</code></b> by return type only.");
}
public void testHideOverriderMethod() throws Exception {
doTest("i", "A", "There is already a <b><code>method <b><code>B.getI()</code></b></code></b> which would hide generated getter for a.i");
}
public void testHideOuterclassMethod() throws Exception {
doTest("i", "A.B", "There is already a <b><code>method <b><code>A.getI()</code></b></code></b> which would be hidden by generated getter");
}
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
@@ -41,11 +49,15 @@ public class EncapsulateFieldsTest extends MultiFileTestCase{
private void doTest(final String fieldName, final String conflicts) throws Exception {
doTest(fieldName, "Test", conflicts);
}
private void doTest(final String fieldName, final String className, final String conflicts) throws Exception {
doTest(new PerformAction() {
public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception {
PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject));
PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(myProject));
assertNotNull("Class Test not found", aClass);
assertNotNull("Tested class not found", aClass);
doTest(aClass, aClass.findFieldByName(fieldName, false), conflicts, true, true);