test++

diff --git a/testData/refactoring/copyClass/libraryClass/Bar.java.expected b/java/java-tests/testData/refactoring/copyClass/libraryClass/Bar.java.expected
similarity index 100%
rename from testData/refactoring/copyClass/libraryClass/Bar.java.expected
rename to java/java-tests/testData/refactoring/copyClass/libraryClass/Bar.java.expected

diff --git a/testData/refactoring/copyClass/replaceAllOccurrences/Bar.java.expected b/java/java-tests/testData/refactoring/copyClass/replaceAllOccurrences/Bar.java.expected
similarity index 100%
rename from testData/refactoring/copyClass/replaceAllOccurrences/Bar.java.expected
rename to java/java-tests/testData/refactoring/copyClass/replaceAllOccurrences/Bar.java.expected

diff --git a/testData/refactoring/copyClass/replaceAllOccurrences/Foo.java b/java/java-tests/testData/refactoring/copyClass/replaceAllOccurrences/Foo.java
similarity index 100%
rename from testData/refactoring/copyClass/replaceAllOccurrences/Foo.java
rename to java/java-tests/testData/refactoring/copyClass/replaceAllOccurrences/Foo.java

diff --git a/refactoring/tests/com/intellij/refactoring/CopyClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java
similarity index 92%
rename from refactoring/tests/com/intellij/refactoring/CopyClassTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java
index 9f37e0a724fb11bacf17a89426c818ee2ee15951..8a5ce0a26771b02df6496c11a2529d5613dcd8db 100644 (file)
--- a/refactoring/tests/com/intellij/refactoring/CopyClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java
@@ -1,16 +1,16 @@
 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.VirtualFile;
-import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.psi.search.ProjectScope;
 import com.intellij.refactoring.copy.CopyClassesHandler;
+import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.util.IncorrectOperationException;
 
@@ -29,7 +29,7 @@ public class CopyClassTest extends CodeInsightTestCase {
   }
 
   private void doTest(final String oldName, final String copyName) throws Exception {
-    String root = PathManagerEx.getTestDataPath()+ "/refactoring/copyClass/" + getTestName(true);
+    String root = JavaTestUtil.getJavaTestDataPath() + "/refactoring/copyClass/" + getTestName(true);
 
     PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk15("java 1.5"));
     myRootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete);