From 1c7992ec752bcb2363b9fba5e7d5a99f29887ece Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Date: Wed, 1 Jul 2015 02:00:16 +0300
Subject: [PATCH] Fixed running Python plugin tests in IntelliJ

The tests used to depend on python-community-tests, so some components
from IdeaPlugin.xml didn't get initialized. Added a dependency on
Python Community plugin resources for the correct plugin.xml.
---
 .../com/jetbrains/jython/PyJythonHighlightingTest.java        | 4 ++--
 .../com/jetbrains/jython/PyToJavaResolveTest.java             | 4 ++--
 python/python-plugin-tests.iml                                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/pluginTestSrc/com/jetbrains/jython/PyJythonHighlightingTest.java b/python/pluginTestSrc/com/jetbrains/jython/PyJythonHighlightingTest.java
index 4ddef37bca86..744ee5cd98c7 100644
--- a/python/pluginTestSrc/com/jetbrains/jython/PyJythonHighlightingTest.java
+++ b/python/pluginTestSrc/com/jetbrains/jython/PyJythonHighlightingTest.java
@@ -16,7 +16,7 @@
 package com.jetbrains.jython;
 
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
-import com.jetbrains.python.PythonTestUtil;
+import com.jetbrains.python.PythonHelpersLocator;
 import com.jetbrains.python.inspections.PyCallingNonCallableInspection;
 import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferencesInspection;
 
@@ -41,6 +41,6 @@ public class PyJythonHighlightingTest extends LightCodeInsightFixtureTestCase {
 
   @Override
   protected String getTestDataPath() {
-    return PythonTestUtil.getTestDataPath() + "/highlighting/jython/";
+    return PythonHelpersLocator.getPythonCommunityPath() + "/testData/highlighting/jython/";
   }
 }
diff --git a/python/pluginTestSrc/com/jetbrains/jython/PyToJavaResolveTest.java b/python/pluginTestSrc/com/jetbrains/jython/PyToJavaResolveTest.java
index a733592e0fef..1d9602795fa7 100644
--- a/python/pluginTestSrc/com/jetbrains/jython/PyToJavaResolveTest.java
+++ b/python/pluginTestSrc/com/jetbrains/jython/PyToJavaResolveTest.java
@@ -18,7 +18,7 @@ package com.jetbrains.jython;
 import com.intellij.psi.*;
 import com.intellij.testFramework.ResolveTestCase;
 import com.intellij.testFramework.TestDataPath;
-import com.jetbrains.python.PythonTestUtil;
+import com.jetbrains.python.PythonHelpersLocator;
 import junit.framework.Assert;
 
 /**
@@ -87,6 +87,6 @@ public class PyToJavaResolveTest extends ResolveTestCase {
 
   @Override
   protected String getTestDataPath() {
-    return PythonTestUtil.getTestDataPath() + "/resolve/pyToJava/";
+    return PythonHelpersLocator.getPythonCommunityPath() + "/testData/resolve/pyToJava/";
   }
 }
diff --git a/python/python-plugin-tests.iml b/python/python-plugin-tests.iml
index 37a5ca500a58..7c666a1dd0a6 100644
--- a/python/python-plugin-tests.iml
+++ b/python/python-plugin-tests.iml
@@ -14,10 +14,10 @@
     <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="IntelliLang-java" scope="RUNTIME" />
-    <orderEntry type="module" module-name="python-community-tests" />
     <orderEntry type="module" module-name="python-community-plugin" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="module" module-name="IntelliLang-xml" scope="RUNTIME" />
+    <orderEntry type="module" module-name="python-community-plugin-resources" scope="RUNTIME" />
   </component>
 </module>