MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[i18n] Fix VCS tests after resources proofread

Browse Source 
GitOrigin-RevId: c32c72ea1d53848df9c57eda63792cf353470647
This commit is contained in:
Dmitriy Smirnov
2020-11-30 22:17:53 +00:00
committed by intellij-monorepo-bot
parent dd12bd1e16
commit eca9010147
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/push/GitPushResultNotificationTest.java
+2 -2
View File
@@ -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
plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt
+6 -5
View File
@@ -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.
plugins/git4idea/tests/git4idea/update/GitMultiRepoUpdateTest.kt
+2 -1
View File
@@ -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 {