test++

java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java

@@ -1,12 +1,18 @@
 package com.intellij.refactoring;
 
-import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.JavaTestUtil;
 
 /**
  * @author ven
  */
-public class IntroduceFieldInSameClassTest extends CodeInsightTestCase {
+public class IntroduceFieldInSameClassTest extends LightCodeInsightTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   public void testInClassInitializer () throws Exception {
     configureByFile("/refactoring/introduceField/before1.java");
     performRefactoring(BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, true);
@@ -25,7 +31,7 @@ public class IntroduceFieldInSameClassTest extends CodeInsightTestCase {
     checkResultByFile("/refactoring/introduceField/afterOuterClass.java");
   }
 
-  private void performRefactoring(final BaseExpressionToFieldHandler.InitializationPlace initializationPlace, final boolean declareStatic) {
-    new MockIntroduceFieldHandler(initializationPlace, declareStatic).invoke(myProject, myEditor, myFile, null);
+  private static void performRefactoring(final BaseExpressionToFieldHandler.InitializationPlace initializationPlace, final boolean declareStatic) {
+    new MockIntroduceFieldHandler(initializationPlace, declareStatic).invoke(getProject(), myEditor, myFile, null);
   }
 }

java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java

@@ -24,11 +24,17 @@ 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.JavaTestUtil;
 import org.junit.Before;
 
 import java.io.File;
 
 public class IntroduceFieldWitSetUpInitializationTest extends CodeInsightTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   protected Module createModule(final String name) {
     final Module module = super.createModule(name);
     final ModifiableRootModel model = ModuleRootManager.getInstance(module).getModifiableModel();