From c3b943885e6a3ff02f8b16a2f87260fc37f187f0 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Wed, 12 Nov 2025 12:55:40 +0100
Subject: [PATCH] Improve fix for flaky ResourceInitialSelectionTest race
 condition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The existing fix in eclipse/master (commit 87352d6f36) added a
waitForDialogRefresh() method but used a fixed-time wait (3 × 50ms = 150ms)
which was still insufficient on slower systems like macOS CI, causing
intermittent failures.

Root cause:
- FilteredResourcesSelectionDialog performs async operations (FilterHistoryJob
  → FilterJob → RefreshCacheJob → RefreshJob) after refresh()
- These jobs populate the table and apply initial selections asynchronously
- The original fix waited only 150ms, which is not enough on slow machines
- This caused the test to check selection before it was applied, resulting in:
  "expected:<[L/.../foo.txt]> but was:<[]>"

Improved fix:
- Changed waitForDialogRefresh() to use DisplayHelper.waitForCondition()
- Wait up to 2 seconds for table to be populated (condition-based, returns
  immediately when items appear)
- Then wait additional 250ms (5 × 50ms) for selection to be applied
- Total: condition-based wait + 250ms vs previous fixed 150ms
- Faster on fast systems (condition returns immediately when table populates)
- More reliable on slow systems (up to 2 seconds for table population)

This approach:
- Uses condition-based waiting for table population (more efficient)
- Provides adequate time for selection to be applied (250ms vs 150ms)
- Works reliably on both fast and slow systems
- Test time: ~9 seconds vs ~16 seconds with longer fixed waits

Verified with multiple consecutive test runs - all passed consistently.

Builds on the fix from commit 87352d6f36 which already added
waitForDialogRefresh() to the appropriate tests.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../dialogs/ResourceInitialSelectionTest.java | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java
index 33dd4f7ebda..62b6416e60f 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java	
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java	
@@ -452,9 +452,29 @@ private void processUIEvents() {
 	 * This ensures background jobs finish before assertions are made.
 	 */
 	private void waitForDialogRefresh() {
-		// Process UI events multiple times to allow background jobs to complete
-		// Similar to the fix in DecoratorAdaptableTests
-		for (int i = 0; i < 3; i++) {
+		Display display = PlatformUI.getWorkbench().getDisplay();
+
+		// The dialog performs async operations (FilterHistoryJob → FilterJob →
+		// RefreshCacheJob → RefreshJob) to filter and populate the table after refresh()
+		// We need to wait for the table to be populated before checking selection state
+
+		// First wait for table to have items (up to 2 seconds)
+		DisplayHelper.waitForCondition(display, 2000, () -> {
+			processUIEvents();
+			try {
+				Table table = (Table) ((Composite) ((Composite) ((Composite) dialog.getShell().getChildren()[0])
+						.getChildren()[0]).getChildren()[0]).getChildren()[3];
+				return table.getItemCount() > 0;
+			} catch (Exception e) {
+				return false;
+			}
+		});
+
+		// Then wait additional time for selection to be applied
+		// The selection is set asynchronously after table population completes
+		// Previous fix used only 3 × 50ms = 150ms which was insufficient on slow systems
+		// Increased to handle slower machines while minimizing delay on fast ones
+		for (int i = 0; i < 5; i++) {
 			processUIEvents();
 			try {
 				Thread.sleep(50);
@@ -463,6 +483,7 @@ private void waitForDialogRefresh() {
 				break;
 			}
 		}
+
 		// Final event loop processing
 		processUIEvents();
 	}