[FilteredResource] Fix Resource Item Label Tests
Confirm that the file is made and cache is reloaded before searching for
matches
Change-Id: I69541518e0c0c6f12d2cc2e79c5f8abca03a1cec
Signed-off-by: Lucas Bullen <lbullen@redhat.com>
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceItemLabelTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceItemLabelTest.java
index 0e457a6..d6df243 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceItemLabelTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceItemLabelTest.java
@@ -23,6 +23,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.FilteredResourcesSelectionDialog;
import org.eclipse.ui.tests.harness.util.DisplayHelper;
@@ -135,11 +136,22 @@
dialog = new FilteredResourcesSelectionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
true, project,
IResource.FILE);
- dialog.setInitialPattern(searchString);
dialog.setBlockOnOpen(false);
dialog.create();
dialog.open();
Shell shell = dialog.getShell();
+
+ new DisplayHelper() {
+ @Override
+ protected boolean condition() {
+ return project.getFile(fileName).exists();
+ }
+ }.waitForCondition(shell.getDisplay(), 1000);
+
+ assertTrue("File was not created", project.getFile(fileName).exists());
+ dialog.reloadCache(true, new NullProgressMonitor());
+
+ ((Text) dialog.getPatternControl()).setText(searchString);
Table table = (Table) ((Composite) ((Composite) ((Composite) shell.getChildren()[0]).getChildren()[0])
.getChildren()[0]).getChildren()[3];
@@ -148,7 +160,7 @@
protected boolean condition() {
return table.getItemCount() > 0;
}
- }.waitForCondition(shell.getDisplay(), 1000);
+ }.waitForCondition(shell.getDisplay(), 3000);
assertEquals("Impropper number of results", 1, table.getItemCount());
