test++

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

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

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

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

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

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

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

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

diff --git a/refactoring/tests/com/intellij/refactoring/IntroduceConstantTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
similarity index 94%
rename from refactoring/tests/com/intellij/refactoring/IntroduceConstantTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
index 92c07f2ea42a8c68def2073ba4d3cd1c88cffefe..90b93a7ecb6c488ffd166ae19720460d3029a0f6 100644 (file)
--- a/refactoring/tests/com/intellij/refactoring/IntroduceConstantTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
@@ -1,5 +1,6 @@
 package com.intellij.refactoring;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
@@ -16,6 +17,11 @@ import org.jetbrains.annotations.NonNls;
 public class IntroduceConstantTest extends CodeInsightTestCase {
   @NonNls private static final String BASE_PATH = "/refactoring/introduceConstant/";
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   public void testInNonNls() throws Exception {
     doTest(false);
   }

diff --git a/refactoring/tests/com/intellij/refactoring/MockIntroduceConstantHandler.java b/java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceConstantHandler.java
similarity index 100%
rename from refactoring/tests/com/intellij/refactoring/MockIntroduceConstantHandler.java
rename to java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceConstantHandler.java

diff --git a/refactoring/tests/com/intellij/refactoring/MockLocalToFieldHandler.java b/java/java-tests/testSrc/com/intellij/refactoring/MockLocalToFieldHandler.java
similarity index 100%
rename from refactoring/tests/com/intellij/refactoring/MockLocalToFieldHandler.java
rename to java/java-tests/testSrc/com/intellij/refactoring/MockLocalToFieldHandler.java