diff options
| author | Thomas Wolf | 2016-01-26 19:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-01-26 19:55:28 +0000 |
| commit | 0d087b8862c41f93b8f541455222775e58781806 (patch) | |
| tree | 2bc3b697ba6456ed0d77bc92b51b2dce9cd73e70 | |
| parent | aae838b03d0847728ea685a16d022542d7de2796 (diff) | |
| parent | 759c7560001739b0f8ed8c34a7c6d9b3b70940ce (diff) | |
| download | egit-0d087b8862c41f93b8f541455222775e58781806.tar.gz egit-0d087b8862c41f93b8f541455222775e58781806.tar.xz egit-0d087b8862c41f93b8f541455222775e58781806.zip | |
Merge "Make the gitflow UI tests independent of the keyboard layout"
3 files changed, 6 insertions, 8 deletions
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 cafcf89e95..f527bad32b 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 @@ -72,7 +72,7 @@ public abstract class AbstractFeatureFinishHandlerTest extends AbstractGitflowHa }); bot.waitUntil(shellIsActive(UIText.FeatureStartHandler_provideFeatureName)); - bot.text().typeText(featureName); + bot.text().setText(featureName); bot.button("OK").click(); bot.waitUntil(Conditions.waitForJobs(JobFamilies.GITFLOW_FAMILY, "Git flow jobs")); } diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java index 5393b84b66..b6ed49ea0e 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java @@ -91,9 +91,9 @@ public class FeatureFinishSquashHandlerTest extends @Override protected void preFinish() { - int firstLine = 0; - bot.styledText().selectLine(firstLine); - bot.styledText().typeText(SQUASHED_COMMENT_SUMMARY); + String text = bot.styledText().getText(); + text = text.substring(text.indexOf('\n')); + bot.styledText().setText(SQUASHED_COMMENT_SUMMARY + text); bot.button("OK").click(); } diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java index 07786071c4..6662edf33e 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/InitHandlerTest.java @@ -141,9 +141,7 @@ public class InitHandlerTest extends AbstractGitflowHandlerTest { } private void fillDialog(String masterBranch) { - SWTBotText developText = bot.textWithLabel(InitDialog_developBranch); - developText.selectAll(); - developText.typeText(ILLEGAL_BRANCH_NAME); + typeInto(InitDialog_developBranch, ILLEGAL_BRANCH_NAME); SWTBotButton ok = bot.button("OK"); assertFalse(ok.isEnabled()); @@ -191,6 +189,6 @@ public class InitHandlerTest extends AbstractGitflowHandlerTest { private void typeInto(String textLabel, String textInput) { SWTBotText developText = bot.textWithLabel(textLabel); developText.selectAll(); - developText.typeText(textInput); + developText.setText(textInput); } } |