Skip to content

Fix intermittent failures in ResourceInitialSelectionTest by waiting for async jobs #3372

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

Closed
Copilot wants to merge 3 commits into from
Closed

Fix intermittent failures in ResourceInitialSelectionTest by waiting for async jobs #3372

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
961558b
Initial plan
Copilot Oct 2, 2025
d4e16a6
Fix race condition in ResourceInitialSelectionTest by waiting for asy…
Copilot Oct 2, 2025
cdbb93a
Add wait conditions to all tests checking empty selection
Copilot Oct 2, 2025
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
78 changes: 76 additions & 2 deletions ....ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public void testSingleSelectionAndNoInitialSelectionWithInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
DisplayHelper.waitForCondition(display, 3000, () -> !getSelectedItems(dialog).isEmpty());

List<Object> selected = getSelectedItems(dialog);

assertFalse("One file should be selected by default", selected.isEmpty());
Expand All @@ -100,6 +103,10 @@ public void testSingleSelectionAndOneInitialSelectionWithInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
DisplayHelper.waitForCondition(display, 3000,
() -> asList(FILES.get("foo.txt")).equals(getSelectedItems(dialog)));

List<Object> selected = getSelectedItems(dialog);

assertEquals("One file should be selected by default", asList(FILES.get("foo.txt")), selected);
Expand All @@ -119,6 +126,14 @@ public void testSingleSelectionAndOneInitialNonExistingSelectionWithInitialPatte
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
// Wait for table to be populated (even if selection remains empty)
DisplayHelper.waitForCondition(display, 3000, () -> {
Table table = (Table) ((Composite) ((Composite) ((Composite) dialog.getShell().getChildren()[0])
.getChildren()[0]).getChildren()[0]).getChildren()[3];
return table.getItemCount() > 0;
});

List<Object> selected = getSelectedItems(dialog);

assertTrue("No file should be selected by default", selected.isEmpty());
Expand All @@ -136,6 +151,14 @@ public void testSingleSelectionAndOneInitialSelectionWithoutInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
// Wait for table to be populated (even if selection remains empty)
DisplayHelper.waitForCondition(display, 3000, () -> {
Table table = (Table) ((Composite) ((Composite) ((Composite) dialog.getShell().getChildren()[0])
.getChildren()[0]).getChildren()[0]).getChildren()[3];
return table.getItemCount() > 0;
});

List<Object> selected = getSelectedItems(dialog);

assertTrue("No file should be selected by default", selected.isEmpty());
Expand All @@ -155,6 +178,14 @@ public void testSingleSelectionAndOneFilteredSelection() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
// Wait for table to be populated (even if selection remains empty)
DisplayHelper.waitForCondition(display, 3000, () -> {
Table table = (Table) ((Composite) ((Composite) ((Composite) dialog.getShell().getChildren()[0])
.getChildren()[0]).getChildren()[0]).getChildren()[3];
return table.getItemCount() > 0;
});

List<Object> selected = getSelectedItems(dialog);

assertTrue("No file should be selected by default", selected.isEmpty());
Expand All @@ -174,6 +205,10 @@ public void testSingleSelectionAndTwoInitialSelectionsWithInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
DisplayHelper.waitForCondition(display, 3000,
() -> asList(FILES.get("foo.txt")).equals(getSelectedItems(dialog)));

List<Object> selected = getSelectedItems(dialog);

assertEquals("The first file should be selected by default", asList(FILES.get("foo.txt")), selected);
Expand All @@ -192,6 +227,9 @@ public void testMultiSelectionAndNoInitialSelectionWithInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
DisplayHelper.waitForCondition(display, 3000, () -> !getSelectedItems(dialog).isEmpty());

List<Object> selected = getSelectedItems(dialog);

assertFalse("One file should be selected by default", selected.isEmpty());
Expand All @@ -211,6 +249,10 @@ public void testMultiSelectionAndOneInitialSelectionWithInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
DisplayHelper.waitForCondition(display, 3000,
() -> asList(FILES.get("foo.txt")).equals(getSelectedItems(dialog)));

List<Object> selected = getSelectedItems(dialog);

assertEquals("One file should be selected by default", asList(FILES.get("foo.txt")), selected);
Expand All @@ -228,6 +270,14 @@ public void testMultiSelectionAndOneInitialSelectionWithoutInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
// Wait for table to be populated (even if selection remains empty)
DisplayHelper.waitForCondition(display, 3000, () -> {
Table table = (Table) ((Composite) ((Composite) ((Composite) dialog.getShell().getChildren()[0])
.getChildren()[0]).getChildren()[0]).getChildren()[3];
return table.getItemCount() > 0;
});

List<Object> selected = getSelectedItems(dialog);

assertTrue("No file should be selected by default", selected.isEmpty());
Expand All @@ -247,6 +297,14 @@ public void testMultiSelectionAndTwoInitialNonExistingSelectionWithInitialPatter
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
// Wait for table to be populated (even if selection remains empty)
DisplayHelper.waitForCondition(display, 3000, () -> {
Table table = (Table) ((Composite) ((Composite) ((Composite) dialog.getShell().getChildren()[0])
.getChildren()[0]).getChildren()[0]).getChildren()[3];
return table.getItemCount() > 0;
});

List<Object> selected = getSelectedItems(dialog);

assertTrue("No file should be selected by default", selected.isEmpty());
Expand All @@ -266,8 +324,12 @@ public void testMultiSelectionAndSomeInitialNonExistingSelectionWithInitialPatte
dialog.open();
dialog.refresh();

List<Object> selected = getSelectedItems(dialog);
Display display = PlatformUI.getWorkbench().getDisplay();
Set<IFile> expectedSelection = new HashSet<>(asList(FILES.get("bar.txt"), FILES.get("foofoo")));
DisplayHelper.waitForCondition(display, 3000,
() -> expectedSelection.equals(new HashSet<>(getSelectedItems(dialog))));

List<Object> selected = getSelectedItems(dialog);
boolean allInitialElementsAreSelected = expectedSelection.equals(new HashSet<>(selected));

assertTrue("Two files should be selected by default", allInitialElementsAreSelected);
Expand All @@ -288,6 +350,12 @@ public void testMultiSelectionAndTwoInitialSelectionsWithInitialPattern() {
dialog.open();
dialog.refresh();

Display display = PlatformUI.getWorkbench().getDisplay();
DisplayHelper.waitForCondition(display, 3000, () -> {
List<Object> selected = getSelectedItems(dialog);
return selected.containsAll(initialSelection) && initialSelection.containsAll(selected);
});

List<Object> selected = getSelectedItems(dialog);
boolean initialElementsAreSelected = selected.containsAll(initialSelection)
&& initialSelection.containsAll(selected);
Expand All @@ -310,8 +378,14 @@ public void testMultiSelectionAndTwoInitialFilteredSelections() {
dialog.open();
dialog.refresh();

List<Object> selected = getSelectedItems(dialog);
Display display = PlatformUI.getWorkbench().getDisplay();
List<IFile> expectedSelection = asList(FILES.get("foo.txt"), FILES.get("bar.txt"));
DisplayHelper.waitForCondition(display, 3000, () -> {
List<Object> selected = getSelectedItems(dialog);
return selected.containsAll(expectedSelection) && expectedSelection.containsAll(selected);
});

List<Object> selected = getSelectedItems(dialog);
boolean initialElementsAreSelected = selected.containsAll(expectedSelection)
&& expectedSelection.containsAll(selected);

Expand Down
Loading