yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Test fixes

Browse source
This commit is contained in:
dragonmacher 2025-09-10 14:14:21 -04:00
parent 657ec39201
commit 6bba2ea685
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/test.slow/java/docking/ComponentProviderActionsTest.java
View file

@ -538,7 +538,7 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
DockingWindowManager.setMouseOverAction(windowMenuAction);
performLaunchKeyStrokeDialogAction();
DialogComponentProvider warningDialog = waitForDialogComponent("Unable to Set Keybinding");
DialogComponentProvider warningDialog = waitForDialogComponent("Unable to Set Key Binding");
close(warningDialog);
}

31
Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java
View file

@ -51,7 +51,6 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
private KeyBindingsPanel panel;
private JTable table;
private TableModel model;
private JTextField keyField;
private JTextPane statusPane;
private JDialog dialog;
@ -82,8 +81,8 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
@Test
public void testKeyBindingsDisplay() throws Exception {
assertEquals(3, model.getColumnCount());
String[] ids = new String[] { "Action Name", "KeyBinding", "Plugin Name" };
assertEquals(3, table.getColumnCount());
String[] ids = new String[] { "Action Name", "Key Binding", "Owner" };
TableColumnModel m = table.getColumnModel();
for (int i = 0; i < ids.length; i++) {
TableColumn c = m.getColumn(i);
@ -91,15 +90,9 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
}
assertTrue(model.getRowCount() > 0);
// look for the info panel
MultiLineLabel label = findComponent(panel, MultiLineLabel.class);
String str = "To add or change a key binding, select an action\n" +
"and type any key combination.";
assertEquals(str, label.getLabel());
assertMessage("Select an action to change a keybinding");
// verify that the description is displayed for the selected action
selectRowForAction(action1);
String actualText = getText(statusPane);
@ -130,6 +123,7 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
assertNotNull("Could not find edit key binding action.", action);
selectRowForAction(action);
JTextField keyField = getKeyField();
triggerText(keyField, "z");
assertKeyFieldText("Z");
@ -148,14 +142,16 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
}
}
triggerText(keyField, "z");
assertMessage("No action is selected.");
JTextField keyField = getKeyField();
assertNull(keyField);
assertMessage("Select an action to change a keybinding");
}
@Test
public void testSetKeyBinding() throws Exception {
// set a key binding on an action that does not have a key binding
selectRowForAction(action1);
JTextField keyField = getKeyField();
triggerActionKey(keyField, InputEvent.CTRL_DOWN_MASK, KeyEvent.VK_X);
KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_DOWN_MASK);
assertKeyFieldText(KeyBindingUtils.parseKeyStroke(ks));
@ -168,6 +164,7 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
public void testSetKeyBinding2() throws Exception {
selectRowForAction(action1);
JTextField keyField = getKeyField();
triggerText(keyField, "x");
assertKeyFieldText("X");
@ -394,6 +391,7 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
}
private void assertNoKeyStrokeText() {
JTextField keyField = getKeyField();
assertEquals("", keyField.getText());
}
@ -402,6 +400,7 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
}
private void assertKeyFieldText(String s) {
JTextField keyField = getKeyField();
assertEquals(s, runSwing(() -> keyField.getText()));
}
@ -410,6 +409,7 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
}
private void typeKeyStroke(KeyStroke ks) {
JTextField keyField = getKeyField();
triggerKey(keyField, ks);
waitForSwing();
}
@ -419,6 +419,7 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
}
private void typeKeyStroke(int modifiers, int keyCode) {
JTextField keyField = getKeyField();
triggerKey(keyField, modifiers, keyCode, KeyEvent.CHAR_UNDEFINED);
waitForSwing();
}
@ -538,12 +539,16 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
dialog.setVisible(true);
});
table = findComponent(panel, JTable.class);
keyField = (JTextField) findComponentByName(panel, "Key Entry Text Field");
statusPane = findComponent(panel, JTextPane.class);
model = table.getModel();
waitForSwing();
}
private JTextField getKeyField() {
JTextField keyField = (JTextField) findComponentByName(panel, "Key Entry Text Field");
return keyField;
}
// find 2 actions that do not have key bindings so that we can add and change the values
private void grabActionsWithoutKeyBinding() {
Set<DockingActionIf> list = tool.getAllActions();

6
Ghidra/Features/Base/src/test.slow/java/ghidra/util/bean/opteditor/OptionsDialogTest.java
View file

@ -980,8 +980,6 @@ public class OptionsDialogTest extends AbstractGhidraHeadedIntegrationTest {
selectRowForAction(panel, actionName, actionOwner);
setToggleButtonSelected(panel, "Enter Mouse Binding", true);
JPanel actionBindingPanel = (JPanel) getInstanceField("actionBindingPanel", panel);
JTextField textField = (JTextField) getInstanceField("mouseEntryField", actionBindingPanel);
@ -1008,8 +1006,6 @@ public class OptionsDialogTest extends AbstractGhidraHeadedIntegrationTest {
selectRowForAction(panel, actionName, actionOwner);
setToggleButtonSelected(panel, "Enter Mouse Binding", false);
JPanel actionBindingPanel = (JPanel) getInstanceField("actionBindingPanel", panel);
KeyEntryPanel keyEntryPanel =
(KeyEntryPanel) getInstanceField("keyEntryPanel", actionBindingPanel);
@ -1031,8 +1027,6 @@ public class OptionsDialogTest extends AbstractGhidraHeadedIntegrationTest {
selectRowForAction(panel, actionName, actionOwner);
setToggleButtonSelected(panel, "Enter Mouse Binding", false);
pressButtonByName(panel, "Clear Key Binding");
waitForSwing();