Ghidra is a software reverse engineering (SRE) framework
Test fixes
dragonmachera58340b810f0
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/field/XrefViewerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/field/XrefViewerTest.javaindex 4f25fde1f0..d5c87c77e1 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/field/XrefViewerTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/field/XrefViewerTest.java@@ -181,7 +181,10 @@ public class XrefViewerTest extends AbstractGhidraHeadedIntegrationTest {selectRow(table, 0);assertTrue(runSwing(() -> deleteAction.isEnabled()));- performAction(deleteAction, table, true);+ performAction(deleteAction, table, false);+ DialogComponentProvider dialog = waitForDialogComponent("Delete Xrefs?");+ pressButtonByText(dialog, "Delete");+ waitForTableModel(table.getModel());assertEquals(0, table.getModel().getRowCount());assertReference("01001009", "01001005", false);diff --git a/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java b/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.javaindex 3009cdf2b1..2d8072c91c 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java@@ -92,7 +92,6 @@ public class ConcurrentTestExceptionStatement extends Statement {}private boolean isRunningFromEclipse() {- // TODO: this may need adjustment for other Eclipse platforms/versionsreturn System.getProperty("java.class.path").endsWith(".cp");}@@ -195,7 +194,6 @@ public class ConcurrentTestExceptionStatement extends Statement {}}- @SuppressWarnings({ "removal" }) // Thread.stop()private void checkForTestTimeout(TestThread testThread) {if (timoutMonitor == null || !timoutMonitor.didRun()) {@@ -216,9 +214,7 @@ public class ConcurrentTestExceptionStatement extends Statement {StackTraceElement[] trace = testThread.getStackTrace();- // if we get here, we are one step away from System.exit(1), so do the- // bad thing and kill the thread- testThread.stop();+ testThread.interrupt();lastTestThread = null; // don't try to joinAssertionFailedError error =new AssertionFailedError("Test locked-up--aborting! See log for details");