updating test data path from svnPlugins to plugins

diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenCustomRepositoryHelper.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenCustomRepositoryHelper.java
index 1f495336962eaac14a9e03409cafb67444166186..8921f1ee4439412bbb624e8b07785f38ad0b9987 100644 (file)
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenCustomRepositoryHelper.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenCustomRepositoryHelper.java
@@ -1,6 +1,6 @@
 package org.jetbrains.idea.maven.indices;
 
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.util.io.FileUtil;
 
 import java.io.File;
@@ -27,7 +27,7 @@ public class MavenCustomRepositoryHelper {
   }
 
   private String getOriginalTestDataPath() {
-    String sourcesDir = System.getProperty("maven.sources.dir", PathManager.getHomePath() + "/svnPlugins/maven");
+    String sourcesDir = System.getProperty("maven.sources.dir", PluginPathManager.getPluginHomePath("maven"));
     return FileUtil.toSystemIndependentName(sourcesDir + "/src/test/data");
   }
 

diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
index 0c454b968e912ed4d094dc69f024a447c2ba7f62..c073af35f3bf2d2dbc671725a34d4e7062282dbd 100644 (file)
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
@@ -1,6 +1,7 @@
 package org.jetbrains.idea.svn;
 
 import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsConfiguration;
@@ -35,7 +36,7 @@ public class SvnRootAboveTest extends SvnTestCase {
     final File svnRoot = new File(myTempDirFixture.getTempDirPath(), "svnroot");
     svnRoot.mkdir();
 
-    File pluginRoot = new File(PathManager.getHomePath(), "svnPlugins/svn4idea");
+    File pluginRoot = new File(PluginPathManager.getPluginHomePath("svn4idea"));
     if (!pluginRoot.isDirectory()) {
       // try standalone mode
       Class aClass = SvnTestCase.class;

diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
index 63124b02672bb3c3872fcdf88634c19f7dc59edf..6c0a405b8f5990e78f78825a151ed562a2dba640 100644 (file)
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
@@ -3,6 +3,7 @@ package org.jetbrains.idea.svn;
 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.lifecycle.AtomicSectionsAware;
 import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.command.undo.UndoManager;
 import com.intellij.openapi.progress.EmptyProgressIndicator;
 import com.intellij.openapi.progress.ProcessCanceledException;
@@ -45,7 +46,7 @@ public abstract class SvnTestCase extends AbstractVcsTestCase {
     final File svnRoot = new File(myTempDirFixture.getTempDirPath(), "svnroot");
     svnRoot.mkdir();
 
-    File pluginRoot = new File(PathManager.getHomePath(), "svnPlugins/svn4idea");
+    File pluginRoot = new File(PluginPathManager.getPluginHomePath("svn4idea"));
     if (!pluginRoot.isDirectory()) {
       // try standalone mode
       Class aClass = SvnTestCase.class;

diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java
index 1f618ef9f5e65e03bdb2fff33eac7819fb544f1a..d56d94bac152a5c2b85fcead2052bfac460312b6 100644 (file)
--- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java
@@ -9,7 +9,7 @@ import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
@@ -43,7 +43,7 @@ public class ConfigurationsTest {
     myFixture = fixtureFactory.createTempDirTestFixture();
     myFixture.setUp();
 
-    FileUtil.copyDir(new File(PathManager.getHomePath() + "/svnPlugins/testng/testData/runConfiguration/module1"),
+    FileUtil.copyDir(new File(PluginPathManager.getPluginHomePath("testng") + "/testData/runConfiguration/module1"),
                      new File(myFixture.getTempDirPath()), false);
 
     myProjectFixture = testFixtureBuilder.getFixture();

diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java
index a2c8ab98c70e8e9c1152089a024f253d6599e215..22c413c7df9727e6cd7fe6ccb1d1d572df13fb87 100644 (file)
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java
@@ -6,7 +6,7 @@ package com.theoryinpractice.testng.inspection;
 
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.pom.java.LanguageLevel;
@@ -35,7 +35,7 @@ public abstract class BaseTestNGInspectionsTest {
     final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory();
     final TestFixtureBuilder<IdeaProjectTestFixture> testFixtureBuilder = fixtureFactory.createFixtureBuilder();
     myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(testFixtureBuilder.getFixture());
-    final String dataPath = PathManager.getHomePath() + "/svnPlugins/testng/testData";
+    final String dataPath = PluginPathManager.getPluginHomePath("testng") + "/testData";
     myFixture.setTestDataPath(dataPath);
     final JavaModuleFixtureBuilder builder = testFixtureBuilder.addModule(JavaModuleFixtureBuilder.class);
 

diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java
index 5bba932922db9a7d0907b62407022748750aef2f..652ff3a0f97147e8f1fa365f232d87c40deb5837 100644 (file)
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java
@@ -4,7 +4,7 @@
  */
 package com.theoryinpractice.testng.inspection;
 
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.testFramework.InspectionTestCase;
 import org.jetbrains.annotations.NonNls;
 import org.testng.annotations.AfterMethod;
@@ -26,7 +26,7 @@ public class UndeclaredTestsInspectionTest extends InspectionTestCase {
 
   @NonNls
   protected String getTestDataPath() {
-    return PathManager.getHomePath() + "/svnPlugins/testng/testData/inspection";
+    return PluginPathManager.getPluginHomePath("testng") + "/testData/inspection";
   }
 
   @DataProvider

diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java
index 5aa3c70c60b7565f61dcdbae17b9df5005398ab1..912c1c7c2d3b64e63cfe1ff82b91b681107cb1e7 100644 (file)
--- a/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java
@@ -5,7 +5,7 @@
 package com.theoryinpractice.testng.intention;
 
 import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.pom.java.LanguageLevel;
@@ -32,7 +32,7 @@ public class AddTestNGJarFixTest {
     final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory();
     final TestFixtureBuilder<IdeaProjectTestFixture> testFixtureBuilder = fixtureFactory.createFixtureBuilder();
     myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(testFixtureBuilder.getFixture());
-    final String dataPath = PathManager.getHomePath() + "/svnPlugins/testng/testData";
+    final String dataPath = PluginPathManager.getPluginHomePath("testng") + "/testData";
     myFixture.setTestDataPath(dataPath);
     final JavaModuleFixtureBuilder builder = testFixtureBuilder.addModule(JavaModuleFixtureBuilder.class);