From 0a51d9ee96b09b25f8390df6139dfab035491f4a Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 22 May 2018 18:35:05 +0300 Subject: [PATCH] git tests: don't check update-during-push result if not needed --- .../tests/git4idea/push/GitPushOperationBaseTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/tests/git4idea/push/GitPushOperationBaseTest.kt b/plugins/git4idea/tests/git4idea/push/GitPushOperationBaseTest.kt index bcab3bb236bc..d325b94326e0 100644 --- a/plugins/git4idea/tests/git4idea/push/GitPushOperationBaseTest.kt +++ b/plugins/git4idea/tests/git4idea/push/GitPushOperationBaseTest.kt @@ -40,17 +40,17 @@ abstract class GitPushOperationBaseTest : GitPlatformTest() { protected fun agreeToUpdate(exitCode: Int) { dialogManager.registerDialogHandler(GitRejectedPushUpdateDialog::class.java, - TestDialogHandler { exitCode }) + TestDialogHandler { exitCode }) } internal fun assertResult(type: GitPushRepoResult.Type, pushedCommits: Int, from: String, to: String, updateResult: GitUpdateResult?, actualResult: GitPushRepoResult) { - val message = "Result is incorrect: " + actualResult + val message = "Result is incorrect: $actualResult" assertEquals(message, type, actualResult.type) assertEquals(message, pushedCommits, actualResult.numberOfPushedCommits) assertEquals(message, GitBranch.REFS_HEADS_PREFIX + from, actualResult.sourceBranch) assertEquals(message, GitBranch.REFS_REMOTES_PREFIX + to, actualResult.targetBranch) - assertEquals(message, updateResult, actualResult.updateResult) + if (updateResult != null) assertEquals(message, updateResult, actualResult.updateResult) } }