From e8adab4e74d04c1930d28732b5b4e8bebd63c4f0 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Tue, 3 Dec 2019 16:02:35 -0500 Subject: [PATCH] Tests - fixed test not correctly handling the order of the expanded paths --- .../java/docking/widgets/tree/GTreeTest.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/tree/GTreeTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/tree/GTreeTest.java index 2a23c9921e..85e894ee6d 100644 --- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/tree/GTreeTest.java +++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/tree/GTreeTest.java @@ -545,26 +545,34 @@ public class GTreeTest extends AbstractDockingTest { assertEquals(3, expandedPaths.size()); // make sure one of the expanded paths contains the originalNode - TreePath path = expandedPaths.parallelStream() - .filter(p -> p.getLastPathComponent().equals(originalNode)) - .findAny() - .orElse(null); - assertTrue(path != null); + assertExpanded(originalNode); - GTreeState treeState = gTree.getTreeState(); + GTreeState savedState = gTree.getTreeState(); + // now collapse the tree and restore the state gTree.collapseAll(gTree.getViewRoot()); waitForTree(); expandedPaths = gTree.getExpandedPaths(); assertTrue(expandedPaths.isEmpty()); - gTree.restoreTreeState(treeState); + gTree.restoreTreeState(savedState); waitForTree(); expandedPaths = gTree.getExpandedPaths(); assertEquals(3, expandedPaths.size()); - assertEquals(originalNode, expandedPaths.get(0).getLastPathComponent()); + assertExpanded(originalNode); + } + + private void assertExpanded(GTreeNode node) { + + List expandedPaths = gTree.getExpandedPaths(); + TreePath path = expandedPaths + .stream() + .filter(p -> p.getLastPathComponent().equals(node)) + .findAny() + .orElse(null); + assertNotNull(path); } @Test