diff --git a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java index cfae8194db9f..33d3c8780f1f 100644 --- a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java @@ -53,7 +53,7 @@ import java.io.File; super.setUp(); myTempDirectory = FileUtil.createTempDirectory(getTestName(true), "test"); myFilesToDelete.add(getTestContentFile()); - final File testRoot = new File(PathManagerEx.getTestDataPath(), getTestPath()); + final File testRoot = new File(getTestDataPath(), getTestPath()); assertTrue(testRoot.getAbsolutePath(), testRoot.isDirectory()); final File currentTestRoot = new File(testRoot, getTestDirectoryName()); @@ -69,6 +69,10 @@ import java.io.File; } + protected String getTestDataPath() { + return PathManagerEx.getTestDataPath(); + } + protected abstract String getTestPath(); private File getTestContentFile() { diff --git a/testData/projectView/standardProviders/src/com/package1/Class1.java b/plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Class1.java similarity index 100% rename from testData/projectView/standardProviders/src/com/package1/Class1.java rename to plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Class1.java diff --git a/testData/projectView/standardProviders/src/com/package1/Class2.java b/plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Class2.java similarity index 100% rename from testData/projectView/standardProviders/src/com/package1/Class2.java rename to plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Class2.java diff --git a/testData/projectView/standardProviders/src/com/package1/Class4.java b/plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Class4.java similarity index 100% rename from testData/projectView/standardProviders/src/com/package1/Class4.java rename to plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Class4.java diff --git a/testData/projectView/standardProviders/src/com/package1/Form1.form b/plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Form1.form similarity index 100% rename from testData/projectView/standardProviders/src/com/package1/Form1.form rename to plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Form1.form diff --git a/testData/projectView/standardProviders/src/com/package1/Form1.java b/plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Form1.java similarity index 100% rename from testData/projectView/standardProviders/src/com/package1/Form1.java rename to plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Form1.java diff --git a/testData/projectView/standardProviders/src/com/package1/Form2.form b/plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Form2.form similarity index 100% rename from testData/projectView/standardProviders/src/com/package1/Form2.form rename to plugins/ui-designer/testData/projectView/standardProviders/src/com/package1/Form2.form diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java index 91c069502d93..66a28496f44a 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java @@ -2,6 +2,7 @@ package com.intellij.uiDesigner.projectView; import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane; import com.intellij.ide.projectView.impl.ClassesTreeStructureProvider; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.projectView.BaseProjectViewTestCase; import com.intellij.psi.PsiClass; @@ -10,6 +11,10 @@ import com.intellij.psi.PsiJavaFile; public class FormMergerTreeStructureProviderTest extends BaseProjectViewTestCase { + @Override + protected String getTestDataPath() { + return PluginPathManager.getPluginHomePath("ui-designer") + "/testData"; + } public void testStandardProviders() { final AbstractProjectViewPSIPane pane = createPane();