Xref merge test fixes

This commit is contained in:
dragonmacher
2021-09-21 12:56:33 -04:00
parent ae17ea4cd9
commit 51af44f843
16 changed files with 440 additions and 294 deletions
@@ -435,7 +435,7 @@ public class ClipboardPluginTest extends AbstractGhidraHeadedIntegrationTest {
String operandPrefix = "dword ptr [EBP + ";
String operandReferenceName = "destStr]";
OperandFieldLocation variableOperandReferenceLocation = new OperandFieldLocation(program,
addr("0100416c"), null, addr("0x8"), operandPrefix + operandReferenceName, 1, 9);
addr("0100416c"), null, addr("0x8"), operandPrefix + operandReferenceName, 0, 9);
codeBrowserPlugin.goTo(variableOperandReferenceLocation);
DockingAction pasteAction = getAction(codeBrowserClipboardProvider, PASTE_ACTION_NAME);
@@ -1551,8 +1551,8 @@ public class ClipboardPluginTest extends AbstractGhidraHeadedIntegrationTest {
}
/*
* We remove the FieldPanel focus listeners for these tests, as when they lose focus,
* the selection mechanism does not work as expected. Focus changes can happen
* We remove the FieldPanel focus listeners for these tests, as when they lose focus,
* the selection mechanism does not work as expected. Focus changes can happen
* indeterminately during parallel batch testing.
*/
private void removeFieldPanelFocusListeners(Container c) {