Skip to content

Ghidra is a software reverse engineering (SRE) framework

Test fixes

dragonmacher4be53dd7ca90
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/comments/CommentsPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/comments/CommentsPluginTest.java
index e97dfad850..8e3e145a1c 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/comments/CommentsPluginTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/comments/CommentsPluginTest.java
@@ -946,21 +946,19 @@ public class CommentsPluginTest extends AbstractGhidraHeadedIntegrationTest {
}
private GhidraProgramTableModel<?> waitForModel() throws Exception {
- int i = 0;
- while (i++ < 50) {
+
+ GTable table = waitFor(() -> {
TableComponentProvider<?>[] providers = getProviders();
- if (providers.length > 0) {
- GThreadedTablePanel<?> panel = (GThreadedTablePanel<?>) TestUtils
- .getInstanceField("threadedPanel", providers[0]);
- GTable table = panel.getTable();
- while (panel.isBusy()) {
- Thread.sleep(50);
- }
- return (GhidraProgramTableModel<?>) table.getModel();
+ if (providers.length == 0) {
+ return null;
}
- Thread.sleep(50);
- }
- throw new Exception("Unable to get threaded table model");
+
+ return providers[0].getTable();
+ });
+
+ GhidraProgramTableModel<?> gModel = (GhidraProgramTableModel<?>) table.getModel();
+ waitForTableModel(gModel);
+ return gModel;
}
private TableComponentProvider<?>[] getProviders() {