opendev/gerrit
Code Issues Proposed changes

Merge "Use Change-Id footer for updating commit msg in RevisionDiffIT" into stable-2.16

Browse Source
This commit is contained in:
David Ostrovsky
2021-02-02 10:21:11 +00:00
committed by Gerrit Code Review
parent 5d7b557559 6e74f32cb1
commit b284ad514c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
View File

@@ -72,7 +72,6 @@ public class RevisionDiffIT extends AbstractDaemonTest {
.mapToObj(number -> String.format("Line %d\n", number))
.collect(joining());
private static final String FILE_CONTENT2 = "1st line\n2nd line\n3rd line\n";
private static final String UPDATED_COMMIT_MESSAGE = "An unchanged patchset";
private boolean intraline;
private ObjectId commit1;
@@ -407,7 +406,7 @@ public class RevisionDiffIT extends AbstractDaemonTest {
gApi.changes().id(changeId).edit().modifyFile(filePath, RawInputUtil.create(fileContent));
gApi.changes().id(changeId).edit().publish();
String previousPatchSetId = gApi.changes().id(changeId).get().currentRevision;
gApi.changes().id(changeId).edit().modifyCommitMessage(UPDATED_COMMIT_MESSAGE);
gApi.changes().id(changeId).edit().modifyCommitMessage(updatedCommitMessage());
gApi.changes().id(changeId).edit().publish();
DiffInfo diffInfo =
@@ -429,7 +428,7 @@ public class RevisionDiffIT extends AbstractDaemonTest {
gApi.changes().id(changeId).edit().modifyFile(filePath, RawInputUtil.create(fileContent));
gApi.changes().id(changeId).edit().publish();
String previousPatchSetId = gApi.changes().id(changeId).get().currentRevision;
gApi.changes().id(changeId).edit().modifyCommitMessage(UPDATED_COMMIT_MESSAGE);
gApi.changes().id(changeId).edit().modifyCommitMessage(updatedCommitMessage());
gApi.changes().id(changeId).edit().publish();
DiffInfo diffInfo =
@@ -447,7 +446,7 @@ public class RevisionDiffIT extends AbstractDaemonTest {
gApi.changes().id(changeId).edit().modifyFile(filePath, RawInputUtil.create(fileContent));
gApi.changes().id(changeId).edit().publish();
String previousPatchSetId = gApi.changes().id(changeId).get().currentRevision;
gApi.changes().id(changeId).edit().modifyCommitMessage(UPDATED_COMMIT_MESSAGE);
gApi.changes().id(changeId).edit().modifyCommitMessage(updatedCommitMessage());
gApi.changes().id(changeId).edit().publish();
DiffInfo diffInfo =
@@ -2455,6 +2454,10 @@ public class RevisionDiffIT extends AbstractDaemonTest {
assertThat(diffInfo).content().element(0).numberOfSkippedLines().isGreaterThan(0);
}
private String updatedCommitMessage() {
return "An unchanged patchset\n\nChange-Id: " + changeId;
}
private static CommentInput createCommentInput(
int startLine, int startCharacter, int endLine, int endCharacter, String message) {
CommentInput comment = new CommentInput();