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: Refactor "SvnResolveTreeAcceptVariantsTest" - move method

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-08-06 15:54:32 +03:00
parent bbfab8a2ad
commit ae19fd9de2
1 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java
+55 -55
View File
@@ -98,6 +98,61 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase {
checkFileContents();
}
@Test
public void testTheirsFull() throws Exception {
mySvnClientRunner.checkout(myRepoUrl, myTheirs);
createSubTree();
runInEdtAndWait(() -> new ConflictCreator(vcs, myTheirs, myWorkingCopyDir, conflictData, mySvnClientRunner).create());
refreshChanges();
refreshChanges();
final String conflictFile = conflictData.getConflictFile();
final File conflictIoFile = new File(myWorkingCopyDir.getPath(), conflictFile);
final FilePath filePath = VcsUtil.getFilePath(conflictIoFile);
final Change change = changeListManager.getChange(filePath);
assertNotNull(change);
assertTrue(change instanceof ConflictedSvnChange);
FilePath beforePath = null;
if (change.isMoved() || change.isRenamed()) {
beforePath = change.getBeforeRevision().getFile();
}
new SvnTreeConflictResolver(vcs, filePath, beforePath).resolveSelectTheirsFull();
myTheirs.refresh(false, true);
refreshVfs();
VfsUtil.processFileRecursivelyWithoutIgnored(myTheirs, file -> {
final String relative = getRelativePath(file, myTheirs, File.separatorChar);
File workingFile = new File(myWorkingCopyDir.getPath(), relative);
boolean exists = workingFile.exists();
if (!exists) {
String[] excluded = conflictData.getExcludeFromToTheirsCheck();
if (excluded != null && asList(excluded).contains(relative)) {
return true;
}
assertTrue(createTestFailedComment(relative), exists);
}
final File theirsFile = virtualToIoFile(file);
Info theirsInfo = vcs.getInfo(theirsFile);
Info thisInfo = vcs.getInfo(workingFile);
if (theirsInfo != null) {
assertEquals(createTestFailedComment(relative) + ", theirs: " + theirsInfo.getRevision().getNumber() + ", mine: "
+ thisInfo.getRevision().getNumber(), theirsInfo.getRevision().getNumber(), thisInfo.getRevision().getNumber());
if (!theirsFile.isDirectory()) {
try {
assertEquals(FileUtil.loadFile(theirsFile), FileUtil.loadFile(workingFile));
}
catch (IOException e) {
fail(e.getMessage());
}
}
}
return true;
});
}
private void checkFileContents() throws IOException {
for (TreeConflictData.FileData leftFile : conflictData.getLeftFiles()) {
if (!leftFile.myIsDir && !StringUtil.isEmpty(leftFile.myContents)) {
@@ -164,61 +219,6 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase {
return "File: " + path + " in: " + myWorkingCopyDir.getPath();
}
@Test
public void testTheirsFull() throws Exception {
mySvnClientRunner.checkout(myRepoUrl, myTheirs);
createSubTree();
runInEdtAndWait(() -> new ConflictCreator(vcs, myTheirs, myWorkingCopyDir, conflictData, mySvnClientRunner).create());
refreshChanges();
refreshChanges();
final String conflictFile = conflictData.getConflictFile();
final File conflictIoFile = new File(myWorkingCopyDir.getPath(), conflictFile);
final FilePath filePath = VcsUtil.getFilePath(conflictIoFile);
final Change change = changeListManager.getChange(filePath);
assertNotNull(change);
assertTrue(change instanceof ConflictedSvnChange);
FilePath beforePath = null;
if (change.isMoved() || change.isRenamed()) {
beforePath = change.getBeforeRevision().getFile();
}
new SvnTreeConflictResolver(vcs, filePath, beforePath).resolveSelectTheirsFull();
myTheirs.refresh(false, true);
refreshVfs();
VfsUtil.processFileRecursivelyWithoutIgnored(myTheirs, file -> {
final String relative = getRelativePath(file, myTheirs, File.separatorChar);
File workingFile = new File(myWorkingCopyDir.getPath(), relative);
boolean exists = workingFile.exists();
if (!exists) {
String[] excluded = conflictData.getExcludeFromToTheirsCheck();
if (excluded != null && asList(excluded).contains(relative)) {
return true;
}
assertTrue(createTestFailedComment(relative), exists);
}
final File theirsFile = virtualToIoFile(file);
Info theirsInfo = vcs.getInfo(theirsFile);
Info thisInfo = vcs.getInfo(workingFile);
if (theirsInfo != null) {
assertEquals(createTestFailedComment(relative) + ", theirs: " + theirsInfo.getRevision().getNumber() + ", mine: "
+ thisInfo.getRevision().getNumber(), theirsInfo.getRevision().getNumber(), thisInfo.getRevision().getNumber());
if (!theirsFile.isDirectory()) {
try {
assertEquals(FileUtil.loadFile(theirsFile), FileUtil.loadFile(workingFile));
}
catch (IOException e) {
fail(e.getMessage());
}
}
}
return true;
});
}
private static Object getStaticFieldValue(Field field) {
try {
return field.get(null);