Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-07-19 11:58:22 -0400
committerMatthias Sohn2018-10-21 05:57:55 -0400
commita422ae2507860789f0c7b3c987429324ccb69b72 (patch)
tree671e241cf83f03aafe1275ce6e825458fb7ba3ed /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test
parent3b0d9464da089747dd549b65bf640f955d997fea (diff)
downloadegit-a422ae2507860789f0c7b3c987429324ccb69b72.tar.gz
egit-a422ae2507860789f0c7b3c987429324ccb69b72.tar.xz
egit-a422ae2507860789f0c7b3c987429324ccb69b72.zip
Use verbs instead of OK
I went through typical UI and watched for dialogs still using OK. This is surely not exhaustive, but should at least cover many of the remaining typical operations. Wizard dialogs remain with the very generic "Finish", which we may want to think about, too. Bug: 538108 Change-Id: I2fec65a53a12c43d498546257c4e565cc2550341 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java9
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java7
2 files changed, 10 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
index 13315742c..d701d6624 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
@@ -409,11 +409,13 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase {
// rename stable to renamed
SWTBotShell newNameDialog = bot.shell(UIText.BranchRenameDialog_Title);
newNameDialog.bot().text().setText("master");
- assertFalse(newNameDialog.bot().button(IDialogConstants.OK_LABEL)
+ assertFalse(newNameDialog.bot()
+ .button(UIText.RenameBranchDialog_RenameButtonLabel)
.isEnabled());
newNameDialog.bot().text().setText("renamed");
- newNameDialog.bot().button(IDialogConstants.OK_LABEL).click();
+ newNameDialog.bot().button(UIText.RenameBranchDialog_RenameButtonLabel)
+ .click();
TestUtil.joinJobs(JobFamilies.CHECKOUT);
@@ -427,7 +429,8 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase {
newNameDialog = bot.shell(UIText.BranchRenameDialog_Title);
newNameDialog.bot().text().setText("stable");
- newNameDialog.bot().button(IDialogConstants.OK_LABEL).click();
+ newNameDialog.bot().button(UIText.RenameBranchDialog_RenameButtonLabel)
+ .click();
TestUtil.joinJobs(JobFamilies.CHECKOUT);
dialog = openRenameBranchDialog();
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java
index 4724595ed..6be393b08 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CompareActionsTest.java
@@ -38,7 +38,6 @@ import org.eclipse.egit.ui.internal.dialogs.CompareTreeView;
import org.eclipse.egit.ui.test.ContextMenuHelper;
import org.eclipse.egit.ui.test.JobJoiner;
import org.eclipse.egit.ui.test.TestUtil;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.lib.Constants;
@@ -127,7 +126,8 @@ public class CompareActionsTest extends LocalRepositoryTestCase {
JobJoiner jobJoiner = JobJoiner.startListening(
ISynchronizeManager.FAMILY_SYNCHRONIZE_OPERATION, 60,
TimeUnit.SECONDS);
- dialog.bot().button(IDialogConstants.OK_LABEL).click();
+ dialog.bot().button(UIText.HistoryCommitSelectionDialog_ButtonOK)
+ .click();
jobJoiner.join();
closeFirstEmptySynchronizeDialog();
@@ -141,7 +141,8 @@ public class CompareActionsTest extends LocalRepositoryTestCase {
jobJoiner = JobJoiner.startListening(
ISynchronizeManager.FAMILY_SYNCHRONIZE_OPERATION, 60,
TimeUnit.SECONDS);
- dialog.bot().button(IDialogConstants.OK_LABEL).click();
+ dialog.bot().button(UIText.HistoryCommitSelectionDialog_ButtonOK)
+ .click();
jobJoiner.join();
assertSynchronizeFile1Changed();

Back to the top