MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix dirty scope state test

Browse Source
This commit is contained in:
irengrig
2012-06-29 15:13:26 +04:00
parent e73944059a
commit ceba6fee3a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+8 -6
View File
@@ -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
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
+1 -1
View File
@@ -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);
}