test++

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

diff --git a/testData/refactoring/extractMethodObject/FieldUsage.java.after b/java/java-tests/testData/refactoring/extractMethodObject/FieldUsage.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/FieldUsage.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/FieldUsage.java.after

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

diff --git a/testData/refactoring/extractMethodObject/MethodInHierarchy.java.after b/java/java-tests/testData/refactoring/extractMethodObject/MethodInHierarchy.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/MethodInHierarchy.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/MethodInHierarchy.java.after

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

diff --git a/testData/refactoring/extractMethodObject/MethodInHierarchyReturn.java.after b/java/java-tests/testData/refactoring/extractMethodObject/MethodInHierarchyReturn.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/MethodInHierarchyReturn.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/MethodInHierarchyReturn.java.after

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

diff --git a/testData/refactoring/extractMethodObject/Qualifier.java.after b/java/java-tests/testData/refactoring/extractMethodObject/Qualifier.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/Qualifier.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/Qualifier.java.after

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

diff --git a/testData/refactoring/extractMethodObject/Recursion.java.after b/java/java-tests/testData/refactoring/extractMethodObject/Recursion.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/Recursion.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/Recursion.java.after

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

diff --git a/testData/refactoring/extractMethodObject/Static.java.after b/java/java-tests/testData/refactoring/extractMethodObject/Static.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/Static.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/Static.java.after

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

diff --git a/testData/refactoring/extractMethodObject/StaticTypeParams.java.after b/java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParams.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/StaticTypeParams.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParams.java.after

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

diff --git a/testData/refactoring/extractMethodObject/StaticTypeParamsRecursive.java.after b/java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParamsRecursive.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/StaticTypeParamsRecursive.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParamsRecursive.java.after

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

diff --git a/testData/refactoring/extractMethodObject/StaticTypeParamsReturn.java.after b/java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParamsReturn.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/StaticTypeParamsReturn.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParamsReturn.java.after

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

diff --git a/testData/refactoring/extractMethodObject/StaticTypeParamsReturnNoDelete.java.after b/java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParamsReturnNoDelete.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/StaticTypeParamsReturnNoDelete.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/StaticTypeParamsReturnNoDelete.java.after

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

diff --git a/testData/refactoring/extractMethodObject/TypeParams.java.after b/java/java-tests/testData/refactoring/extractMethodObject/TypeParams.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/TypeParams.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/TypeParams.java.after

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

diff --git a/testData/refactoring/extractMethodObject/TypeParamsReturn.java.after b/java/java-tests/testData/refactoring/extractMethodObject/TypeParamsReturn.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/TypeParamsReturn.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/TypeParamsReturn.java.after

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

diff --git a/testData/refactoring/extractMethodObject/Varargs.java.after b/java/java-tests/testData/refactoring/extractMethodObject/Varargs.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/Varargs.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/Varargs.java.after

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

diff --git a/testData/refactoring/extractMethodObject/WrapWithObject.java.after b/java/java-tests/testData/refactoring/extractMethodObject/WrapWithObject.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/WrapWithObject.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/WrapWithObject.java.after

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

diff --git a/testData/refactoring/extractMethodObject/WrapWithObjectRecursive.java.after b/java/java-tests/testData/refactoring/extractMethodObject/WrapWithObjectRecursive.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/WrapWithObjectRecursive.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/WrapWithObjectRecursive.java.after

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java.after b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/InputOutput.java.after

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java.after b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarations.java.after

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java.after b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/OutputVarsReferences.java.after

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java

diff --git a/testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java.after b/java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java.after
similarity index 100%
rename from testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java.after
rename to java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/StaticInner.java.after

diff --git a/refactoring/tests/com/intellij/refactoring/ExtractMethodObjectTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java
similarity index 95%
rename from refactoring/tests/com/intellij/refactoring/ExtractMethodObjectTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java
index 3a108a117db47f59321b0955d84256a785326c8e..cb3c1230c0218b0a6556f1ffa0c2ce6e00113f29 100644 (file)
--- a/refactoring/tests/com/intellij/refactoring/ExtractMethodObjectTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java
@@ -10,8 +10,13 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
 import com.intellij.refactoring.extractMethodObject.ExtractMethodObjectProcessor;
 import com.intellij.refactoring.util.duplicates.DuplicatesImpl;
+import com.intellij.JavaTestUtil;
 
 public class ExtractMethodObjectTest extends CodeInsightTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
 
   private void doTest() throws Exception {
     doTest(true);

diff --git a/refactoring/tests/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java
similarity index 94%
rename from refactoring/tests/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java
index a6b72cba1aee3f18dcbca871e4542314e0edf74e..db68bebf6b27764fdfcea3d5795ac2e1090a9a1b 100644 (file)
--- a/refactoring/tests/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java
@@ -10,8 +10,13 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiExpression;
 import com.intellij.refactoring.extractMethodObject.ExtractMethodObjectProcessor;
 import com.intellij.refactoring.util.duplicates.DuplicatesImpl;
+import com.intellij.JavaTestUtil;
 
 public class ExtractMethodObjectWithMultipleExitPointsTest extends CodeInsightTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
 
   private void doTest() throws Exception {
     doTest(true);