From c0cb5a05ba866d2ebebae9d03b9a66f481094f99 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 31 Aug 2009 16:43:16 +0400 Subject: [PATCH] Ant finds its testdata after move --- .../application/PluginPathManager.java | 20 +++++++++++++++++++ .../intellij/lang/ant/AntCompletionTest.java | 7 ++----- .../lang/ant/AntMultiFileCompletionTest.java | 4 ++-- .../com/intellij/lang/ant/AntParsingTest.java | 4 ++-- .../com/intellij/lang/ant/AntRenameTest.java | 4 ++-- .../com/intellij/lang/ant/AntResolveTest.java | 4 ++-- .../intellij/lang/ant/CustomTypesTest.java | 4 ++-- 7 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java diff --git a/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java b/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java new file mode 100644 index 000000000000..fad8bcd1e299 --- /dev/null +++ b/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java @@ -0,0 +1,20 @@ +package com.intellij.openapi.application; + +import java.io.File; + +/** + * @author yole + */ +public class PluginPathManager { + private PluginPathManager() { + } + + public static String getPluginHomePath(String pluginName) { + String homePath = PathManager.getHomePath(); + File candidate = new File(homePath, "community/plugins/" + pluginName); + if (candidate.isDirectory()) { + return candidate.getPath(); + } + return new File(homePath, "plugins/" + pluginName).getPath(); + } +} diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java index f8a681f23db6..bde580be3cb0 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java @@ -6,16 +6,13 @@ import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.impl.TestLookupManager; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.testFramework.LightCodeInsightTestCase; -/** - * @author zhzhot - */ public class AntCompletionTest extends LightCodeInsightTestCase { protected String getTestDataPath() { - return PathManager.getHomePath() + "/plugins/ant/tests/data/psi/completion/"; + return PluginPathManager.getPluginHomePath("ant") + "/tests/data/psi/completion/"; } public void testSimpleProperty() throws Exception { diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java index 85f5b270c84a..8ded6483f015 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java @@ -10,7 +10,7 @@ */ package com.intellij.lang.ant; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.JavaTestFixtureFactory; @@ -24,7 +24,7 @@ public class AntMultiFileCompletionTest extends TestCase { private CodeInsightTestFixture myFixture; protected String getTestDataPath() { - return PathManager.getHomePath() + "/plugins/ant/tests/data/psi/completion/"; + return PluginPathManager.getPluginHomePath("ant") + "/tests/data/psi/completion/"; } public void testPropertyCompletion() throws Throwable { diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java index 61bcac5d5872..106c74e064f6 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java @@ -4,7 +4,7 @@ package com.intellij.lang.ant; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.testFramework.ParsingTestCase; public class AntParsingTest extends ParsingTestCase { @@ -14,7 +14,7 @@ public class AntParsingTest extends ParsingTestCase { } protected String getTestDataPath() { - return PathManager.getHomePath() + "/plugins/ant/tests/data"; + return PluginPathManager.getPluginHomePath("ant") + "/tests/data"; } public void testSingleProject() throws Exception { diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java index e21279b22e50..0a0dcf051aef 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java @@ -2,7 +2,7 @@ package com.intellij.lang.ant; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.lang.ant.psi.AntFile; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; @@ -115,7 +115,7 @@ public class AntRenameTest extends LightCodeInsightTestCase { } protected String getTestDataPath() { - return PathManager.getHomePath().replace('\\', '/') + "/plugins/ant/tests/data/psi/rename/"; + return PluginPathManager.getPluginHomePath("ant").replace('\\', '/') + "/tests/data/psi/rename/"; } private void doTest() throws Exception { diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java index 0607fae18769..a09cdf20a440 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java @@ -6,7 +6,7 @@ import com.intellij.lang.ant.psi.AntProperty; import com.intellij.lang.ant.psi.AntTarget; import com.intellij.lang.ant.psi.AntTask; import com.intellij.lang.ant.psi.impl.reference.AntPropertyReference; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; @@ -249,7 +249,7 @@ public class AntResolveTest extends ResolveTestCase { } protected String getTestDataPath() { - return PathManager.getHomePath() + "/plugins/ant/tests/data/psi/resolve/"; + return PluginPathManager.getPluginHomePath("ant") + "/tests/data/psi/resolve/"; } private PsiReference configure() throws Exception { diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java index 019aaf22e9b9..a5952ada3bab 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java @@ -2,7 +2,7 @@ package com.intellij.lang.ant; import com.intellij.lang.ant.psi.AntFile; import com.intellij.lang.ant.psi.introspection.AntTypeDefinition; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; @@ -21,7 +21,7 @@ public class CustomTypesTest extends ParsingTestCase { } protected String getTestDataPath() { - return PathManager.getHomePath() + "/plugins/ant/tests/data/psi/customTypes"; + return PluginPathManager.getPluginHomePath("ant") + "/tests/data/psi/customTypes"; } public void testAntCustomTask() throws Exception {