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: use system line separators when comparing text

Browse Source
This commit is contained in:
Kirill.Likhodedov
2012-10-12 14:40:12 +04:00
parent 99bdd04fed
commit 2f20db7f44
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy
+7 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtil
import com.intellij.openapi.vcs.FilePathImpl
import com.intellij.openapi.vcs.changes.Change
import com.intellij.openapi.vcs.changes.CurrentContentRevision
@@ -349,13 +350,13 @@ class GitBranchWorkerTest {
assertCurrentBranch("feature");
cd myUltimate
def actual = cat(localChanges[0])
assertEquals("Content doesn't match",
"""line with branch changes
def expectedContent = """line with branch changes
common content
common content
common content
line with master changes
""", actual)
"""
assertEquals("Content doesn't match", StringUtil.convertLineSeparators(expectedContent, File.separator), actual)
}
@Test
@@ -365,13 +366,13 @@ line with master changes
cd myUltimate
def actual = cat(localChanges[0])
assertEquals("Content doesn't match",
"""line with branch changes
def expectedContent = """line with branch changes
common content
common content
common content
line with master changes
""", actual)
"""
assertEquals("Content doesn't match", StringUtil.convertLineSeparators(expectedContent, File.separator), actual)
}
Collection<String> agree_to_smart_operation(String operation, String expectedSuccessMessage) {