more light tests

java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/after/a/Test.java

@@ -1,5 +0,0 @@
-package a;
-
-public class A {
-  int getFoo();
-}

java/java-tests/testData/refactoring/encapsulateFields/inaccessibleSuperMethod/before/a/Test.java

@@ -1,5 +0,0 @@
-package a;
-
-public class A {
-  int getFoo();
-}

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");
   }
 
 

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/";
   }
 }