Tests - fixed test not correctly handling the order of the expanded

paths
This commit is contained in:
dragonmacher 2019-12-03 16:02:35 -05:00
parent dee6e0cd4d
commit e8adab4e74

View file

@ -545,26 +545,34 @@ public class GTreeTest extends AbstractDockingTest {
assertEquals(3, expandedPaths.size()); assertEquals(3, expandedPaths.size());
// make sure one of the expanded paths contains the originalNode // make sure one of the expanded paths contains the originalNode
TreePath path = expandedPaths.parallelStream() assertExpanded(originalNode);
.filter(p -> p.getLastPathComponent().equals(originalNode))
.findAny()
.orElse(null);
assertTrue(path != null);
GTreeState treeState = gTree.getTreeState(); GTreeState savedState = gTree.getTreeState();
// now collapse the tree and restore the state
gTree.collapseAll(gTree.getViewRoot()); gTree.collapseAll(gTree.getViewRoot());
waitForTree(); waitForTree();
expandedPaths = gTree.getExpandedPaths(); expandedPaths = gTree.getExpandedPaths();
assertTrue(expandedPaths.isEmpty()); assertTrue(expandedPaths.isEmpty());
gTree.restoreTreeState(treeState); gTree.restoreTreeState(savedState);
waitForTree(); waitForTree();
expandedPaths = gTree.getExpandedPaths(); expandedPaths = gTree.getExpandedPaths();
assertEquals(3, expandedPaths.size()); assertEquals(3, expandedPaths.size());
assertEquals(originalNode, expandedPaths.get(0).getLastPathComponent()); assertExpanded(originalNode);
}
private void assertExpanded(GTreeNode node) {
List<TreePath> expandedPaths = gTree.getExpandedPaths();
TreePath path = expandedPaths
.stream()
.filter(p -> p.getLastPathComponent().equals(node))
.findAny()
.orElse(null);
assertNotNull(path);
} }
@Test @Test