Skip to content

Fix race condition in NestedResourcesTests.testProjectHierarchy #3430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
+14 −4
Merged

Fix race condition in NestedResourcesTests.testProjectHierarchy #3430

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ...ui.tests.navigator/src/org/eclipse/ui/tests/navigator/resources/NestedResourcesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,29 @@ public void testProjectHierarchy() throws Exception {
testProjects.add(projectABA);
testProjects.add(projectABB);

// Wait for NestedProjectManager to process all resource changes
assertTrue("NestedProjectManager did not update children for projectA",
DisplayHelper.waitForCondition(Display.getDefault(), TIMEOUT,
() -> NestedProjectManager.getInstance().getDirectChildrenProjects(projectA).length == 1));

IProject[] childrenOfProjectA = NestedProjectManager.getInstance().getDirectChildrenProjects(projectA);
Assert.assertEquals(1, childrenOfProjectA.length);
Assert.assertEquals(projectAB, childrenOfProjectA[0]);
Assert.assertNull(NestedProjectManager.getInstance().getMostDirectOpenContainer(projectA));

// Wait for NestedProjectManager to process projectAAA
assertTrue("NestedProjectManager did not update children for folderAA",
DisplayHelper.waitForCondition(Display.getDefault(), TIMEOUT,
() -> NestedProjectManager.getInstance().getDirectChildrenProjects(folderAA).length == 1));

IProject[] childrenOfFolderAA = NestedProjectManager.getInstance().getDirectChildrenProjects(folderAA);
Assert.assertEquals(1, childrenOfFolderAA.length);
Assert.assertEquals("aaa", childrenOfFolderAA[0].getName());
Assert.assertEquals(folderAA,
NestedProjectManager.getInstance().getMostDirectOpenContainer(childrenOfFolderAA[0]));

IProject[] childrenOfProjectAB = NestedProjectManager.getInstance().getDirectChildrenProjects(projectAB);
Assert.assertEquals(2, childrenOfProjectAB.length);
// Wait for NestedProjectManager to process both projectABA and projectABB
assertTrue("NestedProjectManager did not update children for projectAB",
DisplayHelper.waitForCondition(Display.getDefault(), TIMEOUT,
() -> NestedProjectManager.getInstance().getDirectChildrenProjects(projectAB).length == 2));
}

@Test
Expand Down
Loading