Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fix-3-2-21' into patch

Browse Source
This commit is contained in:
ghidra1 2021-03-02 18:27:19 -05:00
commit 1ff9f5814e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
View File

@ -2017,7 +2017,7 @@ public abstract class AbstractDockingTest extends AbstractGenericTest {
// ThreadedTableModelUpdateMgr<ROW_OBJECT>
Object updateManager = getInstanceField("updateManager", model);
SwingUpdateManager sum =
(SwingUpdateManager) getInstanceField("updateManager", updateManager);
(SwingUpdateManager) getInstanceField("addRemoveUpdater", updateManager);
Worker worker = (Worker) getInstanceField("worker", model);
String workerState = worker == null ? "<no worker>" : Boolean.toString(worker.isBusy());
return "Table model busy state - Swing Update Manager? " + sum.isBusy() + "; worker?" +

2
Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/table/threaded/IncrementalThreadedTableTest.java
View File

@ -515,7 +515,7 @@ public class IncrementalThreadedTableTest extends AbstractThreadedTableTest {
if (isBusy) {
SwingUpdateManager sum =
(SwingUpdateManager) getInstanceField("updateManager", tableUpdateManager);
(SwingUpdateManager) getInstanceField("addRemoveUpdater", tableUpdateManager);
spy.record("\t\tSwingUpdateManager busy?: " + sum.isBusy());
if (sum.isBusy()) {