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: Run "PatchApplier" in EDT in tests

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-07-04 16:43:27 +03:00
parent 08c31e9213
commit 2d7153fbf6
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
+12 -9
View File
@@ -8,6 +8,7 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.vcsUtil.VcsUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.conflict.ConflictAction;
import org.jetbrains.idea.svn.conflict.ConflictOperation;
import org.jetbrains.idea.svn.conflict.ConflictVersion;
@@ -17,6 +18,7 @@ import org.junit.Test;
import java.io.File;
import static com.intellij.testFramework.EdtTestUtil.runInEdtAndWait;
import static org.junit.Assert.*;
/**
@@ -42,10 +44,7 @@ public class SvnTreeConflictDataTest extends SvnTestCase {
@Test
public void testFile2File_MINE_UNV_THEIRS_ADD() throws Exception {
final ConflictCreator creator = new ConflictCreator(vcs, myTheirs, myWorkingCopyDir,
TreeConflictData.FileToFile.MINE_UNV_THEIRS_ADD, mySvnClientRunner);
creator.create();
final String conflictFile = TreeConflictData.FileToFile.MINE_UNV_THEIRS_ADD.getConflictFile();
String conflictFile = createConflict(TreeConflictData.FileToFile.MINE_UNV_THEIRS_ADD, false);
VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -101,12 +100,16 @@ public class SvnTreeConflictDataTest extends SvnTestCase {
assertTrue(version.isNone());
}
private String createConflict(final TreeConflictData.Data data) throws Exception {
mySvnClientRunner.testSvnVersion(myWorkingCopyDir);
createSubTree();
private String createConflict(@NotNull TreeConflictData.Data data) throws Exception {
return createConflict(data, true);
}
final ConflictCreator creator = new ConflictCreator(vcs, myTheirs, myWorkingCopyDir, data, mySvnClientRunner);
creator.create();
private String createConflict(@NotNull TreeConflictData.Data data, boolean createSubtree) throws Exception {
if (createSubtree) {
mySvnClientRunner.testSvnVersion(myWorkingCopyDir);
createSubTree();
}
runInEdtAndWait(() -> new ConflictCreator(vcs, myTheirs, myWorkingCopyDir, data, mySvnClientRunner).create());
return data.getConflictFile();
}