Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2024-01-30-1'

This commit is contained in:
ghidra1 2024-01-30 14:39:10 -05:00
commit 3130bc1076
2 changed files with 7 additions and 2 deletions

View File

@ -1206,6 +1206,9 @@ public class DebuggerListingProvider extends CodeViewerProvider {
AddressSet set = new AddressSet(space.getMinAddress(), space.getMaxAddress());
Reqs reqs = Reqs.fromView(tool, view);
if (reqs == null) {
return;
}
CurrentPlatformTraceDisassembleCommand dis =
new CurrentPlatformTraceDisassembleCommand(tool, set, reqs, start);
dis.run(tool, view);

View File

@ -411,7 +411,9 @@ public class DebuggerModelProviderTest extends AbstractGhidraHeadedDebuggerTest
GTree tree = modelProvider.objectsTreePanel.tree;
GTreeNode node = waitForPass(() -> {
GTreeNode n = Unique.assertOne(tree.getSelectedNodes());
assertEquals("Processes@0", n.getName());
assertEquals(
"Processes@%d".formatted(System.identityHashCode(processes.getCanonicalParent(0))),
n.getName());
return n;
});
clickTreeNode(tree, node, MouseEvent.BUTTON1);
@ -822,7 +824,7 @@ public class DebuggerModelProviderTest extends AbstractGhidraHeadedDebuggerTest
}
waitForTasks();
waitForPass(() -> assertEquals("<html>Renamed Thread", node.getDisplayText()));
waitForPass(() -> assertEquals("<html>Renamed&nbsp;Thread", node.getDisplayText()));
}
@Test