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

Test fixes; update for IntegrationTest to find resources in gradle test

Browse Source 
environment
This commit is contained in:
dragonmacher
2026-08-26 15:22:16 -04:00
parent 24d15535bd
commit 4cc4eaf7de
6 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapProvider2Test.java
View File

@@ -194,7 +194,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isEnabled());
assertTrue(executeCB.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -268,7 +268,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isEnabled());
assertTrue(executeCB.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -531,7 +531,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isSelected());
assertFalse(executeCB.isSelected());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -611,7 +611,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isSelected());
assertTrue(executeCB.isSelected());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -689,7 +689,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isEnabled());
assertTrue(executeCB.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -779,7 +779,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isEnabled());
assertTrue(executeCB.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -855,7 +855,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertTrue(writeCB.isEnabled());
assertTrue(executeCB.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -1044,7 +1044,7 @@ public class MemoryMapProvider2Test extends AbstractGhidraHeadedIntegrationTest
assertEquals(newEnd, endField.getAddress());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
// wait for thread to start
Thread.sleep(1000);

22
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/memory/MemoryMapProvider3Test.java
View File

@@ -194,7 +194,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals(0x5600, blockTwoLength.getValue().longValue());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -238,7 +238,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals(0x45ff, blockTwoLength.getValue().longValue());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -284,7 +284,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals(0x4600, blockTwoLength.getValue().longValue());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -326,7 +326,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals(0x2000, blockTwoLength.getValue().longValue());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
program.flushEvents();
waitForSwing();
@@ -428,7 +428,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
blockTwoName.setText("split\t");
});
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
assertTrue(findLabelStr(d.getComponent(), "statusLabel").startsWith("Invalid Block Name"));
close(d);
@@ -535,7 +535,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals("0x1005600", length.getText());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
waitForBusyTool(tool);
assertEquals(".text", model.getValueAt(0, MemoryMapModel.NAME));
@@ -609,7 +609,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals("010075ff", end.getText());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
waitForBusyTool(tool);
@@ -685,7 +685,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals("0100f3ff", end.getText());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
waitForSwing();
assertFalse(okButton.isEnabled());
assertEquals("Part of range (01008000, 01009fff) already exists in memory.",
@@ -744,7 +744,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals("0x6701", length.getText());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
waitForBusyTool(tool);
@@ -773,7 +773,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
assertEquals(getAddr(0x10076ff), end.getAddress());
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
waitForBusyTool(tool);
@@ -842,7 +842,7 @@ public class MemoryMapProvider3Test extends AbstractGhidraHeadedIntegrationTest
runSwing(() -> length.setText("0x7600"));
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
waitForSwing();
assertFalse(okButton.isEnabled());

4
Ghidra/Features/Base/src/test.slow/java/ghidra/util/bean/opteditor/OptionsDialogTest.java
View File

@@ -139,7 +139,7 @@ public class OptionsDialogTest extends AbstractGhidraHeadedIntegrationTest {
// close the options
final JButton okButton = findButtonByText(dialog.getComponent(), "OK");
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
assertTrue(!dialog.isShowing());
@@ -188,7 +188,7 @@ public class OptionsDialogTest extends AbstractGhidraHeadedIntegrationTest {
// close the options
final JButton okButton = findButtonByText(dialog.getComponent(), "OK");
assertTrue(okButton.isEnabled());
runSwing(() -> okButton.getActionListeners()[0].actionPerformed(null));
pressButton(okButton);
assertTrue(!dialog.isShowing());