Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 10:47:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-12-13-22'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-12-13 17:19:21 -05:00
parent ce0333d589 27016ed926
commit 7f9de4251d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/datatype/DataTypeSelectionDialogTest.java
+1 -1
View File
@@ -264,7 +264,7 @@ public class DataTypeSelectionDialogTest extends AbstractGhidraHeadedIntegration
}
private void waitForDialogToClose(DockingDialog dockingDialog) {
waitForCondition(() -> !dialog.isShowing(), "Dialog did not close!");
waitForCondition(() -> !dockingDialog.isShowing(), "Dialog did not close!");
waitForSwing();
}
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/ToolActionManagerTest.java
+5 -5
View File
@@ -175,8 +175,8 @@ public class ToolActionManagerTest extends AbstractGhidraHeadedIntegrationTest {
int count = tc.getToolCount();
String toolNamePrefix = "TestCodeBrowser";
final File cbFile = ResourceManager.getResourceFile(
"defaultTools/" + toolNamePrefix + ToolUtils.TOOL_EXTENSION);
final File cbFile = ResourceManager
.getResourceFile("defaultTools/" + toolNamePrefix + ToolUtils.TOOL_EXTENSION);
assertNotNull(cbFile);
DockingActionIf importAction = getAction("Import Tool");
@@ -413,7 +413,7 @@ public class ToolActionManagerTest extends AbstractGhidraHeadedIntegrationTest {
assertTrue(!cb.isSelected());
}
final JButton selectAllButton = (JButton) getInstanceField("selectAllButton", d);
JButton selectAllButton = findButtonByText(d, "Select All");
runSwing(() -> selectAllButton.doClick());
pressButtonByText(d, "OK");
@@ -433,8 +433,8 @@ public class ToolActionManagerTest extends AbstractGhidraHeadedIntegrationTest {
}
newList.removeAll(origList);
runSwing(() -> {
for (int i = 0; i < newList.size(); i++) {
tc.remove(newList.get(i));
for (String element : newList) {
tc.remove(element);
}
});
assertEquals(origList.size(), tc.getToolCount());