opendev/gerrit
Code Issues Proposed changes

ChangeBundle: Handle change subjects extracted with a buggy JGit

Browse Source 
Change-Id: I92f08bbd26e47cf4162519814fe59181f330606c
This commit is contained in:
Dave Borowitz
2016-05-27 20:40:17 -04:00
parent cb4c481f77
commit 8b98f0c651
2 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java
View File

@@ -479,6 +479,34 @@ public class ChangeBundleTest {
+ " {\tChange subject} != {Change subject}");
}
@Test
public void diffChangesHandlesBuggyJGitSubjectExtraction() throws Exception {
Change c1 = TestChanges.newChange(project, accountId);
String buggySubject = "Subject\r \r Rest of message.";
c1.setCurrentPatchSet(c1.currentPatchSetId(), buggySubject, buggySubject);
Change c2 = clone(c1);
c2.setCurrentPatchSet(c2.currentPatchSetId(), "Subject", "Subject");
// Both ReviewDb.
ChangeBundle b1 = new ChangeBundle(c1, messages(), patchSets(), approvals(),
comments(), reviewers(), REVIEW_DB);
ChangeBundle b2 = new ChangeBundle(c2, messages(), patchSets(), approvals(),
comments(), reviewers(), REVIEW_DB);
assertDiffs(b1, b2,
"originalSubject differs for Change.Id " + c1.getId() + ":"
+ " {Subject\r \r Rest of message.} != {Subject}",
"subject differs for Change.Id " + c1.getId() + ":"
+ " {Subject\r \r Rest of message.} != {Subject}");
// NoteDb has correct subject without "\r ".
b1 = new ChangeBundle(c1, messages(), patchSets(), approvals(),
comments(), reviewers(), REVIEW_DB);
b2 = new ChangeBundle(c2, messages(), patchSets(), approvals(),
comments(), reviewers(), NOTE_DB);
assertNoDiffs(b1, b2);
assertNoDiffs(b2, b1);
}
@Test
public void diffChangeMessageKeySets() throws Exception {
Change c = TestChanges.newChange(project, accountId);