diff options
| author | David Ostrovsky <david.ostrovsky@gmail.com> | 2021-02-02 10:21:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-02 10:21:11 +0000 |
| commit | b284ad514cf43c36c05d76c84f1b713864694c1c (patch) | |
| tree | 0fed8dfd35e0c2a1e16cf00abdfa6dc9762999f7 | |
| parent | 5d7b557559b8aba90b66434185dab243dcda5306 (diff) | |
| parent | 6e74f32cb1ad9865cc5e36cf3b7cf271b02af187 (diff) | |
Merge "Use Change-Id footer for updating commit msg in RevisionDiffIT" into stable-2.16
| -rw-r--r-- | javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java index 4c5b088deb..be9e07f68b 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java @@ -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(); |