diff --git a/testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorChain/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/constructorChain/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorChain/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/constructorChain/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorChain/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/constructorTree/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorTree/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/constructorTree/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorTree/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/constructorTree/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorTree/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/constructorTree/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/constructorTree/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingEmptyBuilder/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingHalfEmptyBuilder/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/existingVoidSettersBuilder/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/generics/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/generics/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/generics/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/generics/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/generics/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/generics/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/generics/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/generics/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/generics/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/generics/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/generics/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/generics/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/multipleParams/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/multipleParams/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/multipleParams/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/multipleParams/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/multipleParams/before/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/varargs/after/Builder.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/varargs/after/Builder.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/varargs/after/Builder.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/varargs/after/Builder.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/varargs/after/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/varargs/after/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/varargs/after/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/varargs/after/Test.java diff --git a/testData/refactoring/replaceConstructorWithBuilder/varargs/before/Test.java b/java/java-tests/testData/refactoring/replaceConstructorWithBuilder/varargs/before/Test.java similarity index 100% rename from testData/refactoring/replaceConstructorWithBuilder/varargs/before/Test.java rename to java/java-tests/testData/refactoring/replaceConstructorWithBuilder/varargs/before/Test.java diff --git a/refactoring/tests/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java similarity index 96% rename from refactoring/tests/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java rename to java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java index 7b1ecb071c50..832fbd98c9fd 100644 --- a/refactoring/tests/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java @@ -13,11 +13,16 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.replaceConstructorWithBuilder.ParameterData; import com.intellij.refactoring.replaceConstructorWithBuilder.ReplaceConstructorWithBuilderProcessor; import com.intellij.util.containers.HashMap; +import com.intellij.JavaTestUtil; import java.util.LinkedHashMap; import java.util.Map; public class ReplaceConstructorWithBuilderTest extends MultiFileTestCase { + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath(); + } public void testVarargs() throws Exception { doTest(true);