diff options
| author | Thomas Wolf | 2016-03-22 06:43:20 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-03-22 12:59:26 +0000 |
| commit | 5a532855823b2631e61e59b447fe559c4118f70a (patch) | |
| tree | c10d5bce7b343f9b34c5944d453cf1f472e05897 /org.eclipse.egit.gitflow.ui/src/org/eclipse/egit | |
| parent | 6c77955735e23720cf8dda2a5397188f99dfed88 (diff) | |
| download | egit-5a532855823b2631e61e59b447fe559c4118f70a.tar.gz egit-5a532855823b2631e61e59b447fe559c4118f70a.tar.xz egit-5a532855823b2631e61e59b447fe559c4118f70a.zip | |
Test stability: fix FeatureFinishSquashTest
The test didn't wait for the shell to open in
AbstractFeatureFinishHandlerTest.finishFeature(). Unfortunately, that
shell didn't have a title, and was thus a bit inconvenient to wait for.
* Give that shell (a TitleAreaDialog) a title.
TitleAreaDialog.setTitle() does not set the shell's title!
* Simplify the code: use the async clickContextMenu instead of the
sync variant wrapped in an asyncExec.
Change-Id: I5e26490682821888b4f62da8a323cbc1aeeaded4
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.gitflow.ui/src/org/eclipse/egit')
| -rw-r--r-- | org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java index ddd88429a5..44a5bd45b3 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java @@ -59,6 +59,7 @@ public class FinishFeatureDialog extends TitleAreaDialog { public void create() { super.create(); setTitle(UIText.FinishFeatureDialog_title); + getShell().setText(UIText.FinishFeatureDialog_title); setMessage(NLS.bind( UIText.FinishFeatureDialog_setParameterForFinishing, featureBranch), IMessageProvider.INFORMATION); |