diff options
| author | Matthias Sohn | 2013-01-03 14:16:45 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2013-01-03 14:16:45 +0000 |
| commit | af99aa29e7cbd11de76e0b9897d8f7bbe7bba399 (patch) | |
| tree | 7980686dfcc9f4850f1ec460252e68ab658ed0bc /org.eclipse.egit.ui.test | |
| parent | fff7705ca6387920b1ecfb493fc367be6c52f428 (diff) | |
| download | egit-af99aa29e7cbd11de76e0b9897d8f7bbe7bba399.tar.gz egit-af99aa29e7cbd11de76e0b9897d8f7bbe7bba399.tar.xz egit-af99aa29e7cbd11de76e0b9897d8f7bbe7bba399.zip | |
Fix broken UI tests
GitRepositoriesViewBranchHandlingTest and MergeToolTest stopped working
recently. This was caused by fff7705c introducing a NPE when decorating
light-weight tags and a stale cashed SWTBot bot instance.
Bug: 397376
Change-Id: I8f7846ada5a0e240d3bd38ba7083016c04ec6a6c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test')
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java index 28111f953f..a8d028c3ac 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java @@ -196,7 +196,7 @@ public class GitRepositoriesViewBranchHandlingTest extends TestUtil.joinJobs(JobFamilies.CHECKOUT); localItem.getNode(1).select(); refreshAndWait(); - ContextMenuHelper.clickContextMenu(bot.tree(), myUtil + ContextMenuHelper.clickContextMenu(view.bot().tree(), myUtil .getPluginLocalizedValue("RepoViewDeleteBranch.label")); SWTBotShell confirmPopup = bot .shell(UIText.UnmergedBranchDialog_Title); |