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: Fixed "SvnQuickMergeTest" - do not check source branch history size

Browse Source 
Previous checks were incorrect as we do not apply any special revision
filtering for "manual select" quick merge (see
"LoadRecentBranchRevisions"). Now we just check that branch copy
revision exists in passed revisions list (which is sufficient here).
This commit is contained in:
Konstantin Kolosovsky
2016-11-09 23:53:59 +03:00
parent a01da02ddb
commit 079a073fc2
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnQuickMergeTest.java
+4 -12
View File
@@ -152,13 +152,9 @@ public class SvnQuickMergeTest extends Svn17TestCase {
Thread.sleep(10);
}
// we should get exactly 2 revisions for selection (copy and change in b2)
AtomicReference<String> selectionError = new AtomicReference<>();
QuickMergeTestInteraction testInteraction = new QuickMergeTestInteraction(true, lists -> {
if (lists.size() != 4) {
selectionError.set("List size: " + lists.size());
}
else if (lists.get(3).getNumber() != numberBefore) {
if (lists.get(3).getNumber() != numberBefore) {
selectionError.set("wrong revision for copy statement: " + lists.get(3).getNumber());
}
return new SmartList<>(lists.get(2)); // get a change
@@ -167,7 +163,7 @@ public class SvnQuickMergeTest extends Svn17TestCase {
waitQuickMerge(myBranchUrl, testInteraction);
if (selectionError.get() != null){
if (selectionError.get() != null) {
throw new RuntimeException(selectionError.get());
}
@@ -223,13 +219,9 @@ public class SvnQuickMergeTest extends Svn17TestCase {
VcsTestUtil.editFileInCommand(myProject, myBranchTree.myS2File, "completely changed");
runInAndVerifyIgnoreOutput(myBranchRoot, "ci", "-m", "change in b2", myBranchTree.myS2File.getPath());
// we should get exactly 2 revisions for selection (copy and change in b2)
AtomicReference<String> selectionError = new AtomicReference<>();
QuickMergeTestInteraction testInteraction = new QuickMergeTestInteraction(true, lists -> {
if (lists.size() != 2) {
selectionError.set("List size: " + lists.size());
}
else if (lists.get(1).getNumber() != numberBeforeCopy + 1) {
if (lists.get(1).getNumber() != numberBeforeCopy + 1) {
selectionError.set("wrong revision for copy statement: " + lists.get(1).getNumber());
}
return new SmartList<>(lists.get(0)); // get a change
@@ -238,7 +230,7 @@ public class SvnQuickMergeTest extends Svn17TestCase {
waitQuickMerge(myRepoUrl + "/branches/b2", testInteraction);
if (selectionError.get() != null){
if (selectionError.get() != null) {
throw new RuntimeException(selectionError.get());
}