From c0ec915e73313c04f6bdd9fd7030abddae00b587 Mon Sep 17 00:00:00 2001 From: Max Hohenegger Date: Sun, 28 Oct 2018 16:10:37 +0100 Subject: Refactoring: Moved refName validation method to core for better re-use Also: - use IStatus result to avoid null and improve readability - use stream API for efficiency - use Message.format instead of NLS.bind Change-Id: I9118b18b6c0fce5ce1e381d8088061181b384eba Signed-off-by: Max Hohenegger --- .../ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'org.eclipse.egit.ui.test/src/org') 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 a267d25c79..7fb8331010 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 @@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.core.commands.State; import org.eclipse.egit.core.RepositoryUtil; +import org.eclipse.egit.core.internal.CoreText; import org.eclipse.egit.core.op.BranchOperation; import org.eclipse.egit.core.op.CloneOperation; import org.eclipse.egit.ui.Activator; @@ -322,7 +323,7 @@ public class GitRepositoriesViewBranchHandlingTest extends newBranchNameText.setText("invalid~name"); renameDialog.bot().text(" " + // the text is now in the error message, and the MessageAreaDialog seems to add a space - NLS.bind(UIText.ValidationUtils_InvalidRefNameMessage, + NLS.bind(CoreText.ValidationUtils_InvalidRefNameMessage, "refs/heads/invalid~name")); assertFalse(renameDialog.bot() .button(UIText.RenameBranchDialog_RenameButtonLabel) -- cgit v1.2.3