fix SvnNativeListsTest for mac

This commit is contained in:
irengrig
2013-02-01 23:40:11 +04:00
parent 28f69425fc
commit dbf3212f6c
@@ -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() {