mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 09:49:23 +02:00
GP-5908 Corrected test failures
This commit is contained in:
parent
f6148f063a
commit
a94ca1ed7e
1 changed files with 28 additions and 13 deletions
|
@ -339,7 +339,11 @@ public class DefaultProjectDataTest extends AbstractGhidraHeadedIntegrationTest
|
||||||
sharedFS.createFolder("/", "b");
|
sharedFS.createFolder("/", "b");
|
||||||
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
||||||
assertEquals(3, root.getFolders().length);
|
assertEquals(3, root.getFolders().length);
|
||||||
assertEventsSize(0);
|
assertEventsSize(3);
|
||||||
|
|
||||||
|
checkEvent(events.get(0), "Folder Added", null, "/a", null, null, null);
|
||||||
|
checkEvent(events.get(1), "Folder Added", null, "/b", null, null, null);
|
||||||
|
checkEvent(events.get(2), "Folder Added", null, "/c", null, null, null);
|
||||||
|
|
||||||
sharedFS.createFolder("/b", "subB");
|
sharedFS.createFolder("/b", "subB");
|
||||||
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
||||||
|
@ -483,9 +487,12 @@ public class DefaultProjectDataTest extends AbstractGhidraHeadedIntegrationTest
|
||||||
root.getFolders(); // visit root folder to receive change events for it
|
root.getFolders(); // visit root folder to receive change events for it
|
||||||
sharedFS.renameFolder("/", "a", "bigA");
|
sharedFS.renameFolder("/", "a", "bigA");
|
||||||
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
||||||
assertEventsSize(1);
|
assertEventsSize(4);
|
||||||
|
|
||||||
checkEvent(events.get(0), "Folder Added", null, "/bigA", null, null, null);
|
checkEvent(events.get(0), "Folder Added", null, "/a", null, null, null);
|
||||||
|
checkEvent(events.get(1), "Folder Added", null, "/b", null, null, null);
|
||||||
|
checkEvent(events.get(2), "Folder Added", null, "/c", null, null, null);
|
||||||
|
checkEvent(events.get(3), "Folder Added", null, "/bigA", null, null, null);
|
||||||
|
|
||||||
// versioned folder was renamed to /bigA, but private folder /a should still exist
|
// versioned folder was renamed to /bigA, but private folder /a should still exist
|
||||||
|
|
||||||
|
@ -509,9 +516,11 @@ public class DefaultProjectDataTest extends AbstractGhidraHeadedIntegrationTest
|
||||||
sharedFS.renameFolder("/a", "y", "bigY");
|
sharedFS.renameFolder("/a", "y", "bigY");
|
||||||
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
||||||
|
|
||||||
assertEventsSize(2);
|
assertEventsSize(4);
|
||||||
checkEvent(events.get(0), "Folder Removed", "/a", null, null, null, "y");
|
checkEvent(events.get(0), "Folder Added", null, "/a/x", null, null, null);
|
||||||
checkEvent(events.get(1), "Folder Added", null, "/a/bigY", null, null, null);
|
checkEvent(events.get(1), "Folder Added", null, "/a/y", null, null, null);
|
||||||
|
checkEvent(events.get(2), "Folder Removed", "/a", null, null, null, "y");
|
||||||
|
checkEvent(events.get(3), "Folder Added", null, "/a/bigY", null, null, null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -523,9 +532,12 @@ public class DefaultProjectDataTest extends AbstractGhidraHeadedIntegrationTest
|
||||||
assertNull(root.getFolder("c"));
|
assertNull(root.getFolder("c"));
|
||||||
assertNotNull(root.getFolder("bigC"));
|
assertNotNull(root.getFolder("bigC"));
|
||||||
|
|
||||||
assertEventsSize(2);
|
assertEventsSize(5);
|
||||||
checkEvent(events.get(0), "Folder Removed", "/", null, null, null, "c");
|
checkEvent(events.get(0), "Folder Added", null, "/a", null, null, null);
|
||||||
checkEvent(events.get(1), "Folder Added", null, "/bigC", null, null, null);
|
checkEvent(events.get(1), "Folder Added", null, "/b", null, null, null);
|
||||||
|
checkEvent(events.get(2), "Folder Added", null, "/c", null, null, null);
|
||||||
|
checkEvent(events.get(3), "Folder Removed", "/", null, null, null, "c");
|
||||||
|
checkEvent(events.get(4), "Folder Added", null, "/bigC", null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -602,9 +614,12 @@ public class DefaultProjectDataTest extends AbstractGhidraHeadedIntegrationTest
|
||||||
|
|
||||||
sharedFS.moveFolder("/", "a", "/c");
|
sharedFS.moveFolder("/", "a", "/c");
|
||||||
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
flushFileSystemEvents(); // wait for FileSystemListener callback to update folder
|
||||||
assertEventsSize(1);
|
assertEventsSize(4);
|
||||||
|
|
||||||
checkEvent(events.get(0), "Folder Added", null, "/c/a", null, null, null);
|
checkEvent(events.get(0), "Folder Added", null, "/a", null, null, null);
|
||||||
|
checkEvent(events.get(1), "Folder Added", null, "/b", null, null, null);
|
||||||
|
checkEvent(events.get(2), "Folder Added", null, "/c", null, null, null);
|
||||||
|
checkEvent(events.get(3), "Folder Added", null, "/c/a", null, null, null);
|
||||||
|
|
||||||
// versioned folder was moved to /c/a, but private folder /a should still exist
|
// versioned folder was moved to /c/a, but private folder /a should still exist
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue