diff --git a/testData/refactoring/moveClassToInner/contextChange1/after/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/after/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/contextChange1/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange1/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/contextChange1/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/after/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/contextChange1/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange1/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/contextChange1/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange1/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange1/before/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange2/after/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/after/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/contextChange2/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange2/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/contextChange2/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/after/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/contextChange2/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/contextChange2/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/contextChange2/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/contextChange2/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/contextChange2/before/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/duplicateInner/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/duplicateInner/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/duplicateInner/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/duplicateInner/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/duplicateInner/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/duplicateInner/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/duplicateInner/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/duplicateInner/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/innerImport/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/innerImport/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/innerImport/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/innerImport/after/packUser/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/packUser/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/after/packUser/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/after/packUser/Class2.java diff --git a/testData/refactoring/moveClassToInner/innerImport/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/innerImport/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/innerImport/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/innerImport/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/innerImport/before/packUser/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/packUser/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/innerImport/before/packUser/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/innerImport/before/packUser/Class2.java diff --git a/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveIntoPrivateInnerClass/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/after/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/moveMultiple1/before/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/nonJava/after/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/after/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/after/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/after/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/nonJava/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/nonJava/after/qqq.txt b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/after/qqq.txt similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/after/qqq.txt rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/after/qqq.txt diff --git a/testData/refactoring/moveClassToInner/nonJava/before/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/before/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/nonJava/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/nonJava/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/nonJava/before/qqq.txt b/java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/qqq.txt similarity index 100% rename from testData/refactoring/moveClassToInner/nonJava/before/qqq.txt rename to java/java-tests/testData/refactoring/moveClassToInner/nonJava/before/qqq.txt diff --git a/testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class2.java b/java/java-tests/testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class2.java similarity index 100% rename from testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class2.java rename to java/java-tests/testData/refactoring/moveClassToInner/packageLocalClass/before/pack1/Class2.java diff --git a/testData/refactoring/moveClassToInner/packageLocalClass/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/packageLocalClass/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/packageLocalClass/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/packageLocalClass/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/refToConstructor/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToConstructor/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/after/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/refToConstructor/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/after/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToConstructor/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/refToConstructor/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToConstructor/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/refToConstructor/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToConstructor/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToConstructor/before/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToInner/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToInner/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/after/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/after/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/after/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/refToInner/after/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/after/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/after/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/after/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToInner/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/refToInner/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/refToInner/before/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack2/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/before/pack2/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack2/A.java diff --git a/testData/refactoring/moveClassToInner/refToInner/before/pack2/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack2/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/refToInner/before/pack2/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/refToInner/before/pack2/empty.txt diff --git a/testData/refactoring/moveClassToInner/secondaryClass/after/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/after/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/secondaryClass/after/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/after/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/secondaryClass/after/pack1/User.java b/java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/after/pack1/User.java similarity index 100% rename from testData/refactoring/moveClassToInner/secondaryClass/after/pack1/User.java rename to java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/after/pack1/User.java diff --git a/testData/refactoring/moveClassToInner/secondaryClass/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/secondaryClass/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/secondaryClass/before/pack1/User.java b/java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/before/pack1/User.java similarity index 100% rename from testData/refactoring/moveClassToInner/secondaryClass/before/pack1/User.java rename to java/java-tests/testData/refactoring/moveClassToInner/secondaryClass/before/pack1/User.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/after/Client.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/after/Client.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/after/Client.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/after/Client.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/before/Client.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/Client.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/before/Client.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/Client.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments/before/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/after/pack1/empty.txt diff --git a/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/A.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/A.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/A.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/A.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/Class1.java b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/Class1.java similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/Class1.java rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/Class1.java diff --git a/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/empty.txt b/java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/empty.txt similarity index 100% rename from testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/empty.txt rename to java/java-tests/testData/refactoring/moveClassToInner/stringsAndComments2/before/pack1/empty.txt diff --git a/refactoring/tests/com/intellij/refactoring/MoveClassToInnerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java similarity index 97% rename from refactoring/tests/com/intellij/refactoring/MoveClassToInnerTest.java rename to java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java index 47c9877cb6a0..4c7c87e4335d 100644 --- a/refactoring/tests/com/intellij/refactoring/MoveClassToInnerTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java @@ -1,8 +1,7 @@ package com.intellij.refactoring; +import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightTestCase; -import com.intellij.testFramework.IdeaTestUtil; -import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.LocalFileSystem; @@ -12,6 +11,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.search.ProjectScope; import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor; +import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.PsiTestUtil; import com.intellij.usageView.UsageInfo; @@ -104,7 +104,7 @@ public class MoveClassToInnerTest extends CodeInsightTestCase { } private String getRoot() { - return PathManagerEx.getTestDataPath()+ "/refactoring/moveClassToInner/" + getTestName(true); + return JavaTestUtil.getJavaTestDataPath() + "/refactoring/moveClassToInner/" + getTestName(true); } private void doTestConflicts(String className, String targetClassName, String... expectedConflicts) throws Exception {