test++

diff --git a/testData/refactoring/movePackage/insidePackage/after/a/b/a/A.java b/java/java-tests/testData/refactoring/movePackage/insidePackage/after/a/b/a/A.java
similarity index 100%
rename from testData/refactoring/movePackage/insidePackage/after/a/b/a/A.java
rename to java/java-tests/testData/refactoring/movePackage/insidePackage/after/a/b/a/A.java

diff --git a/testData/refactoring/movePackage/insidePackage/after/a/b/a/b/empty.txt b/java/java-tests/testData/refactoring/movePackage/insidePackage/after/a/b/a/b/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/insidePackage/after/a/b/a/b/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/insidePackage/after/a/b/a/b/empty.txt

diff --git a/testData/refactoring/movePackage/insidePackage/before/a/A.java b/java/java-tests/testData/refactoring/movePackage/insidePackage/before/a/A.java
similarity index 100%
rename from testData/refactoring/movePackage/insidePackage/before/a/A.java
rename to java/java-tests/testData/refactoring/movePackage/insidePackage/before/a/A.java

diff --git a/testData/refactoring/movePackage/insidePackage/before/a/b/empty.txt b/java/java-tests/testData/refactoring/movePackage/insidePackage/before/a/b/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/insidePackage/before/a/b/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/insidePackage/before/a/b/empty.txt

diff --git a/testData/refactoring/movePackage/moveSingle/after/pack2/User1.java b/java/java-tests/testData/refactoring/movePackage/moveSingle/after/pack2/User1.java
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/after/pack2/User1.java
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/after/pack2/User1.java

diff --git a/testData/refactoring/movePackage/moveSingle/after/pack2/User2.java b/java/java-tests/testData/refactoring/movePackage/moveSingle/after/pack2/User2.java
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/after/pack2/User2.java
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/after/pack2/User2.java

diff --git a/testData/refactoring/movePackage/moveSingle/after/target/empty.txt b/java/java-tests/testData/refactoring/movePackage/moveSingle/after/target/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/after/target/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/after/target/empty.txt

diff --git a/testData/refactoring/movePackage/moveSingle/after/target/pack1/Class1.java b/java/java-tests/testData/refactoring/movePackage/moveSingle/after/target/pack1/Class1.java
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/after/target/pack1/Class1.java
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/after/target/pack1/Class1.java

diff --git a/testData/refactoring/movePackage/moveSingle/before/pack1/Class1.java b/java/java-tests/testData/refactoring/movePackage/moveSingle/before/pack1/Class1.java
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/before/pack1/Class1.java
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/before/pack1/Class1.java

diff --git a/testData/refactoring/movePackage/moveSingle/before/pack2/User1.java b/java/java-tests/testData/refactoring/movePackage/moveSingle/before/pack2/User1.java
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/before/pack2/User1.java
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/before/pack2/User1.java

diff --git a/testData/refactoring/movePackage/moveSingle/before/pack2/User2.java b/java/java-tests/testData/refactoring/movePackage/moveSingle/before/pack2/User2.java
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/before/pack2/User2.java
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/before/pack2/User2.java

diff --git a/testData/refactoring/movePackage/moveSingle/before/target/empty.txt b/java/java-tests/testData/refactoring/movePackage/moveSingle/before/target/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/moveSingle/before/target/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/moveSingle/before/target/empty.txt

diff --git a/testData/refactoring/movePackage/qualifiedRef/after/Usage.java b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/Usage.java
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/after/Usage.java
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/Usage.java

diff --git a/testData/refactoring/movePackage/qualifiedRef/after/package1/empty.txt b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/package1/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/after/package1/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/package1/empty.txt

diff --git a/testData/refactoring/movePackage/qualifiedRef/after/package2/empty.txt b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/package2/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/after/package2/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/package2/empty.txt

diff --git a/testData/refactoring/movePackage/qualifiedRef/after/package2/test/A.java b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/package2/test/A.java
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/after/package2/test/A.java
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/after/package2/test/A.java

diff --git a/testData/refactoring/movePackage/qualifiedRef/before/Usage.java b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/Usage.java
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/before/Usage.java
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/Usage.java

diff --git a/testData/refactoring/movePackage/qualifiedRef/before/package1/empty.txt b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/package1/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/before/package1/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/package1/empty.txt

diff --git a/testData/refactoring/movePackage/qualifiedRef/before/package1/test/A.java b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/package1/test/A.java
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/before/package1/test/A.java
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/package1/test/A.java

diff --git a/testData/refactoring/movePackage/qualifiedRef/before/package2/empty.txt b/java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/package2/empty.txt
similarity index 100%
rename from testData/refactoring/movePackage/qualifiedRef/before/package2/empty.txt
rename to java/java-tests/testData/refactoring/movePackage/qualifiedRef/before/package2/empty.txt

diff --git a/refactoring/tests/com/intellij/refactoring/MovePackageTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java
similarity index 87%
rename from refactoring/tests/com/intellij/refactoring/MovePackageTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java
index 48ea1e5bcfcf4fbfc93404db3414e0bea67df85e..1a83426c3a42745f552d451825b0167ef1af49e3 100644 (file)
--- a/refactoring/tests/com/intellij/refactoring/MovePackageTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java
@@ -7,9 +7,15 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiPackage;
 import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor;
 import com.intellij.refactoring.move.moveClassesOrPackages.SingleSourceRootMoveDestination;
+import com.intellij.JavaTestUtil;
 
 public class MovePackageTest extends MultiFileTestCase {
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   public void testMoveSingle() throws Exception {
     doTest(new String[]{"pack1"}, "target");
   }
@@ -34,12 +40,12 @@ public class MovePackageTest extends MultiFileTestCase {
   private void doTest(final String[] packageNames, final String newPackageName) throws Exception {
     doTest(new PerformAction() {
       public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
-        MovePackageTest.this.performAction(rootDir, packageNames, newPackageName);
+        MovePackageTest.this.performAction(packageNames, newPackageName);
       }
     });
   }
 
-  private void performAction(VirtualFile rootDir, String[] packageNames, String newPackageName) throws Exception {
+  private void performAction(String[] packageNames, String newPackageName) throws Exception {
     final PsiPackage[] packages = new PsiPackage[packageNames.length];
     for (int i = 0; i < packages.length; i++) {
       String packageName = packageNames[i];