From 159c34d8dfefcc5ddcfbf6912fdbb1a9aa9fa396 Mon Sep 17 00:00:00 2001 From: Max Hohenegger Date: Tue, 9 Feb 2016 23:39:32 +0100 Subject: Allow filtering of Gitflow feature branches in checkout and track dialog Working with a larger number of feature branches can be tedious, if there is no way of organizing them. A quick way of finding, known, well-named branches, can be a simple text filter. - replaced lists with filtered trees - extended UI test Change-Id: Ifc82c1fece1ed45b6ce929dcd39ecb913ce4615f Signed-off-by: Max Hohenegger Signed-off-by: Matthias Sohn --- .../eclipse/egit/ui/gitflow/AbstractFeatureFinishHandlerTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'org.eclipse.egit.ui.test') diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractFeatureFinishHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractFeatureFinishHandlerTest.java index f527bad32b..e66ff5e1a6 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractFeatureFinishHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/AbstractFeatureFinishHandlerTest.java @@ -9,6 +9,7 @@ package org.eclipse.egit.ui.gitflow; import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive; +import static org.junit.Assert.assertFalse; import org.eclipse.core.runtime.CoreException; import org.eclipse.egit.core.op.BranchOperation; @@ -94,7 +95,12 @@ public abstract class AbstractFeatureFinishHandlerTest extends AbstractGitflowHa }); bot.waitUntil(shellIsActive(UIText.FeatureCheckoutHandler_selectFeature)); - bot.table().select(featureName); + bot.text().setText("these are not the features you're looking for"); + bot.sleep(300); // wait for filter to hit + assertFalse(bot.tree().hasItems()); + bot.text().selectAll(); + bot.text().typeText(featureName); + bot.tree().select(featureName); bot.button("OK").click(); bot.waitUntil(Conditions.waitForJobs(JobFamilies.GITFLOW_FAMILY, "Git flow jobs")); } -- cgit v1.2.3