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

[git] Fix GitHistoryUtilsTest: better file path comparison

Browse Source 
And simplify special chars case.
This commit is contained in:
Kirill.Likhodedov
2014-04-01 17:22:09 +04:00
parent a513885898
commit 55f84ff6c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java
+3 -3
View File
@@ -74,7 +74,7 @@ public class GitHistoryUtilsTest extends GitSingleRepoTest {
"simple commit",
"moved a.txt to dir/b.txt",
"simple commit after rename",
"commit with {%n} some [%ct] special <format:%H%at> characters including \"--pretty=tformat:%x00%x01%x00%H%x00%ct%x00%an%x20%x3C%ae%x3E%x00%cn%x20%x3C%ce%x3E%x00%x02%x00%s%x00%b%x00%x02%x01\"",
"commit with {%n} some [%ct] special <format:%H%at> characters including --pretty=tformat:%x00%x01%x00%H%x00%ct%x00%an%x20%x3C%ae%x3E%x00%cn%x20%x3C%ce%x3E%x00%x02%x00%s%x00%b%x00%x02%x01",
"commit subject\n\ncommit body which is \n multilined.",
"first line\nsecond line\nthird line\n\nfifth line\n\nseventh line & the end.",
};
@@ -247,7 +247,7 @@ public class GitHistoryUtilsTest extends GitSingleRepoTest {
StringBuilder sb = new StringBuilder();
for (VcsFileRevision revision : history) {
GitFileRevision rev = (GitFileRevision)revision;
String relPath = FileUtil.getRelativePath(myProjectRoot.getPath(), rev.getPath().getPath(), '/');
String relPath = FileUtil.getRelativePath(new File(myProjectPath), rev.getPath().getIOFile());
sb.append(String.format("%s %-" + maxSubjectLength + "s %s%n", getShortHash(rev.getHash()), rev.getCommitMessage(), relPath));
}
return sb.toString();
@@ -262,7 +262,7 @@ public class GitHistoryUtilsTest extends GitSingleRepoTest {
});
StringBuilder sb = new StringBuilder();
for (TestCommit commit : commits) {
String relPath = FileUtil.getRelativePath(myProjectRoot.getPath(), commit.myPath, '/');
String relPath = FileUtil.getRelativePath(new File(myProjectPath), new File(commit.myPath));
sb.append(String.format("%s %-" + maxSubjectLength + "s %s%n", getShortHash(commit.getHash()), commit.getCommitMessage(), relPath));
}
return sb.toString();