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

Merge remote-tracking branch 'origin/GT-3079-ghidravore_add_to_program'

Browse source
This commit is contained in:
Ryan Kurtz 2019-08-14 12:29:29 -04:00
commit aba5a2b672
19 changed files with 132 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java
View file

@ -15,7 +15,7 @@
*/
package generic.test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.*;
import java.awt.*;
import java.awt.event.*;
@ -661,10 +661,10 @@ public abstract class AbstractGenericTest extends AbstractGTest {
if (button == null) {
throw new AssertionError("Couldn't find button " + buttonText + ".");
}
if (!button.isShowing()) {
if (!runSwing(() -> button.isShowing())) {
throw new AssertionError("Button " + buttonText + " is not showing.");
}
if (!button.isEnabled()) {
if (!runSwing(() -> button.isEnabled())) {
throw new AssertionError("Button " + buttonText + " is not enabled.");
}
pressButton(button, waitForCompletion);
@ -700,10 +700,10 @@ public abstract class AbstractGenericTest extends AbstractGTest {
if (button == null) {
throw new AssertionError("Couldn't find button " + buttonName + ".");
}
if (!button.isVisible()) {
if (!runSwing(() -> button.isShowing())) {
throw new AssertionError("Button " + buttonName + " is not showing.");
}
if (!button.isEnabled()) {
if (!runSwing(() -> button.isEnabled())) {
throw new AssertionError("Button " + buttonName + " is not enabled.");
}
pressButton(button, waitForCompletion);