From eca901014760189ffc56bf90626f152348cb6c0d Mon Sep 17 00:00:00 2001
From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Thu, 29 Oct 2020 16:51:31 +0300
Subject: [PATCH] [i18n] Fix VCS tests after resources proofread

GitOrigin-RevId: c32c72ea1d53848df9c57eda63792cf353470647
---
 .../git4idea/push/GitPushResultNotificationTest.java  |  4 ++--
 .../tests/git4idea/rebase/GitSingleRepoRebaseTest.kt  | 11 ++++++-----
 .../tests/git4idea/update/GitMultiRepoUpdateTest.kt   |  3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/git4idea/tests/git4idea/push/GitPushResultNotificationTest.java b/plugins/git4idea/tests/git4idea/push/GitPushResultNotificationTest.java
index 44a72ed2903c..161ae8aa5c1c 100644
--- a/plugins/git4idea/tests/git4idea/push/GitPushResultNotificationTest.java
+++ b/plugins/git4idea/tests/git4idea/push/GitPushResultNotificationTest.java
@@ -12,6 +12,7 @@ import com.intellij.util.containers.ContainerUtil;
 import git4idea.GitLocalBranch;
 import git4idea.GitRemoteBranch;
 import git4idea.GitStandardRemoteBranch;
+import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
 import git4idea.test.GitPlatformTest;
@@ -32,8 +33,7 @@ import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
 public class GitPushResultNotificationTest extends GitPlatformTest {
-  private static final String UPDATE_WITH_RESOLVED_CONFLICTS = "Push has been cancelled, because there were conflicts during update.<br/>" +
-                                                               "Check that conflicts were resolved correctly, and invoke push again.";
+  private static final String UPDATE_WITH_RESOLVED_CONFLICTS = GitBundle.message("push.notification.description.rejected.and.conflicts");
 
   private static Project ourProject; // for static map initialization
 
diff --git a/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt b/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt
index 79acec5d5d82..0aa770e3ce9b 100644
--- a/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt
+++ b/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt
@@ -16,6 +16,7 @@ import git4idea.branch.GitBranchUiHandler
 import git4idea.branch.GitBranchWorker
 import git4idea.branch.GitRebaseParams
 import git4idea.config.GitVersionSpecialty
+import git4idea.i18n.GitBundle
 import git4idea.rebase.interactive.dialog.GitInteractiveRebaseDialog
 import git4idea.repo.GitRepository
 import git4idea.test.*
@@ -427,11 +428,11 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() {
     repo.assertRebaseInProgress()
     repo.`assert feature not rebased on master`()
     repo.assertConflict("c.txt")
-    assertErrorNotification("Rebase abort failed",
-        """
-        unknown error<br/>
-        $LOCAL_CHANGES_WARNING
-        """)
+    assertErrorNotification(GitBundle.message("rebase.abort.notification.failed.title"),
+                            """
+                            unknown error<br/>
+                            $LOCAL_CHANGES_WARNING
+                            """)
   }
 
   // git rebase --continue should be either called from a commit dialog, either from the GitRebaseProcess.
diff --git a/plugins/git4idea/tests/git4idea/update/GitMultiRepoUpdateTest.kt b/plugins/git4idea/tests/git4idea/update/GitMultiRepoUpdateTest.kt
index d1a479d4a42c..8452df386a6e 100644
--- a/plugins/git4idea/tests/git4idea/update/GitMultiRepoUpdateTest.kt
+++ b/plugins/git4idea/tests/git4idea/update/GitMultiRepoUpdateTest.kt
@@ -7,6 +7,7 @@ import com.intellij.openapi.vcs.Executor.cd
 import com.intellij.openapi.vcs.update.UpdatedFiles
 import git4idea.config.GitVersionSpecialty
 import git4idea.config.UpdateMethod
+import git4idea.i18n.GitBundle
 import git4idea.repo.GitRepository
 import git4idea.test.*
 import org.junit.Assume.assumeTrue
@@ -119,7 +120,7 @@ class GitMultiRepoUpdateTest : GitUpdateBaseTest() {
     val updateProcess = GitUpdateProcess(project, EmptyProgressIndicator(), repositories(), UpdatedFiles.create(), null, false, true)
     val result = updateProcess.update(UpdateMethod.MERGE)
     assertEquals("Update result is incorrect", GitUpdateResult.NOT_READY, result)
-    assertErrorNotification("Can't Update: No Current Branch", GitUpdateProcess.getDetachedHeadErrorNotificationContent(community))
+    assertErrorNotification(GitBundle.message("notification.title.can.t.update.no.current.branch"), GitUpdateProcess.getDetachedHeadErrorNotificationContent(community))
   }
 
   private fun updateWithMerge(): GitUpdateResult {