diff options
author | Mathias Kinzler | 2010-09-02 15:58:00 +0000 |
---|---|---|
committer | Mathias Kinzler | 2010-09-02 15:58:00 +0000 |
commit | 3313891bdebdee13e1257c5b75371e7e21d34d0b (patch) | |
tree | 08e6e2ca27d26138d289a76380e29343e7e16a3b /org.eclipse.egit.ui.test | |
parent | 293bf13355d4d552f514386ac3690604930162f5 (diff) | |
download | egit-3313891bdebdee13e1257c5b75371e7e21d34d0b.tar.gz egit-3313891bdebdee13e1257c5b75371e7e21d34d0b.tar.xz egit-3313891bdebdee13e1257c5b75371e7e21d34d0b.zip |
Fix a failing UI test
Just a matter of sequence....
Change-Id: I62ffa2bada0c00cc233bbfdd52d8b5378de271ff
Signed-off-by: Mathias Kinzler <mathias.kinzler@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 | 40 |
1 files changed, 20 insertions, 20 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 65783662f1..b3bede28f6 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 @@ -82,6 +82,26 @@ public class GitRepositoriesViewBranchHandlingTest extends } @Test + public void testMergeOnRepo() throws Exception { + Activator.getDefault().getRepositoryUtil().addConfiguredRepository( + clonedRepositoryFile); + + SWTBotTree tree = getOrOpenView().bot().tree(); + + myRepoViewUtil.getRootItem(tree, clonedRepositoryFile).select(); + + ContextMenuHelper.clickContextMenu(tree, myUtil + .getPluginLocalizedValue("RepoViewMerge.label")); + + String title = NLS.bind(UIText.MergeTargetSelectionDialog_TitleMerge, + clonedRepositoryFile.getPath().toString()); + + SWTBotShell mergeDialog = bot.shell(title); + // TODO do some merge here + mergeDialog.close(); + } + + @Test public void testCreateCheckoutDeleteLocalBranch() throws Exception { Activator.getDefault().getRepositoryUtil().addConfiguredRepository( repositoryFile); @@ -308,24 +328,4 @@ public class GitRepositoriesViewBranchHandlingTest extends .expand(); assertEquals("newmaster", item.getNode(0).getText()); } - - @Test - public void testMergeOnRepo() throws Exception { - Activator.getDefault().getRepositoryUtil().addConfiguredRepository( - clonedRepositoryFile); - - SWTBotTree tree = getOrOpenView().bot().tree(); - - myRepoViewUtil.getRootItem(tree, clonedRepositoryFile).select(); - - ContextMenuHelper.clickContextMenu(tree, myUtil - .getPluginLocalizedValue("RepoViewMerge.label")); - - String title = NLS.bind(UIText.MergeTargetSelectionDialog_TitleMerge, - clonedRepositoryFile.getPath().toString()); - - SWTBotShell mergeDialog = bot.shell(title); - // TODO do some merge here - mergeDialog.close(); - } } |