From fd9da876e51548f5f64d3ce02a2e3734590ebcf3 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 18 Oct 2013 18:58:28 +0200 Subject: [PATCH] correctly locate helpers under new repo layout --- .../test/com/jetbrains/rest/RestParsingTest.java | 3 ++- .../jetbrains/rest/fixtures/RestFixtureTestCase.java | 3 ++- .../com/jetbrains/python/PythonHelpersLocator.java | 8 ++++++++ .../userSkeletons/PyUserSkeletonsUtil.java | 2 +- .../testSrc/com/jetbrains/python/PythonTestUtil.java | 4 +--- .../com/jetbrains/python/fixtures/PyTestCase.java | 11 ++--------- .../jetbrains/python/testing/JythonUnitTestUtil.java | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/python/python-rest/test/com/jetbrains/rest/RestParsingTest.java b/python/python-rest/test/com/jetbrains/rest/RestParsingTest.java index 72d76ad9a297..75eb1444fe9b 100644 --- a/python/python-rest/test/com/jetbrains/rest/RestParsingTest.java +++ b/python/python-rest/test/com/jetbrains/rest/RestParsingTest.java @@ -1,6 +1,7 @@ package com.jetbrains.rest; import com.intellij.testFramework.ParsingTestCase; +import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.fixtures.PyTestCase; import com.jetbrains.rest.parsing.RestParserDefinition; @@ -35,7 +36,7 @@ public class RestParsingTest extends ParsingTestCase { } protected String getTestDataPath() { - return PyTestCase.getPythonCommunityPath() + "/python-rest/testData/psi"; + return PythonHelpersLocator.getPythonCommunityPath() + "/python-rest/testData/psi"; } diff --git a/python/python-rest/test/com/jetbrains/rest/fixtures/RestFixtureTestCase.java b/python/python-rest/test/com/jetbrains/rest/fixtures/RestFixtureTestCase.java index 69a4afcebb15..8e1af3a4ed34 100644 --- a/python/python-rest/test/com/jetbrains/rest/fixtures/RestFixtureTestCase.java +++ b/python/python-rest/test/com/jetbrains/rest/fixtures/RestFixtureTestCase.java @@ -8,6 +8,7 @@ import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import com.intellij.testFramework.fixtures.TestFixtureBuilder; import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl; +import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.fixtures.PyTestCase; import org.jetbrains.annotations.Nullable; @@ -33,7 +34,7 @@ public abstract class RestFixtureTestCase extends UsefulTestCase { } protected String getTestDataPath() { - return PyTestCase.getPythonCommunityPath() + "/python-rest/testData"; + return PythonHelpersLocator.getPythonCommunityPath() + "/python-rest/testData"; } @Override diff --git a/python/src/com/jetbrains/python/PythonHelpersLocator.java b/python/src/com/jetbrains/python/PythonHelpersLocator.java index ca3cfb5bd294..f5f68e2edc58 100644 --- a/python/src/com/jetbrains/python/PythonHelpersLocator.java +++ b/python/src/com/jetbrains/python/PythonHelpersLocator.java @@ -1,5 +1,6 @@ package com.jetbrains.python; +import com.intellij.openapi.application.PathManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NonNls; @@ -52,4 +53,11 @@ public class PythonHelpersLocator { return new File(getHelpersRoot(), resourceName); } + public static String getPythonCommunityPath() { + File pathFromUltimate = new File(PathManager.getHomePath(), "community/python"); + if (pathFromUltimate.exists()) { + return pathFromUltimate.getPath(); + } + return new File(PathManager.getHomePath(), "python").getPath(); + } } diff --git a/python/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java b/python/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java index 1ec4753dbbeb..d7f5d47c13d6 100644 --- a/python/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java +++ b/python/src/com/jetbrains/python/codeInsight/userSkeletons/PyUserSkeletonsUtil.java @@ -44,7 +44,7 @@ public class PyUserSkeletonsUtil { final List result = new ArrayList(); result.add(PathManager.getConfigPath() + File.separator + USER_SKELETONS_DIR); result.add(ApplicationManager.getApplication().isInternal() - ? StringUtil.join(new String[]{PathManager.getHomePath(), "python", "community", "helpers", USER_SKELETONS_DIR}, File.separator) + ? StringUtil.join(new String[]{PythonHelpersLocator.getPythonCommunityPath(), "helpers", USER_SKELETONS_DIR}, File.separator) : PythonHelpersLocator.getHelperPath(USER_SKELETONS_DIR)); return result; } diff --git a/python/testSrc/com/jetbrains/python/PythonTestUtil.java b/python/testSrc/com/jetbrains/python/PythonTestUtil.java index 65396cc3ff0d..7d3c05b6ff49 100644 --- a/python/testSrc/com/jetbrains/python/PythonTestUtil.java +++ b/python/testSrc/com/jetbrains/python/PythonTestUtil.java @@ -1,7 +1,5 @@ package com.jetbrains.python; -import com.jetbrains.python.fixtures.PyTestCase; - /** * @author yole */ @@ -10,6 +8,6 @@ public class PythonTestUtil { } public static String getTestDataPath() { - return PyTestCase.getPythonCommunityPath() + "/testData"; + return PythonHelpersLocator.getPythonCommunityPath() + "/testData"; } } diff --git a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java index 2a447b50a95a..f66febf1b77c 100644 --- a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java +++ b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java @@ -22,6 +22,7 @@ import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import com.intellij.testFramework.fixtures.TestFixtureBuilder; import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl; +import com.jetbrains.python.PythonHelpersLocator; import com.jetbrains.python.PythonMockSdk; import com.jetbrains.python.PythonTestUtil; import com.jetbrains.python.psi.LanguageLevel; @@ -149,15 +150,7 @@ public abstract class PyTestCase extends UsefulTestCase { PlatformTestCase.autodetectPlatformPrefix(); } - public static String getPythonCommunityPath() { - File pathFromUltimate = new File(PathManager.getHomePath(), "community/python"); - if (pathFromUltimate.exists()) { - return pathFromUltimate.getPath(); - } - return new File(PathManager.getHomePath(), "python").getPath(); - } - public static String getHelpersPath() { - return new File(getPythonCommunityPath(), "helpers").getPath(); + return new File(PythonHelpersLocator.getPythonCommunityPath(), "helpers").getPath(); } } diff --git a/python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java b/python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java index ab4f5b4d42e9..47a38276007f 100644 --- a/python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java +++ b/python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java @@ -9,7 +9,7 @@ import com.intellij.openapi.projectRoots.JdkUtil; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SimpleJavaSdkType; import com.intellij.util.SystemProperties; -import com.jetbrains.python.fixtures.PyTestCase; +import com.jetbrains.python.PythonHelpersLocator; import java.io.File; @@ -27,7 +27,7 @@ public class JythonUnitTestUtil { parameters.setJdk(ideaJdk); parameters.setMainClass("org.python.util.jython"); - File jythonJar = new File(PyTestCase.getPythonCommunityPath(), "lib/jython.jar"); + File jythonJar = new File(PythonHelpersLocator.getPythonCommunityPath(), "lib/jython.jar"); parameters.getClassPath().add(jythonJar.getPath()); parameters.getProgramParametersList().add("-Dpython.path=" + pythonPath + File.pathSeparator + workDir);