mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GT-2869 - Key Bindings - refactor of methods to provide all actions

Browse Source
This commit is contained in:
dragonmacher
2019-06-04 18:15:16 -04:00
parent c1de98304a
commit 43fa7e3f92
75 changed files with 1243 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Ghidra/Features/ByteViewer/src/test.slow/java/ghidra/framework/plugintool/dialog/SaveToolConfigDialogTest.java
View File

@@ -21,7 +21,6 @@ import java.awt.event.ActionListener;
import java.io.File;
import java.io.InputStream;
import java.net.URL;
import java.util.List;
import javax.swing.*;
@@ -97,9 +96,9 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
tc.remove("MyTestTool");
tc.remove("TestTool");
waitForPostedSwingRunnables();
waitForSwing();
tool.setConfigChanged(false);
SwingUtilities.invokeAndWait(() -> saveDialog.close());
runSwing(() -> saveDialog.close());
env.dispose();
}
@@ -125,7 +124,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
pressButtonByText(saveDialog, "Save");
assertTrue(!tool.hasConfigChanged());
waitForPostedSwingRunnables();
waitForSwing();
assertTrue(!saveDialog.isVisible());
ToolChest tc = tool.getProject().getLocalToolChest();
ToolTemplate config = tc.getToolTemplate("MyTestTool");
@@ -142,7 +141,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
while (saveDialog.isVisible()) {
Thread.sleep(5);
}
waitForPostedSwingRunnables();
waitForSwing();
assertEquals("Name cannot have spaces.", msg);
}
@@ -156,7 +155,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
pressButtonByText(saveDialog, "Save");
assertTrue(!tool.hasConfigChanged());
waitForPostedSwingRunnables();
waitForSwing();
assertTrue(!saveDialog.isVisible());
ToolChest tc = tool.getProject().getLocalToolChest();
ToolTemplate template = tc.getToolTemplate("MyTestTool");
@@ -180,7 +179,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
while (saveDialog.isVisible()) {
Thread.sleep(5);
}
waitForPostedSwingRunnables();
waitForSwing();
}
@Test
@@ -208,8 +207,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
final JButton browseButton = (JButton) findComponentByName(saveDialog, "BrowseButton");
pressButton(browseButton, false);
final GhidraFileChooser chooser =
waitForDialogComponent(GhidraFileChooser.class);
final GhidraFileChooser chooser = waitForDialogComponent(GhidraFileChooser.class);
assertNotNull(chooser);
runSwing(() -> chooser.setSelectedFile(destFile));
@@ -240,7 +238,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
while (tc.getToolTemplate("MyTestTool") == null) {
Thread.sleep(10);
}
waitForPostedSwingRunnables();
waitForSwing();
setText(toolNameField, "MyTestTool", false);
@@ -256,10 +254,9 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
JButton saveButton = findButtonByText(saveDialog, "Save");
saveButton.getActionListeners()[0].actionPerformed(null);
});
waitForPostedSwingRunnables();
waitForSwing();
final OptionDialog d =
waitForDialogComponent(tool.getToolFrame(), OptionDialog.class, 2000);
final OptionDialog d = waitForDialogComponent(OptionDialog.class);
assertNotNull(d);
assertEquals("Overwrite Tool?", d.getTitle());
pressButtonByText(d.getComponent(), "Overwrite");
@@ -267,7 +264,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
while (d.isVisible()) {
Thread.sleep(10);
}
waitForPostedSwingRunnables();
waitForSwing();
assertTrue(!tool.hasConfigChanged());
}
@@ -282,11 +279,11 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
while (tc.getToolTemplate("MyTestTool") == null) {
Thread.sleep(10);
}
waitForPostedSwingRunnables();
waitForSwing();
setText(toolNameField, "MyTestTool", false);
SwingUtilities.invokeAndWait(() -> {
runSwing(() -> {
// force a change to the tool config
try {
tool.addPlugin(ByteViewerPlugin.class.getName());
@@ -301,10 +298,9 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
JButton saveButton = findButtonByText(saveDialog, "Save");
saveButton.getActionListeners()[0].actionPerformed(null);
});
waitForPostedSwingRunnables();
waitForSwing();
final OptionDialog d =
waitForDialogComponent(OptionDialog.class);
final OptionDialog d = waitForDialogComponent(OptionDialog.class);
assertNotNull(d);
assertEquals("Overwrite Tool?", d.getTitle());
pressButtonByText(d.getComponent(), "Cancel");
@@ -312,17 +308,16 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
while (d.isVisible()) {
Thread.sleep(10);
}
waitForPostedSwingRunnables();
waitForSwing();
assertTrue(tool.hasConfigChanged());
}
/////////////////////////////////////////////////////////////////////
private void showDialogs() throws Exception {
List<DockingActionIf> actions =
tool.getDockingActionsByFullActionName("Save Tool As (Tool)");
performAction(actions.get(0), false);
waitForPostedSwingRunnables();
DockingActionIf action = getAction(tool, "Tool", "Save Tool As");
performAction(action, false);
waitForSwing();
saveDialog = waitForDialogComponent(SaveToolConfigDialog.class);
@@ -335,7 +330,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
private void setText(final JTextField field, final String text, final boolean doAction)
throws Exception {
SwingUtilities.invokeAndWait(() -> {
runSwing(() -> {
field.setText(text);
if (doAction) {
ActionListener[] listeners = field.getActionListeners();
@@ -344,6 +339,6 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
}
}
});
waitForPostedSwingRunnables();
waitForSwing();
}
}