From ad5c077e06a89bd5a90e8dda4b2df3330b3ed184 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 22 Dec 2014 15:24:28 +0300
Subject: [PATCH] VCS tests: removed dangerous code which disables plugins
 inside test

---
 .../vcs/AbstractVcsTestCase.java              | 50 ++++++-------------
 .../testSrc/org/zmlx/hg4idea/test/HgTest.java |  5 --
 .../org/jetbrains/idea/SvnTestCase.java       |  5 --
 3 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
index b64e222e7792..bc20186244dd 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
@@ -59,8 +59,6 @@ public abstract class AbstractVcsTestCase {
   protected IdeaProjectTestFixture myProjectFixture;
   protected boolean myInitChangeListManager = true;
 
-  protected abstract String getPluginName();
-
   protected TestClientRunner createClientRunner() {
     return createClientRunner(null);
   }
@@ -90,42 +88,26 @@ public abstract class AbstractVcsTestCase {
   }
 
   protected void initProject(final File clientRoot, String testName) throws Exception {
-    final String key = "idea.load.plugins.id";
-    final String was = System.getProperty(key);
-    try {
-      final String pluginName = getPluginName();
-      if (pluginName != null) {
-        System.setProperty(key, pluginName);
-      }
-      String name = testName;
-      final TestFixtureBuilder<IdeaProjectTestFixture> testFixtureBuilder = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(name);
-      myProjectFixture = testFixtureBuilder.getFixture();
-      testFixtureBuilder.addModule(EmptyModuleFixtureBuilder.class).addContentRoot(clientRoot.toString());
-      myProjectFixture.setUp();
-      myProject = myProjectFixture.getProject();
+    final TestFixtureBuilder<IdeaProjectTestFixture> testFixtureBuilder = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(testName);
+    myProjectFixture = testFixtureBuilder.getFixture();
+    testFixtureBuilder.addModule(EmptyModuleFixtureBuilder.class).addContentRoot(clientRoot.toString());
+    myProjectFixture.setUp();
+    myProject = myProjectFixture.getProject();
 
-      projectCreated();
+    projectCreated();
 
-      if (myInitChangeListManager) {
-        ((ProjectComponent) ChangeListManager.getInstance(myProject)).projectOpened();
-      }
-      ((ProjectComponent) VcsDirtyScopeManager.getInstance(myProject)).projectOpened();
-
-      ApplicationManager.getApplication().runWriteAction(new Runnable() {
-        @Override
-        public void run() {
-          myWorkingCopyDir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(clientRoot);
-          assert myWorkingCopyDir != null;
-        }
-      });
+    if (myInitChangeListManager) {
+      ((ProjectComponent) ChangeListManager.getInstance(myProject)).projectOpened();
     }
-    finally {
-      if (was != null) {
-        System.setProperty(key, was);
-      } else {
-        System.clearProperty(key);
+    ((ProjectComponent) VcsDirtyScopeManager.getInstance(myProject)).projectOpened();
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        myWorkingCopyDir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(clientRoot);
+        assert myWorkingCopyDir != null;
       }
-    }
+    });
     ((ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(myProject)).waitForInitialized();
   }
 
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
index 43bb2121a9c9..007bc9ad8bc4 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
@@ -111,11 +111,6 @@ public abstract class HgTest extends AbstractVcsTestCase {
     });
   }
 
-  @Override
-  protected String getPluginName() {
-    return "hg4idea";
-  }
-
   protected abstract HgTestRepository initRepositories() throws Exception;
 
   protected abstract void tearDownRepositories() throws Exception;
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
index 393995a29da8..3ab15eb94e98 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
@@ -113,11 +113,6 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
     listener.after(events);
   }
 
-  @Override
-  protected String getPluginName() {
-    return "Subversion";
-  }
-
   @Before
   public void setUp() throws Exception {
     System.out.println("Native client for status: " + isUseNativeAcceleration());