From 66302d5a312c313346e4e5ce708adddeb89c13c0 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 25 Feb 2017 11:41:24 +0000 Subject: [PATCH] Fix a couple of notification assertions in Git tests --- .../git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt index 3dfaffa161c3..b3e1fc513594 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt @@ -234,7 +234,7 @@ class GitBranchWorkerTest : GitPlatformTest() { assertCurrentBranch("master") assertCurrentRevision("master") - assertSuccessfulNotification("Revision not found in project, community and contrib") + assertErrorNotification("Couldn't checkout unknown_ref", "Revision not found in project, community and contrib") } fun test_checkout_revision_checkout_ref_with_partial_success() { @@ -627,8 +627,8 @@ class GitBranchWorkerTest : GitPlatformTest() { mergeBranch("master2", TestUiHandler()) - assertSuccessfulNotification("Merged " + bcode("master2") + " to " + bcode("master") + "
Delete master2", - myVcsNotifier.lastNotification.content) + assertSuccessfulNotification("Merged ${bcode("master2")} to ${bcode("master")}
" + + "Delete master2") assertFile(myUltimate, "branch_file.txt", "branch content") assertFile(myCommunity, "branch_file.txt", "branch content") assertFile(myContrib, "branch_file.txt", "branch content")