From 91774bf2c6ae0760e79ebe491def158b08144d1d Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 22 Oct 2012 15:11:33 +0400
Subject: [PATCH] Fix GitRootDetectorTest & GitRootErrorsFinderTest

---
 .../tests/git4idea/roots/AbstractGitRootTest.groovy   |  7 +++++--
 .../tests/git4idea/roots/GitRootDetectorTest.groovy   | 11 +++++++++--
 .../git4idea/roots/GitRootErrorsFinderTest.groovy     |  6 ++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/plugins/git4idea/tests/git4idea/roots/AbstractGitRootTest.groovy b/plugins/git4idea/tests/git4idea/roots/AbstractGitRootTest.groovy
index d07b1a5c4660..0194347dcd11 100644
--- a/plugins/git4idea/tests/git4idea/roots/AbstractGitRootTest.groovy
+++ b/plugins/git4idea/tests/git4idea/roots/AbstractGitRootTest.groovy
@@ -16,6 +16,7 @@
 package git4idea.roots
 
 import com.intellij.dvcs.test.MockProject
+import com.intellij.dvcs.test.MockProjectRootManager
 import com.intellij.dvcs.test.MockVirtualFile
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.io.FileUtil
@@ -53,12 +54,14 @@ class AbstractGitRootTest {
     createProjectStructure(project, projectStructure);
     createProjectStructure(project, contentRoots);
 
-    contentRoots.each { myPlatformFacade.myProjectRootManager.myContentRoots << MockVirtualFile.fromPath(it, project)}
+    contentRoots.each {
+      ((MockProjectRootManager)myPlatformFacade.getProjectRootManager(project)).myContentRoots << MockVirtualFile.fromPath(it, project)
+    }
 
     project
   }
 
-  void createProjectStructure(Project project, Collection<String> paths) {
+  static void createProjectStructure(Project project, Collection<String> paths) {
     paths.each { String path ->
       File file = new File(project.baseDir.path + "/" + path)
       file.mkdir()
diff --git a/plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.groovy b/plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.groovy
index 0ff6c92c4914..899ac6dbaf17 100644
--- a/plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.groovy
+++ b/plugins/git4idea/tests/git4idea/roots/GitRootDetectorTest.groovy
@@ -18,6 +18,7 @@ package git4idea.roots
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import git4idea.test.GitGTestUtil
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
 
@@ -33,6 +34,12 @@ class GitRootDetectorTest extends AbstractGitRootTest {
 
   @Before
   void setUp() {
+    super.setUp();
+  }
+
+  @After
+  void tearDown() {
+    super.tearDown();
   }
 
   @Test
@@ -194,7 +201,7 @@ class GitRootDetectorTest extends AbstractGitRootTest {
     assertRoots(expected.roots, actual.roots)
   }
 
-  String roots(Collection roots) {
+  static String roots(Collection roots) {
     "\nRoots:${roots.collect {"\n  * $it"}}\n"
   }
 
@@ -202,7 +209,7 @@ class GitRootDetectorTest extends AbstractGitRootTest {
     assertEquals(GitGTestUtil.toAbsolute(expectedRelativePaths, myProject).toSet(), getPaths(actual).toSet())
   }
 
-  Collection<String> getPaths(Collection<VirtualFile> files) {
+  static Collection<String> getPaths(Collection<VirtualFile> files) {
     files.collect { it.path }
   }
 
diff --git a/plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.groovy b/plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.groovy
index f9b10d5513c9..3692838e1d54 100644
--- a/plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.groovy
+++ b/plugins/git4idea/tests/git4idea/roots/GitRootErrorsFinderTest.groovy
@@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.VcsDirectoryMapping
 import com.intellij.openapi.vcs.VcsRootError
 import git4idea.test.GitMockVcsManager
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
 
@@ -40,6 +41,11 @@ class GitRootErrorsFinderTest extends AbstractGitRootTest {
     super.setUp()
   }
 
+  @After
+  void tearDown() {
+    super.tearDown();
+  }
+
   @Test
   void "No roots, then no errors"() {
     doTest git:    [],