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] cleanup: move method to the only place in tests where it is used

Browse Source
This commit is contained in:
Kirill Likhodedov
2014-05-22 18:35:17 +04:00
parent a981a80867
commit 313c4b1a72
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/GitLogRecord.java
-6
View File
@@ -118,12 +118,6 @@ class GitLogRecord {
}
}
String getAuthorAndCommitter() {
String author = String.format("%s <%s>", myOptions.get(AUTHOR_NAME), myOptions.get(AUTHOR_EMAIL));
String committer = String.format("%s <%s>", myOptions.get(COMMITTER_NAME), myOptions.get(COMMITTER_EMAIL));
return GitUtil.adjustAuthorName(author, committer);
}
String getFullMessage() {
return mySupportsRawBody ? getRawBody().trim() : ((getSubject() + "\n\n" + getBody()).trim());
}
plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
+8 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import git4idea.GitUtil;
@@ -184,7 +183,7 @@ public class GitLogParserTest extends GitPlatformTest {
String expectedAuthorAndCommitter = GitUtil.adjustAuthorName(
String.format("%s <%s>", expected.getAuthorName(), expected.getAuthorEmail()),
String.format("%s <%s>", expected.getCommitterName(), expected.getCommitterEmail()));
assertEquals(expectedAuthorAndCommitter, actual.getAuthorAndCommitter());
assertEquals(expectedAuthorAndCommitter, getAuthorAndCommitter(actual));
assertEquals(expected.getSubject(), actual.getSubject());
@@ -201,6 +200,13 @@ public class GitLogParserTest extends GitPlatformTest {
}
}
@NotNull
String getAuthorAndCommitter(@NotNull GitLogRecord actual) {
String author = String.format("%s <%s>", actual.getAuthorName(), actual.getAuthorEmail());
String committer = String.format("%s <%s>", actual.getCommitterName(), actual.getCommitterEmail());
return GitUtil.adjustAuthorName(author, committer);
}
private void assertPaths(List<FilePath> actualPaths, List<String> expectedPaths) {
List<String> actual = ContainerUtil.map(actualPaths, new Function<FilePath, String>() {
@Override