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

svn: Fix tests - wait change list manager in "tearDown()"

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-11-01 00:35:26 +03:00
parent 30fafe75a9
commit 5007a810b0
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+22 -8
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.rollback.RollbackProgressListener;
import com.intellij.openapi.vcs.update.CommonUpdateProjectAction;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.ApplicationRule;
import com.intellij.testFramework.RunAll;
import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
import com.intellij.testFramework.fixtures.TempDirTestFixture;
import com.intellij.testFramework.vcs.AbstractJunitVcsTestCase;
@@ -207,15 +208,28 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase {
@After
public void tearDown() throws Exception {
runInEdtAndWait(() -> {
tearDownProject();
runInEdtAndWait(
() -> new RunAll(
this::waitChangeListManager,
this::tearDownProject,
this::tearDownTempDirectoryFixture,
() -> resetCanonicalTempPathCache(ORIGINAL_TEMP_DIRECTORY)
).run()
);
}
if (myTempDirFixture != null) {
myTempDirFixture.tearDown();
myTempDirFixture = null;
}
resetCanonicalTempPathCache(ORIGINAL_TEMP_DIRECTORY);
});
private void waitChangeListManager() {
if (changeListManager != null) {
changeListManager.forceStopInTestMode();
changeListManager.waitEverythingDoneInTestMode();
}
}
private void tearDownTempDirectoryFixture() throws Exception {
if (myTempDirFixture != null) {
myTempDirFixture.tearDown();
myTempDirFixture = null;
}
}
protected ProcessOutput runSvn(String... commandLine) throws IOException {