test++

diff --git a/testData/refactoring/makeClassStatic/IDEADEV11595.java b/java/java-tests/testData/refactoring/makeClassStatic/IDEADEV11595.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/IDEADEV11595.java
rename to java/java-tests/testData/refactoring/makeClassStatic/IDEADEV11595.java

diff --git a/testData/refactoring/makeClassStatic/IDEADEV11595_after.java b/java/java-tests/testData/refactoring/makeClassStatic/IDEADEV11595_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/IDEADEV11595_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/IDEADEV11595_after.java

diff --git a/testData/refactoring/makeClassStatic/IDEADEV12762.java b/java/java-tests/testData/refactoring/makeClassStatic/IDEADEV12762.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/IDEADEV12762.java
rename to java/java-tests/testData/refactoring/makeClassStatic/IDEADEV12762.java

diff --git a/testData/refactoring/makeClassStatic/IDEADEV12762_after.java b/java/java-tests/testData/refactoring/makeClassStatic/IDEADEV12762_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/IDEADEV12762_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/IDEADEV12762_after.java

diff --git a/testData/refactoring/makeClassStatic/IDEADEV3247.java b/java/java-tests/testData/refactoring/makeClassStatic/IDEADEV3247.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/IDEADEV3247.java
rename to java/java-tests/testData/refactoring/makeClassStatic/IDEADEV3247.java

diff --git a/testData/refactoring/makeClassStatic/IDEADEV3247_after.java b/java/java-tests/testData/refactoring/makeClassStatic/IDEADEV3247_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/IDEADEV3247_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/IDEADEV3247_after.java

diff --git a/testData/refactoring/makeClassStatic/fieldWithPrefix.java b/java/java-tests/testData/refactoring/makeClassStatic/fieldWithPrefix.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/fieldWithPrefix.java
rename to java/java-tests/testData/refactoring/makeClassStatic/fieldWithPrefix.java

diff --git a/testData/refactoring/makeClassStatic/fieldWithPrefix_after.java b/java/java-tests/testData/refactoring/makeClassStatic/fieldWithPrefix_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/fieldWithPrefix_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/fieldWithPrefix_after.java

diff --git a/testData/refactoring/makeClassStatic/qualifiedThisInSibling.java b/java/java-tests/testData/refactoring/makeClassStatic/qualifiedThisInSibling.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/qualifiedThisInSibling.java
rename to java/java-tests/testData/refactoring/makeClassStatic/qualifiedThisInSibling.java

diff --git a/testData/refactoring/makeClassStatic/qualifiedThisInSibling_after.java b/java/java-tests/testData/refactoring/makeClassStatic/qualifiedThisInSibling_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/qualifiedThisInSibling_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/qualifiedThisInSibling_after.java

diff --git a/testData/refactoring/makeClassStatic/regularReference.java b/java/java-tests/testData/refactoring/makeClassStatic/regularReference.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/regularReference.java
rename to java/java-tests/testData/refactoring/makeClassStatic/regularReference.java

diff --git a/testData/refactoring/makeClassStatic/regularReference_after.java b/java/java-tests/testData/refactoring/makeClassStatic/regularReference_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/regularReference_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/regularReference_after.java

diff --git a/testData/refactoring/makeClassStatic/simple.java b/java/java-tests/testData/refactoring/makeClassStatic/simple.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/simple.java
rename to java/java-tests/testData/refactoring/makeClassStatic/simple.java

diff --git a/testData/refactoring/makeClassStatic/simpleWithFields.java b/java/java-tests/testData/refactoring/makeClassStatic/simpleWithFields.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/simpleWithFields.java
rename to java/java-tests/testData/refactoring/makeClassStatic/simpleWithFields.java

diff --git a/testData/refactoring/makeClassStatic/simpleWithFields_after.java b/java/java-tests/testData/refactoring/makeClassStatic/simpleWithFields_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/simpleWithFields_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/simpleWithFields_after.java

diff --git a/testData/refactoring/makeClassStatic/simple_after.java b/java/java-tests/testData/refactoring/makeClassStatic/simple_after.java
similarity index 100%
rename from testData/refactoring/makeClassStatic/simple_after.java
rename to java/java-tests/testData/refactoring/makeClassStatic/simple_after.java

diff --git a/refactoring/tests/com/intellij/refactoring/MakeClassStaticTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
similarity index 90%
rename from refactoring/tests/com/intellij/refactoring/MakeClassStaticTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
index a22b1695ca5690c7eeef4655ce94053aa53cdb71..beb91f535493af10f38107a728893a62d7c04543 100644 (file)
--- a/refactoring/tests/com/intellij/refactoring/MakeClassStaticTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
@@ -3,7 +3,6 @@
  */
 package com.intellij.refactoring;
 
-import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.codeInsight.TargetElementUtilBase;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
@@ -13,12 +12,19 @@ import com.intellij.refactoring.makeStatic.MakeClassStaticProcessor;
 import com.intellij.refactoring.makeStatic.MakeStaticUtil;
 import com.intellij.refactoring.makeStatic.Settings;
 import com.intellij.refactoring.util.ParameterTablePanel;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.JavaTestUtil;
 
 import java.util.ArrayList;
 
-public class MakeClassStaticTest extends CodeInsightTestCase {
+public class MakeClassStaticTest extends LightCodeInsightTestCase {
   private static final String TEST_ROOT = "/refactoring/makeClassStatic/";
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   public void testSimple() throws Exception { perform(); }
 
   public void testSimpleWithFields() throws Exception { performWithFields(); }
@@ -56,7 +62,7 @@ public class MakeClassStaticTest extends CodeInsightTestCase {
     boolean addClassParameter = MakeStaticUtil.isParameterNeeded(aClass);
 
     new MakeClassStaticProcessor(
-            myProject,
+            getProject(),
             aClass,
             new Settings(true, addClassParameter ? "anObject" : null, null)).run();
     checkResultByFile(TEST_ROOT + getTestName(true) + "_after.java");
@@ -71,7 +77,7 @@ public class MakeClassStaticTest extends CodeInsightTestCase {
     final boolean addClassParameter = MakeStaticUtil.buildVariableData(aClass, parametersForFields);
 
     new MakeClassStaticProcessor(
-            myProject,
+            getProject(),
             aClass,
             new Settings(true, addClassParameter ? "anObject" : null,
                          parametersForFields.toArray(