diff --git a/java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/AlreadyExist.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/AlreadyExist.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/AlreadyExist_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/AlreadyExist_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/commentsInside/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/CommentsInside.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/commentsInside/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/CommentsInside.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/commentsInside/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/CommentsInside_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/commentsInside/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/CommentsInside_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnly.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnly.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnlyInHierarchy.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnlyInHierarchy.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnlyInHierarchy_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnlyInHierarchy_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnly_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/DiffWithReturnTypeOnly_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/filterEnumConstants/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/FilterEnumConstants.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/filterEnumConstants/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/FilterEnumConstants.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/filterEnumConstants/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/FilterEnumConstants_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/filterEnumConstants/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/FilterEnumConstants_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/hideOuterclassMethod/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/HideOuterclassMethod.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/hideOuterclassMethod/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/HideOuterclassMethod.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/hideOuterclassMethod/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/HideOuterclassMethod_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/hideOuterclassMethod/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/HideOuterclassMethod_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/hideOverriderMethod/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/HideOverriderMethod.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/hideOverriderMethod/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/HideOverriderMethod.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/hideOverriderMethod/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/HideOverriderMethod_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/hideOverriderMethod/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/HideOverriderMethod_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/b/B.java b/java/java-tests/testData/refactoring/encapsulateFields/InaccessibleSuperMethod.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/b/B.java rename to java/java-tests/testData/refactoring/encapsulateFields/InaccessibleSuperMethod.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/b/B.java b/java/java-tests/testData/refactoring/encapsulateFields/InaccessibleSuperMethod_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/b/B.java rename to java/java-tests/testData/refactoring/encapsulateFields/InaccessibleSuperMethod_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/javadocRefs/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/javadocRefs/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/javadocRefs1/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs1.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/javadocRefs1/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs1.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/javadocRefs1/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs1_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/javadocRefs1/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs1_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/javadocRefs/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/javadocRefs/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/JavadocRefs_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/moveJavadocToGetter/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/MoveJavadocToGetter.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/moveJavadocToGetter/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/MoveJavadocToGetter.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/moveJavadocToGetter/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/MoveJavadocToGetter_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/moveJavadocToGetter/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/MoveJavadocToGetter_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/postfixExpressionUsedInAssignment/after/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/PostfixExpressionUsedInAssignment.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/postfixExpressionUsedInAssignment/after/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/PostfixExpressionUsedInAssignment.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/postfixExpressionUsedInAssignment/before/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/PostfixExpressionUsedInAssignment_after.java similarity index 100% rename from java/java-tests/testData/refactoring/encapsulateFields/postfixExpressionUsedInAssignment/before/Test.java rename to java/java-tests/testData/refactoring/encapsulateFields/PostfixExpressionUsedInAssignment_after.java diff --git a/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/a/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/a/Test.java deleted file mode 100644 index 21c72e80f5a6..000000000000 --- a/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/a/Test.java +++ /dev/null @@ -1,5 +0,0 @@ -package a; - -public class A { - int getFoo(); -} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/a/Test.java b/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/a/Test.java deleted file mode 100644 index 21c72e80f5a6..000000000000 --- a/java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/a/Test.java +++ /dev/null @@ -1,5 +0,0 @@ -package a; - -public class A { - int getFoo(); -} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/EncapsulateFieldsTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/EncapsulateFieldsTest.java index 0b9d5f887c58..ee63ed080d2e 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/EncapsulateFieldsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/EncapsulateFieldsTest.java @@ -24,15 +24,13 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; -import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.BaseRefactoringProcessor; -import com.intellij.refactoring.MultiFileTestCase; import com.intellij.refactoring.encapsulateFields.*; import com.intellij.refactoring.util.DocCommentPolicy; +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import junit.framework.Assert; -import org.jetbrains.annotations.NotNull; -public class EncapsulateFieldsTest extends MultiFileTestCase { +public class EncapsulateFieldsTest extends LightCodeInsightFixtureTestCase { public void testAlreadyExist() { doTest("i" , null); } @@ -62,6 +60,10 @@ public class EncapsulateFieldsTest extends MultiFileTestCase { } public void testInaccessibleSuperMethod() { + myFixture.addClass("package a;\n" + + "public class A {\n" + + " int getFoo();\n" + + "}"); doTest("foo", "b.B", null); } @@ -74,32 +76,20 @@ public class EncapsulateFieldsTest extends MultiFileTestCase { } public void testMoveJavadocToGetter() { - doTest((rootDir, rootAfter) -> { - final PsiClass aClass = myJavaFacade.findClass("A", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Tested class not found", aClass); - final PsiField field = aClass.findFieldByName("i", false); - assertNotNull(field); - doTest(aClass, null, true, true, field); - }); + doTest("i", "A", null); } public void testFilterEnumConstants() { - doTest((rootDir, rootAfter) -> { - final PsiClass aClass = myJavaFacade.findClass("A", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Tested class not found", aClass); - doTest(aClass, null, true, true, new JavaEncapsulateFieldHelper().getApplicableFields(aClass)); - }); + myFixture.configureByFile(getTestName(false) + ".java"); + PsiClass aClass = myFixture.findClass("A"); + assertNotNull("Tested class not found", aClass); + doTest(aClass, null, true, true, new JavaEncapsulateFieldHelper().getApplicableFields(aClass)); + myFixture.checkResultByFile(getTestName(false) +"_after.java"); } @Override - protected String getTestDataPath() { - return JavaTestUtil.getJavaTestDataPath(); - } - - @NotNull - @Override - protected String getTestRoot() { - return "/refactoring/encapsulateFields/"; + protected String getBasePath() { + return JavaTestUtil.getRelativeJavaTestDataPath() + "/refactoring/encapsulateFields/"; } @@ -108,14 +98,11 @@ public class EncapsulateFieldsTest extends MultiFileTestCase { } private void doTest(final String fieldName, final String className, final String conflicts) { - doTest((rootDir, rootAfter) -> { - PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(myProject)); - - assertNotNull("Tested class not found", aClass); - - - doTest(aClass, conflicts, true, true, aClass.findFieldByName(fieldName, false)); - }); + myFixture.configureByFile(getTestName(false) + ".java"); + PsiClass aClass = myFixture.findClass(className); + assertNotNull("Tested class not found", aClass); + doTest(aClass, conflicts, true, true, aClass.findFieldByName(fieldName, false)); + myFixture.checkResultByFile(getTestName(false) +"_after.java"); } diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFieldWitSetUpInitializationTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFieldWithSetUpInitializationTest.java similarity index 70% rename from java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFieldWitSetUpInitializationTest.java rename to java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFieldWithSetUpInitializationTest.java index a818ff1f67f2..e4906fba3d4f 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFieldWitSetUpInitializationTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceFieldWithSetUpInitializationTest.java @@ -17,10 +17,10 @@ package com.intellij.java.refactoring; import com.intellij.JavaTestUtil; -import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.module.Module; -import com.intellij.openapi.roots.ModuleRootModificationUtil; -import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.roots.ContentEntry; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.project.IntelliJProjectConfiguration; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiLocalVariable; @@ -28,25 +28,26 @@ import com.intellij.psi.PsiModifier; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler; import com.intellij.refactoring.introduceField.LocalToFieldHandler; -import com.intellij.util.PathUtil; +import com.intellij.testFramework.LightCodeInsightTestCase; +import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.PsiTestUtil; +import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import java.io.File; - -public class IntroduceFieldWitSetUpInitializationTest extends CodeInsightTestCase { - @Override - protected String getTestDataPath() { - return JavaTestUtil.getJavaTestDataPath(); - } +public class IntroduceFieldWithSetUpInitializationTest extends LightCodeInsightTestCase { + private static final DefaultLightProjectDescriptor PROJECT_DESCRIPTOR = new DefaultLightProjectDescriptor() { + @Override + public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { + super.configureModule(module, model, contentEntry); + PsiTestUtil + .addProjectLibrary(model, "JUnit4", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit4")); + } + }; @NotNull @Override - protected Module createModule(final String name) { - final Module module = super.createModule(name); - final String url = VfsUtil.getUrlForLibraryRoot(new File(PathUtil.getJarPathForClass(Before.class))); - ModuleRootModificationUtil.addModuleLibrary(module, url); - return module; + protected LightProjectDescriptor getProjectDescriptor() { + return PROJECT_DESCRIPTOR; } public void testInSetUp() throws Exception { @@ -82,7 +83,7 @@ public class IntroduceFieldWitSetUpInitializationTest extends CodeInsightTestCas } private void doTest() throws Exception { - configureByFile("/refactoring/introduceField/before" + getTestName(false) + ".java"); + configureByFile("before" + getTestName(false) + ".java"); final PsiLocalVariable local = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiLocalVariable.class); new LocalToFieldHandler(getProject(), false) { @@ -97,6 +98,12 @@ public class IntroduceFieldWitSetUpInitializationTest extends CodeInsightTestCas false); } }.convertLocalToField(local, myEditor); - checkResultByFile("/refactoring/introduceField/after" + getTestName(false)+ ".java"); + checkResultByFile("after" + getTestName(false)+ ".java"); + } + + @NotNull + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath() + "/refactoring/introduceField/"; } }