From ceba6fee3ac51d432f9da079b79e5bc7180b059c Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Fri, 29 Jun 2012 15:13:26 +0400
Subject: [PATCH] fix dirty scope state test

---
 .../org/jetbrains/idea/svn/SvnTestCase.java        | 14 ++++++++------
 .../idea/svn/SvnTestDirtyScopeStateTest.java       |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
index 1dbf191bfe9b..42040260e575 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
@@ -32,14 +32,14 @@ import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.*;
-import com.intellij.testFramework.vcs.MockChangeListManagerGate;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.vcs.AbstractJunitVcsTestCase;
 import com.intellij.testFramework.PlatformTestCase;
-import com.intellij.testFramework.vcs.TestClientRunner;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
+import com.intellij.testFramework.vcs.AbstractJunitVcsTestCase;
+import com.intellij.testFramework.vcs.MockChangeListManagerGate;
 import com.intellij.testFramework.vcs.MockChangelistBuilder;
+import com.intellij.testFramework.vcs.TestClientRunner;
 import com.intellij.util.io.ZipUtil;
 import com.intellij.util.ui.UIUtil;
 import org.junit.After;
@@ -129,9 +129,11 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
     });
 
     // there should be kind-a waiting for after change list manager finds all changes and runs inner refresh of copies in the above method
-    ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
-    VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
-    changeListManager.ensureUpToDate(false);
+    if (myInitChangeListManager) {
+      ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
+      VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
+      changeListManager.ensureUpToDate(false);
+    }
   }
 
   @After
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
index a39e63028407..4db7d3a5dc29 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
@@ -20,9 +20,9 @@ import java.util.List;
 public class SvnTestDirtyScopeStateTest extends SvnTestCase {
   @Override
   public void setUp() throws Exception {
+    myInitChangeListManager = false;
     super.setUp();
 
-    myInitChangeListManager = false;
     final VcsDirtyScopeVfsListener vfsListener = ApplicationManager.getApplication().getComponent(VcsDirtyScopeVfsListener.class);
     vfsListener.setForbid(true);
   }