Tests - fixed test broken to the shared owner name changing

This commit is contained in:
dragonmacher 2020-01-29 16:04:49 -05:00
parent b66aaa337d
commit 4d728abc71

View file

@ -449,8 +449,8 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
private void setOptionsKeyStroke(KeyStroke newKs) { private void setOptionsKeyStroke(KeyStroke newKs) {
ToolOptions keyOptions = tool.getOptions(DockingToolConstants.KEY_BINDINGS); ToolOptions keyOptions = tool.getOptions(DockingToolConstants.KEY_BINDINGS);
// shared option name/format: "Provider Name (Tool)" - the shared action's owner is the Tool // shared option name/format: "Provider Name (Shared)" - the shared action's owner is the Tool
runSwing(() -> keyOptions.setKeyStroke(provider.getName() + " (Tool)", newKs)); runSwing(() -> keyOptions.setKeyStroke(provider.getName() + " (Shared)", newKs));
waitForSwing(); waitForSwing();
} }
@ -496,8 +496,8 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
ToolOptions options = getKeyBindingOptions(); ToolOptions options = getKeyBindingOptions();
// Option name: the action name with the 'Tool' as the owner // Option name: the action name with the 'Shared' owner
String fullName = provider.getName() + " (Tool)"; String fullName = provider.getName() + " (Shared)";
KeyStroke optionsKs = runSwing(() -> options.getKeyStroke(fullName, null)); KeyStroke optionsKs = runSwing(() -> options.getKeyStroke(fullName, null));
assertEquals("Key stroke in options does not match expected key stroke", expectedKs, assertEquals("Key stroke in options does not match expected key stroke", expectedKs,
optionsKs); optionsKs);