Skip to content

Adjust wait for initial dialog contents in QuickAccessDialogTest #4027

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

Open
trancexpress wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −6
Open

Adjust wait for initial dialog contents in QuickAccessDialogTest #4027

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
19 changes: 13 additions & 6 deletions ...pse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessDialogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class QuickAccessDialogTest {

private class TestQuickAccessDialog extends QuickAccessDialog {

private volatile String infoText;

public TestQuickAccessDialog(IWorkbenchWindow activeWorkbenchWindow, Command command) {
super(activeWorkbenchWindow, command);
}
Expand All @@ -71,6 +73,12 @@ public TestQuickAccessDialog(IWorkbenchWindow activeWorkbenchWindow, Command com
protected IDialogSettings getDialogSettings() {
return dialogSettings;
}

@Override
protected void setInfoText(String text) {
super.setInfoText(text);
infoText = text;
}
}

private static final int TIMEOUT = 5000;
Expand Down Expand Up @@ -294,17 +302,16 @@ private void activateCurrentElement(QuickAccessDialog dialog) {
@Test
public void testPreviousChoicesAvailableForExtension() {
// add one selection to history
QuickAccessDialog dialog = new TestQuickAccessDialog(activeWorkbenchWindow, null);
TestQuickAccessDialog dialog = new TestQuickAccessDialog(activeWorkbenchWindow, null);
Text text = dialog.getQuickAccessContents().getFilterText();
text.setText("initial test");
dialog.open();
/*
* wait for the initial dialog contents, to avoid race conditions later on in the test, see:
* wait for the dialog initialization, to avoid race conditions later on in the test, see:
* https://github.com/eclipse-platform/eclipse.platform.ui/issues/4009
*/
assertTrue(DisplayHelper.waitForCondition(text.getDisplay(), TIMEOUT,
() -> dialogContains(dialog, "initial test")),
"Unexpected dialog contents: " + getAllEntries(dialog.getQuickAccessContents().getTable()));
assertTrue(DisplayHelper.waitForCondition(text.getDisplay(), TIMEOUT * 1000,
() -> dialog.infoText != null),
"Unexpected dialog info: " + dialog.infoText);
text.setText(TestQuickAccessComputer.TEST_QUICK_ACCESS_PROPOSAL_LABEL);
final Table firstTable = dialog.getQuickAccessContents().getTable();
assertTrue(DisplayHelper.waitForCondition(text.getDisplay(), TIMEOUT,
Expand Down
Loading