mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
fix SvnNativeListsTest for mac
This commit is contained in:
@@ -72,7 +72,7 @@ public class SvnNativeListsTest extends Svn17TestCase {
|
||||
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A a.txt");
|
||||
}
|
||||
|
||||
private void ensureAddedToNativeList() {
|
||||
@@ -104,7 +104,7 @@ public class SvnNativeListsTest extends Svn17TestCase {
|
||||
sleepABit();
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "D a.txt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -128,7 +128,7 @@ public class SvnNativeListsTest extends Svn17TestCase {
|
||||
sleepABit();
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "M a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "M a.txt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -153,17 +153,17 @@ public class SvnNativeListsTest extends Svn17TestCase {
|
||||
sleepABit();
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "M a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "M a.txt");
|
||||
|
||||
renameFileInCommand(file, "b.txt");
|
||||
myDirtyScopeManager.markEverythingDirty();
|
||||
myChangeListManager.ensureUpToDate(false);
|
||||
sleepABit();
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -189,7 +189,7 @@ public class SvnNativeListsTest extends Svn17TestCase {
|
||||
sleepABit();
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -215,17 +215,17 @@ public class SvnNativeListsTest extends Svn17TestCase {
|
||||
sleepABit();
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A + b.txt", "D a.txt");
|
||||
|
||||
renameFileInCommand(file, "c.txt");
|
||||
myDirtyScopeManager.markEverythingDirty();
|
||||
myChangeListManager.ensureUpToDate(false);
|
||||
sleepABit();
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A + c.txt", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A + c.txt", "D a.txt");
|
||||
|
||||
ensureAddedToNativeList();
|
||||
|
||||
verify(runSvn("status"), "", "--- Changelist 'newOne':", "A + c.txt", "D a.txt");
|
||||
verifySorted(runSvn("status"), "", "--- Changelist 'newOne':", "A + c.txt", "D a.txt");
|
||||
}
|
||||
|
||||
private void sleepABit() {
|
||||
|
||||
Reference in New Issue
Block a user