From 1c2c629ba85b8f4ee00cefeb4ed874be053d06ce Mon Sep 17 00:00:00 2001 From: "Kirill.Likhodedov" Date: Fri, 12 Oct 2012 14:38:24 +0400 Subject: [PATCH] GitBranchWorkerTest: better fix of line separators (occasionally mixed line separator and file separator) --- .../tests/git4idea/branch/GitBranchWorkerTest.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy index f6de0f451e6e..683623b834a0 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy @@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.changes.Change import com.intellij.openapi.vcs.changes.CurrentContentRevision import com.intellij.openapi.vfs.VirtualFile import com.intellij.testFramework.vcs.MockChangeListManager +import com.intellij.util.LineSeparator import git4idea.PlatformFacade import git4idea.commands.Git import git4idea.config.GitVersion @@ -356,7 +357,7 @@ common content common content line with master changes """ - assertEquals("Content doesn't match", StringUtil.convertLineSeparators(expectedContent, File.separator), actual) + assertEquals("Content doesn't match", StringUtil.convertLineSeparators(expectedContent, LineSeparator.CRLF.separatorString), actual) } @Test @@ -372,7 +373,7 @@ common content common content line with master changes """ - assertEquals("Content doesn't match", StringUtil.convertLineSeparators(expectedContent, File.separator), actual) + assertEquals("Content doesn't match", StringUtil.convertLineSeparators(expectedContent, LineSeparator.CRLF.separatorString), actual) } Collection agree_to_smart_operation(String operation, String expectedSuccessMessage) {