diff --git a/testData/refactoring/renameUIRelated/renameBoundField/after/UIClass.java b/plugins/ui-designer/testData/renameUIRelated/renameBoundField/after/UIClass.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameBoundField/after/UIClass.java rename to plugins/ui-designer/testData/renameUIRelated/renameBoundField/after/UIClass.java diff --git a/testData/refactoring/renameUIRelated/renameBoundField/after/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renameBoundField/after/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameBoundField/after/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renameBoundField/after/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renameBoundField/before/UIClass.java b/plugins/ui-designer/testData/renameUIRelated/renameBoundField/before/UIClass.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameBoundField/before/UIClass.java rename to plugins/ui-designer/testData/renameUIRelated/renameBoundField/before/UIClass.java diff --git a/testData/refactoring/renameUIRelated/renameBoundField/before/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renameBoundField/before/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameBoundField/before/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renameBoundField/before/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renameEnumConstant/after/CustomComponent.java b/plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/after/CustomComponent.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameEnumConstant/after/CustomComponent.java rename to plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/after/CustomComponent.java diff --git a/testData/refactoring/renameUIRelated/renameEnumConstant/after/PropEnum.java b/plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/after/PropEnum.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameEnumConstant/after/PropEnum.java rename to plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/after/PropEnum.java diff --git a/testData/refactoring/renameUIRelated/renameEnumConstant/after/form.form b/plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/after/form.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameEnumConstant/after/form.form rename to plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/after/form.form diff --git a/testData/refactoring/renameUIRelated/renameEnumConstant/before/CustomComponent.java b/plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/before/CustomComponent.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameEnumConstant/before/CustomComponent.java rename to plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/before/CustomComponent.java diff --git a/testData/refactoring/renameUIRelated/renameEnumConstant/before/PropEnum.java b/plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/before/PropEnum.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameEnumConstant/before/PropEnum.java rename to plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/before/PropEnum.java diff --git a/testData/refactoring/renameUIRelated/renameEnumConstant/before/form.form b/plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/before/form.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameEnumConstant/before/form.form rename to plugins/ui-designer/testData/renameUIRelated/renameEnumConstant/before/form.form diff --git a/testData/refactoring/renameUIRelated/renameImage/after/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renameImage/after/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameImage/after/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renameImage/after/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renameImage/after/org/withoutForms/child/specificClass.png b/plugins/ui-designer/testData/renameUIRelated/renameImage/after/org/withoutForms/child/specificClass.png similarity index 100% rename from testData/refactoring/renameUIRelated/renameImage/after/org/withoutForms/child/specificClass.png rename to plugins/ui-designer/testData/renameUIRelated/renameImage/after/org/withoutForms/child/specificClass.png diff --git a/testData/refactoring/renameUIRelated/renameImage/before/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renameImage/before/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameImage/before/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renameImage/before/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renameImage/before/org/withoutForms/child/abstractClass.png b/plugins/ui-designer/testData/renameUIRelated/renameImage/before/org/withoutForms/child/abstractClass.png similarity index 100% rename from testData/refactoring/renameUIRelated/renameImage/before/org/withoutForms/child/abstractClass.png rename to plugins/ui-designer/testData/renameUIRelated/renameImage/before/org/withoutForms/child/abstractClass.png diff --git a/testData/refactoring/renameUIRelated/renameNestedForm/after/p1/Dialog.form b/plugins/ui-designer/testData/renameUIRelated/renameNestedForm/after/p1/Dialog.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameNestedForm/after/p1/Dialog.form rename to plugins/ui-designer/testData/renameUIRelated/renameNestedForm/after/p1/Dialog.form diff --git a/testData/refactoring/renameUIRelated/renameNestedForm/after/p1/Form1.java b/plugins/ui-designer/testData/renameUIRelated/renameNestedForm/after/p1/Form1.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameNestedForm/after/p1/Form1.java rename to plugins/ui-designer/testData/renameUIRelated/renameNestedForm/after/p1/Form1.java diff --git a/testData/refactoring/renameUIRelated/renameNestedForm/after/p1/Form2.form b/plugins/ui-designer/testData/renameUIRelated/renameNestedForm/after/p1/Form2.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameNestedForm/after/p1/Form2.form rename to plugins/ui-designer/testData/renameUIRelated/renameNestedForm/after/p1/Form2.form diff --git a/testData/refactoring/renameUIRelated/renameNestedForm/before/p1/Dialog.form b/plugins/ui-designer/testData/renameUIRelated/renameNestedForm/before/p1/Dialog.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameNestedForm/before/p1/Dialog.form rename to plugins/ui-designer/testData/renameUIRelated/renameNestedForm/before/p1/Dialog.form diff --git a/testData/refactoring/renameUIRelated/renameNestedForm/before/p1/Form1.form b/plugins/ui-designer/testData/renameUIRelated/renameNestedForm/before/p1/Form1.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameNestedForm/before/p1/Form1.form rename to plugins/ui-designer/testData/renameUIRelated/renameNestedForm/before/p1/Form1.form diff --git a/testData/refactoring/renameUIRelated/renameNestedForm/before/p1/Form1.java b/plugins/ui-designer/testData/renameUIRelated/renameNestedForm/before/p1/Form1.java similarity index 100% rename from testData/refactoring/renameUIRelated/renameNestedForm/before/p1/Form1.java rename to plugins/ui-designer/testData/renameUIRelated/renameNestedForm/before/p1/Form1.java diff --git a/testData/refactoring/renameUIRelated/renamePackage/after/org/Messages.properties b/plugins/ui-designer/testData/renameUIRelated/renamePackage/after/org/Messages.properties similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackage/after/org/Messages.properties rename to plugins/ui-designer/testData/renameUIRelated/renamePackage/after/org/Messages.properties diff --git a/testData/refactoring/renameUIRelated/renamePackage/after/org/UIClass.java b/plugins/ui-designer/testData/renameUIRelated/renamePackage/after/org/UIClass.java similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackage/after/org/UIClass.java rename to plugins/ui-designer/testData/renameUIRelated/renamePackage/after/org/UIClass.java diff --git a/testData/refactoring/renameUIRelated/renamePackage/after/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renamePackage/after/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackage/after/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackage/after/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renamePackage/before/gov/Messages.properties b/plugins/ui-designer/testData/renameUIRelated/renamePackage/before/gov/Messages.properties similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackage/before/gov/Messages.properties rename to plugins/ui-designer/testData/renameUIRelated/renamePackage/before/gov/Messages.properties diff --git a/testData/refactoring/renameUIRelated/renamePackage/before/gov/UIClass.java b/plugins/ui-designer/testData/renameUIRelated/renamePackage/before/gov/UIClass.java similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackage/before/gov/UIClass.java rename to plugins/ui-designer/testData/renameUIRelated/renamePackage/before/gov/UIClass.java diff --git a/testData/refactoring/renameUIRelated/renamePackage/before/gov/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renamePackage/before/gov/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackage/before/gov/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackage/before/gov/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/after/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/after/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.form b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.form diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.java b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.java similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.java rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/Form1.java diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/Messages.properties b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/Messages.properties similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/Messages.properties rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/Messages.properties diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/abstractClass.png b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/abstractClass.png similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/after/org/withForms/child/abstractClass.png rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/after/org/withForms/child/abstractClass.png diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/before/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/before/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.form b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.form diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.java b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.java similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.java rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Form1.java diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Messages.properties b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Messages.properties similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Messages.properties rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/Messages.properties diff --git a/testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/abstractClass.png b/plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/abstractClass.png similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageNested/before/org/withoutForms/child/abstractClass.png rename to plugins/ui-designer/testData/renameUIRelated/renamePackageNested/before/org/withoutForms/child/abstractClass.png diff --git a/testData/refactoring/renameUIRelated/renamePackageWithComponentClass/after/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/after/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageWithComponentClass/after/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/after/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renamePackageWithComponentClass/after/org/withForms/child/MyComponent.java b/plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/after/org/withForms/child/MyComponent.java similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageWithComponentClass/after/org/withForms/child/MyComponent.java rename to plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/after/org/withForms/child/MyComponent.java diff --git a/testData/refactoring/renameUIRelated/renamePackageWithComponentClass/before/org/UIForm.form b/plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/before/org/UIForm.form similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageWithComponentClass/before/org/UIForm.form rename to plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/before/org/UIForm.form diff --git a/testData/refactoring/renameUIRelated/renamePackageWithComponentClass/before/org/withoutForms/child/MyComponent.java b/plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/before/org/withoutForms/child/MyComponent.java similarity index 100% rename from testData/refactoring/renameUIRelated/renamePackageWithComponentClass/before/org/withoutForms/child/MyComponent.java rename to plugins/ui-designer/testData/renameUIRelated/renamePackageWithComponentClass/before/org/withoutForms/child/MyComponent.java diff --git a/testData/refactoring/renameUIRelated/renameResourceBundle/after/F2.properties b/plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/after/F2.properties similarity index 100% rename from testData/refactoring/renameUIRelated/renameResourceBundle/after/F2.properties rename to plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/after/F2.properties diff --git a/testData/refactoring/renameUIRelated/renameResourceBundle/after/form.form b/plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/after/form.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameResourceBundle/after/form.form rename to plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/after/form.form diff --git a/testData/refactoring/renameUIRelated/renameResourceBundle/before/F1.properties b/plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/before/F1.properties similarity index 100% rename from testData/refactoring/renameUIRelated/renameResourceBundle/before/F1.properties rename to plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/before/F1.properties diff --git a/testData/refactoring/renameUIRelated/renameResourceBundle/before/form.form b/plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/before/form.form similarity index 100% rename from testData/refactoring/renameUIRelated/renameResourceBundle/before/form.form rename to plugins/ui-designer/testData/renameUIRelated/renameResourceBundle/before/form.form diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java index a781c1a8bc27..b55ffb3712c0 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java @@ -4,6 +4,7 @@ import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.search.ProjectScope; @@ -16,7 +17,12 @@ import junit.framework.Assert; */ public class RenameUIRelatedTest extends MultiFileTestCase { protected String getTestRoot() { - return "/refactoring/renameUIRelated/"; + return "/renameUIRelated/"; + } + + @Override + protected String getTestDataPath() { + return PluginPathManager.getPluginHomePath("ui-designer") + "/testData"; } @Override