diff --git a/testData/uiDesigner/BindingTest.java b/plugins/ui-designer/testData/BindingTest.java similarity index 100% rename from testData/uiDesigner/BindingTest.java rename to plugins/ui-designer/testData/BindingTest.java diff --git a/testData/uiDesigner/ChainedConstructorTest.java b/plugins/ui-designer/testData/ChainedConstructorTest.java similarity index 100% rename from testData/uiDesigner/ChainedConstructorTest.java rename to plugins/ui-designer/testData/ChainedConstructorTest.java diff --git a/testData/uiDesigner/ConditionalMethodCallTest.java b/plugins/ui-designer/testData/ConditionalMethodCallTest.java similarity index 100% rename from testData/uiDesigner/ConditionalMethodCallTest.java rename to plugins/ui-designer/testData/ConditionalMethodCallTest.java diff --git a/testData/uiDesigner/FieldReferenceTest.java b/plugins/ui-designer/testData/FieldReferenceTest.java similarity index 100% rename from testData/uiDesigner/FieldReferenceTest.java rename to plugins/ui-designer/testData/FieldReferenceTest.java diff --git a/testData/uiDesigner/MethodCallInSuperTest.java b/plugins/ui-designer/testData/MethodCallInSuperTest.java similarity index 100% rename from testData/uiDesigner/MethodCallInSuperTest.java rename to plugins/ui-designer/testData/MethodCallInSuperTest.java diff --git a/testData/uiDesigner/TestBorder.form b/plugins/ui-designer/testData/TestBorder.form similarity index 100% rename from testData/uiDesigner/TestBorder.form rename to plugins/ui-designer/testData/TestBorder.form diff --git a/testData/uiDesigner/TestChainedConstructor.form b/plugins/ui-designer/testData/TestChainedConstructor.form similarity index 100% rename from testData/uiDesigner/TestChainedConstructor.form rename to plugins/ui-designer/testData/TestChainedConstructor.form diff --git a/testData/uiDesigner/TestConditionalMethodCall.form b/plugins/ui-designer/testData/TestConditionalMethodCall.form similarity index 100% rename from testData/uiDesigner/TestConditionalMethodCall.form rename to plugins/ui-designer/testData/TestConditionalMethodCall.form diff --git a/testData/uiDesigner/TestDoubleProperty.form b/plugins/ui-designer/testData/TestDoubleProperty.form similarity index 100% rename from testData/uiDesigner/TestDoubleProperty.form rename to plugins/ui-designer/testData/TestDoubleProperty.form diff --git a/testData/uiDesigner/TestFieldReference.form b/plugins/ui-designer/testData/TestFieldReference.form similarity index 100% rename from testData/uiDesigner/TestFieldReference.form rename to plugins/ui-designer/testData/TestFieldReference.form diff --git a/testData/uiDesigner/TestFinalField.form b/plugins/ui-designer/testData/TestFinalField.form similarity index 100% rename from testData/uiDesigner/TestFinalField.form rename to plugins/ui-designer/testData/TestFinalField.form diff --git a/testData/uiDesigner/TestGridBag.form b/plugins/ui-designer/testData/TestGridBag.form similarity index 100% rename from testData/uiDesigner/TestGridBag.form rename to plugins/ui-designer/testData/TestGridBag.form diff --git a/testData/uiDesigner/TestGridBagSpacer.form b/plugins/ui-designer/testData/TestGridBagSpacer.form similarity index 100% rename from testData/uiDesigner/TestGridBagSpacer.form rename to plugins/ui-designer/testData/TestGridBagSpacer.form diff --git a/testData/uiDesigner/TestGridConstraints.form b/plugins/ui-designer/testData/TestGridConstraints.form similarity index 100% rename from testData/uiDesigner/TestGridConstraints.form rename to plugins/ui-designer/testData/TestGridConstraints.form diff --git a/testData/uiDesigner/TestIncompatibleTypeField.form b/plugins/ui-designer/testData/TestIncompatibleTypeField.form similarity index 100% rename from testData/uiDesigner/TestIncompatibleTypeField.form rename to plugins/ui-designer/testData/TestIncompatibleTypeField.form diff --git a/testData/uiDesigner/TestIntProperty.form b/plugins/ui-designer/testData/TestIntProperty.form similarity index 100% rename from testData/uiDesigner/TestIntProperty.form rename to plugins/ui-designer/testData/TestIntProperty.form diff --git a/testData/uiDesigner/TestLabelFor.form b/plugins/ui-designer/testData/TestLabelFor.form similarity index 100% rename from testData/uiDesigner/TestLabelFor.form rename to plugins/ui-designer/testData/TestLabelFor.form diff --git a/testData/uiDesigner/TestMethodCallInSuper.form b/plugins/ui-designer/testData/TestMethodCallInSuper.form similarity index 100% rename from testData/uiDesigner/TestMethodCallInSuper.form rename to plugins/ui-designer/testData/TestMethodCallInSuper.form diff --git a/testData/uiDesigner/TestMnemonics.form b/plugins/ui-designer/testData/TestMnemonics.form similarity index 100% rename from testData/uiDesigner/TestMnemonics.form rename to plugins/ui-designer/testData/TestMnemonics.form diff --git a/testData/uiDesigner/TestMnemonicsProperty.form b/plugins/ui-designer/testData/TestMnemonicsProperty.form similarity index 100% rename from testData/uiDesigner/TestMnemonicsProperty.form rename to plugins/ui-designer/testData/TestMnemonicsProperty.form diff --git a/testData/uiDesigner/TestNoSuchField.form b/plugins/ui-designer/testData/TestNoSuchField.form similarity index 100% rename from testData/uiDesigner/TestNoSuchField.form rename to plugins/ui-designer/testData/TestNoSuchField.form diff --git a/testData/uiDesigner/TestPrimitiveField.form b/plugins/ui-designer/testData/TestPrimitiveField.form similarity index 100% rename from testData/uiDesigner/TestPrimitiveField.form rename to plugins/ui-designer/testData/TestPrimitiveField.form diff --git a/testData/uiDesigner/TestScrollPane.form b/plugins/ui-designer/testData/TestScrollPane.form similarity index 100% rename from testData/uiDesigner/TestScrollPane.form rename to plugins/ui-designer/testData/TestScrollPane.form diff --git a/testData/uiDesigner/TestSimple.form b/plugins/ui-designer/testData/TestSimple.form similarity index 100% rename from testData/uiDesigner/TestSimple.form rename to plugins/ui-designer/testData/TestSimple.form diff --git a/testData/uiDesigner/TestSplitPane.form b/plugins/ui-designer/testData/TestSplitPane.form similarity index 100% rename from testData/uiDesigner/TestSplitPane.form rename to plugins/ui-designer/testData/TestSplitPane.form diff --git a/testData/uiDesigner/TestStaticField.form b/plugins/ui-designer/testData/TestStaticField.form similarity index 100% rename from testData/uiDesigner/TestStaticField.form rename to plugins/ui-designer/testData/TestStaticField.form diff --git a/testData/uiDesigner/TestTabbedPane.form b/plugins/ui-designer/testData/TestTabbedPane.form similarity index 100% rename from testData/uiDesigner/TestTabbedPane.form rename to plugins/ui-designer/testData/TestTabbedPane.form diff --git a/testData/uiDesigner/binding/classUsage/form.form b/plugins/ui-designer/testData/binding/classUsage/form.form similarity index 100% rename from testData/uiDesigner/binding/classUsage/form.form rename to plugins/ui-designer/testData/binding/classUsage/form.form diff --git a/testData/uiDesigner/binding/classUsage/test.properties b/plugins/ui-designer/testData/binding/classUsage/test.properties similarity index 100% rename from testData/uiDesigner/binding/classUsage/test.properties rename to plugins/ui-designer/testData/binding/classUsage/test.properties diff --git a/testData/uiDesigner/binding/enumUsage/form.form b/plugins/ui-designer/testData/binding/enumUsage/form.form similarity index 100% rename from testData/uiDesigner/binding/enumUsage/form.form rename to plugins/ui-designer/testData/binding/enumUsage/form.form diff --git a/testData/uiDesigner/binding/formPropertyUsage/form.form b/plugins/ui-designer/testData/binding/formPropertyUsage/form.form similarity index 100% rename from testData/uiDesigner/binding/formPropertyUsage/form.form rename to plugins/ui-designer/testData/binding/formPropertyUsage/form.form diff --git a/testData/uiDesigner/binding/formPropertyUsage/test.properties b/plugins/ui-designer/testData/binding/formPropertyUsage/test.properties similarity index 100% rename from testData/uiDesigner/binding/formPropertyUsage/test.properties rename to plugins/ui-designer/testData/binding/formPropertyUsage/test.properties diff --git a/testData/uiDesigner/binding/localizedPropertyFileUsage/form.form b/plugins/ui-designer/testData/binding/localizedPropertyFileUsage/form.form similarity index 100% rename from testData/uiDesigner/binding/localizedPropertyFileUsage/form.form rename to plugins/ui-designer/testData/binding/localizedPropertyFileUsage/form.form diff --git a/testData/uiDesigner/binding/localizedPropertyFileUsage/test_ru.properties b/plugins/ui-designer/testData/binding/localizedPropertyFileUsage/test_ru.properties similarity index 100% rename from testData/uiDesigner/binding/localizedPropertyFileUsage/test_ru.properties rename to plugins/ui-designer/testData/binding/localizedPropertyFileUsage/test_ru.properties diff --git a/testData/uiDesigner/binding/localizedPropertyUsage/form.form b/plugins/ui-designer/testData/binding/localizedPropertyUsage/form.form similarity index 100% rename from testData/uiDesigner/binding/localizedPropertyUsage/form.form rename to plugins/ui-designer/testData/binding/localizedPropertyUsage/form.form diff --git a/testData/uiDesigner/binding/localizedPropertyUsage/test_ru.properties b/plugins/ui-designer/testData/binding/localizedPropertyUsage/test_ru.properties similarity index 100% rename from testData/uiDesigner/binding/localizedPropertyUsage/test_ru.properties rename to plugins/ui-designer/testData/binding/localizedPropertyUsage/test_ru.properties diff --git a/testData/uiDesigner/binding/propertyFileUsage/form.form b/plugins/ui-designer/testData/binding/propertyFileUsage/form.form similarity index 100% rename from testData/uiDesigner/binding/propertyFileUsage/form.form rename to plugins/ui-designer/testData/binding/propertyFileUsage/form.form diff --git a/testData/uiDesigner/binding/propertyFileUsage/test.properties b/plugins/ui-designer/testData/binding/propertyFileUsage/test.properties similarity index 100% rename from testData/uiDesigner/binding/propertyFileUsage/test.properties rename to plugins/ui-designer/testData/binding/propertyFileUsage/test.properties diff --git a/testData/uiDesigner/formEmbedding/Ideadev14081/Embedded.form b/plugins/ui-designer/testData/formEmbedding/Ideadev14081/Embedded.form similarity index 100% rename from testData/uiDesigner/formEmbedding/Ideadev14081/Embedded.form rename to plugins/ui-designer/testData/formEmbedding/Ideadev14081/Embedded.form diff --git a/testData/uiDesigner/formEmbedding/Ideadev14081/Embedded.java b/plugins/ui-designer/testData/formEmbedding/Ideadev14081/Embedded.java similarity index 100% rename from testData/uiDesigner/formEmbedding/Ideadev14081/Embedded.java rename to plugins/ui-designer/testData/formEmbedding/Ideadev14081/Embedded.java diff --git a/testData/uiDesigner/formEmbedding/Ideadev14081/Main.form b/plugins/ui-designer/testData/formEmbedding/Ideadev14081/Main.form similarity index 100% rename from testData/uiDesigner/formEmbedding/Ideadev14081/Main.form rename to plugins/ui-designer/testData/formEmbedding/Ideadev14081/Main.form diff --git a/testData/uiDesigner/formEmbedding/Ideadev14081/Main.java b/plugins/ui-designer/testData/formEmbedding/Ideadev14081/Main.java similarity index 100% rename from testData/uiDesigner/formEmbedding/Ideadev14081/Main.java rename to plugins/ui-designer/testData/formEmbedding/Ideadev14081/Main.java diff --git a/testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/BindingTestAfter.java b/plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/BindingTestAfter.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/BindingTestAfter.java rename to plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/BindingTestAfter.java diff --git a/testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/constructorsCallingThis/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/constructorsCallingThis/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/customComponentReferencedInConstructor/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/customComponentReferencedInConstructor/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/customComponentReferencedInConstructor/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/customComponentReferencedInConstructor/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/customComponentReferencedInConstructor/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/customCreateComponent/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/customCreateComponent/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/customCreateComponent/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/customCreateComponent/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/customCreateComponent/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/customCreateComponent/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/customCreateComponent/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/customCreateComponent/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/customCreateComponent/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/customCreateComponent/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/customCreateComponent/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/customCreateComponent/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/duplicateSetupCall/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/duplicateSetupCall/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/duplicateSetupCall/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/duplicateSetupCall/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/duplicateSetupCall/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/duplicateSetupCall/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/duplicateSetupCall/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/duplicateSetupCall/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/duplicateSetupCall/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/duplicateSetupCall/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/duplicateSetupCall/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/duplicateSetupCall/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/methodCallInConstructor/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/methodCallInConstructor/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/methodCallInConstructor/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/methodCallInConstructor/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/methodCallInConstructor/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/methodCallInConstructor/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/methodCallInConstructor/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/methodCallInConstructor/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/methodCallInConstructor/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/methodCallInConstructor/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/methodCallInConstructor/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/methodCallInConstructor/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/multipleConstructors/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/multipleConstructors/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/multipleConstructors/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/multipleConstructors/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/multipleConstructors/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/multipleConstructors/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/multipleConstructors/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/multipleConstructors/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/multipleConstructors/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/multipleConstructors/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/multipleConstructors/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/multipleConstructors/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/simple/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/simple/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/simple/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/simple/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/simple/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/simple/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/simple/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/simple/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/simple/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/simple/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/simple/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/simple/Test.form diff --git a/testData/uiDesigner/sourceCodeGenerator/superCall/BindingTest.java b/plugins/ui-designer/testData/sourceCodeGenerator/superCall/BindingTest.java similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/superCall/BindingTest.java rename to plugins/ui-designer/testData/sourceCodeGenerator/superCall/BindingTest.java diff --git a/testData/uiDesigner/sourceCodeGenerator/superCall/BindingTest.java.after b/plugins/ui-designer/testData/sourceCodeGenerator/superCall/BindingTest.java.after similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/superCall/BindingTest.java.after rename to plugins/ui-designer/testData/sourceCodeGenerator/superCall/BindingTest.java.after diff --git a/testData/uiDesigner/sourceCodeGenerator/superCall/Test.form b/plugins/ui-designer/testData/sourceCodeGenerator/superCall/Test.form similarity index 100% rename from testData/uiDesigner/sourceCodeGenerator/superCall/Test.form rename to plugins/ui-designer/testData/sourceCodeGenerator/superCall/Test.form diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java index 327e64753635..1972fa17cca9 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java @@ -11,7 +11,7 @@ package com.intellij.uiDesigner.binding; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ex.PathManagerEx; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.LanguageLevelProjectExtension; @@ -36,7 +36,7 @@ public class FormEnumUsageTest extends PsiTestCase { new Runnable() { public void run() { try{ - String root = PathManagerEx.getTestDataPath() + "/uiDesigner/binding/" + getTestName(true); + String root = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/binding/" + getTestName(true); PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.5")); myTestProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java index a9cd7b4c7d57..4e1193ab71c7 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java @@ -7,16 +7,16 @@ package com.intellij.uiDesigner.binding; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.lang.properties.psi.Property; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ex.PathManagerEx; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiReference; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.testFramework.PsiTestCase; import com.intellij.testFramework.PsiTestUtil; -import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.PsiReference; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiClass; import com.intellij.util.Query; import javax.swing.*; @@ -35,7 +35,7 @@ public class FormPropertyUsageTest extends PsiTestCase { new Runnable() { public void run() { try{ - String root = PathManagerEx.getTestDataPath() + "/uiDesigner/binding/" + getTestName(true); + String root = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/binding/" + getTestName(true); PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); myTestProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java index e271b9094449..974715b67585 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java @@ -1,6 +1,6 @@ package com.intellij.uiDesigner.core; -import com.intellij.openapi.application.ex.PathManagerEx; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.util.io.FileUtil; import com.intellij.uiDesigner.compiler.AsmCodeGenerator; import com.intellij.uiDesigner.compiler.FormErrorInfo; @@ -44,7 +44,7 @@ public class AsmCodeGeneratorTest extends TestCase { } private AsmCodeGenerator initCodeGenerator(final String formFileName, final String className) throws Exception { - final String testDataPath = PathManagerEx.getTestDataPath() + File.separatorChar + "uiDesigner" + File.separatorChar; + final String testDataPath = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/"; return initCodeGenerator(formFileName, className, testDataPath); } @@ -286,7 +286,7 @@ public class AsmCodeGeneratorTest extends TestCase { public void testIdeadev14081() throws Exception { // NOTE: That doesn't really reproduce the bug as it's dependent on a particular instrumentation sequence used during form preview // (the nested form is instrumented with a new AsmCodeGenerator instance directly in the middle of instrumentation of the current form) - final String testDataPath = PathManagerEx.getTestDataPath() + File.separatorChar + "uiDesigner" + File.separatorChar + + final String testDataPath = PluginPathManager.getPluginHomePath("ui-designer") + File.separatorChar + "testData" + File.separatorChar + File.separatorChar + "formEmbedding" + File.separatorChar + "Ideadev14081" + File.separatorChar; AsmCodeGenerator embeddedClassGenerator = initCodeGenerator("Embedded.form", "Embedded", testDataPath); byte[] embeddedPatchedData = getVerifiedPatchedData(embeddedClassGenerator); diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java index 5752b9c3f0f1..83b3efc1945b 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java @@ -5,7 +5,7 @@ package com.intellij.uiDesigner.make; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ex.PathManagerEx; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.util.text.StringUtil; @@ -33,7 +33,7 @@ public class FormSourceCodeGeneratorTest extends PsiTestCase { new Runnable() { public void run() { try{ - String root = PathManagerEx.getTestDataPath() + "/uiDesigner/sourceCodeGenerator/" + getTestName(true); + String root = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/sourceCodeGenerator/" + getTestName(true); PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.5")); myTestProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); }