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

GitBranchWorkerTest: better fix of line separators

Browse Source 
(occasionally mixed line separator and file separator)
This commit is contained in:
Kirill.Likhodedov
2012-10-12 14:40:14 +04:00
parent 9147f810fe
commit 1c2c629ba8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy
+3 -2
View File
@@ -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<String> agree_to_smart_operation(String operation, String expectedSuccessMessage) {