Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Nittka2020-01-04 19:31:15 +0000
committerThomas Wolf2020-02-25 07:14:02 +0000
commit1205b4b3e62d5622378c20576e1582f9155c677c (patch)
tree2e076c0dd3991f6109bf052e9c91e10f3c7d9c81 /org.eclipse.egit.ui.test/src
parent97385df3e09c3351760e6f6ca415438ca1dba786 (diff)
downloadegit-1205b4b3e62d5622378c20576e1582f9155c677c.tar.gz
egit-1205b4b3e62d5622378c20576e1582f9155c677c.tar.xz
egit-1205b4b3e62d5622378c20576e1582f9155c677c.zip
Create branch from repository group
Allow creating a new branch for a mixed selections of repositories and/or repository groups. The branch is created from the current head. Except for the branch name no further configuration is possible. Bug: 558561 Change-Id: Ic6dccb6d9813ee568c70997d997f92121de46752 Signed-off-by: Alexander Nittka <alex@nittka.de> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui.test/src')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/actions/SwitchToMenuTest.java20
1 files changed, 12 insertions, 8 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/actions/SwitchToMenuTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/actions/SwitchToMenuTest.java
index 7448f0bc80..6e10462354 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/actions/SwitchToMenuTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/actions/SwitchToMenuTest.java
@@ -209,13 +209,15 @@ public class SwitchToMenuTest extends LocalRepositoryTestCase {
mockMultiProjectSelection(PROJ1, PROJ2);
MenuItem[] items = fillMenu();
- assertTextEquals("change/15", items[0]);
- assertTextEquals("change/16", items[1]);
- assertTextEquals("change/17", items[2]);
- assertTextEquals("change/18", items[3]);
- assertTextEquals("change/19", items[4]);
- assertTextEquals("master", items[5]);
- assertTextEquals("stable", items[6]);
+ assertTextEquals(UIText.SwitchToMenu_NewBranchMenuLabel, items[0]);
+ // item[1] is separator
+ assertTextEquals("change/15", items[2]);
+ assertTextEquals("change/16", items[3]);
+ assertTextEquals("change/17", items[4]);
+ assertTextEquals("change/18", items[5]);
+ assertTextEquals("change/19", items[6]);
+ assertTextEquals("master", items[7]);
+ assertTextEquals("stable", items[8]);
}
@Test
@@ -273,7 +275,9 @@ public class SwitchToMenuTest extends LocalRepositoryTestCase {
mockMultiProjectSelection(PROJ1, PROJ2);
MenuItem[] items = fillMenu();
- assertTextEquals(UIText.SwitchToMenu_NoCommonBranchesFound, items[0]);
+ assertTextEquals(UIText.SwitchToMenu_NewBranchMenuLabel, items[0]);
+ // item[1] is separator
+ assertTextEquals(UIText.SwitchToMenu_NoCommonBranchesFound, items[2]);
// delete reflog again to not confuse other tests
new File(gitOne, Constants.LOGS + "/" + Constants.HEAD).delete();

Back to the top