junit

Author: ghidravore

Ghidra/Features/Base/src/test.slow/java/docking/widgets/tree/GTreeEventTest.java

@@ -28,13 +28,11 @@
 
 import docking.DockingWindowManager;
 import docking.test.AbstractDockingTest;
-import docking.widgets.filter.FilterTextField;
 import ghidra.test.DummyTool;
 
 public class GTreeEventTest extends AbstractDockingTest {
 
 	private GTree gTree;
-	private FilterTextField filterField;
 
 	private DockingWindowManager winMgr;
 
@@ -46,7 +44,7 @@ public void setUp() throws Exception {
 		root = new TestRootNode();
 		gTree = new GTree(root);
 		gTree.getModel().addTreeModelListener(new TestTreeModelListener());
-		filterField = (FilterTextField) gTree.getFilterField();
+//		filterField = (FilterTextField) gTree.getFilterField();
 
 		winMgr = new DockingWindowManager(new DummyTool(), null);
 		winMgr.addComponent(new TestTreeComponentProvider(gTree));
@@ -60,7 +58,7 @@ public void testNodeAdded() {
 		root.addNode(new LeafNode("ABC"));
 		assertEquals(1, events.size());
 		TreeEvent treeEvent = events.get(0);
-		assertEquals(EventType.STRUCTURE_CHANGED, treeEvent.eventType);
+		assertEquals(EventType.INSERTED, treeEvent.eventType);
 	}
 
 	private void waitForTree() {

Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/tree/GTreeTest.java

@@ -543,7 +543,13 @@ public void testRestoreTreeState_ExpandedStateOnly() {
 
 		List<TreePath> expandedPaths = gTree.getExpandedPaths();
 		assertEquals(3, expandedPaths.size());
-		assertEquals(originalNode, expandedPaths.get(0).getLastPathComponent());
+
+		// 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);
 
 		GTreeState treeState = gTree.getTreeState();