GP-0 fixed unit tests for SearchList and ActionChooserDialog

NationalSecurityAgency · Mar 28, 2024 · 77923fa · 77923fa
1 parent 74e402e
commit 77923fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/actions/dialog/ActionChooserDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/actions/dialog/ActionChooserDialog.java
@@ -177,6 +177,11 @@ ActionRunner getActionRunner() {
  return actionRunner;
  }
 
+ // for testing
+ void selectAction(DockingActionIf action) {
+ searchList.setSelectedItem(action);
+ }
+
  @Override
  public void dispose() {
  super.dispose();

diff --git a/Ghidra/Framework/Docking/src/test/java/docking/actions/dialog/ActionsDialogTest.java b/Ghidra/Framework/Docking/src/test/java/docking/actions/dialog/ActionsDialogTest.java
@@ -270,17 +270,20 @@ public void testFilteringOnKeybinding() {
 
  @Test
  public void testActivatingAction() {
- addLocal(toolbar("Apple", ENABLED, contextA));
+ DockingActionIf appleAction = toolbar("Apple", ENABLED, contextA);
+ addLocal(appleAction);
  addLocal(menuItem("Banana", ENABLED, contextA));
  addLocal(popup("Pear", ENABLED, ADD_TO_POPUP, contextA));
  addLocal(keyAction("Kiwi", ENABLED, contextA));
 
  ActionsModel model = buildModel(contextA, ActionDisplayLevel.ALL);
  ActionChooserDialog dialog = getSwing(() -> new ActionChooserDialog(model));
+ dialog.selectAction(appleAction);
 
  assertEquals(0, triggeredActions.size());
 
  pressReturn(dialog);
+
  assertEquals(1, triggeredActions.size());
  assertEquals("Apple", triggeredActions.get(0));
  }

diff --git a/Ghidra/Framework/Docking/src/test/java/docking/widgets/searchlist/SearchListTest.java b/Ghidra/Framework/Docking/src/test/java/docking/widgets/searchlist/SearchListTest.java
@@ -88,6 +88,7 @@ public void testClearFilterRestores() {
  @Test
  public void testSelect() {
  JTextField textField = searchList.getTextField();
+ triggerActionKey(textField, 0, KeyEvent.VK_DOWN);
 
  assertNull(lastChoiceValue);
  assertNull(lastChoiceCategory);