opendev/gerrit
Code Issues Proposed changes

Merge changes Iaa43c189,Ic86c8ada

Browse Source 
* changes:
  Include patch set number into message when setting description for patch set
  Test the change message that is posted on setting a patch set description
This commit is contained in:
David Pursehouse
2020-01-19 23:19:23 +00:00
committed by Gerrit Code Review
parent 30faaa12df a40bb124fa
commit 4fba5d9f6d
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/com/google/gerrit/server/restapi/change/PutDescription.java
View File

@@ -87,17 +87,21 @@ public class PutDescription
if (oldDescription.equals(newDescription)) {
return false;
}
String summary;
if (oldDescription.isEmpty()) {
summary = "Description set to \"" + newDescription + "\"";
} else if (newDescription.isEmpty()) {
summary = "Description \"" + oldDescription + "\" removed";
} else {
summary = "Description changed to \"" + newDescription + "\"";
}
update.setPsDescription(newDescription);
String summary;
if (oldDescription.isEmpty()) {
summary =
String.format("Description of patch set %d set to \"%s\"", psId.get(), newDescription);
} else if (newDescription.isEmpty()) {
summary =
String.format(
"Description \"%s\" removed from patch set %d", oldDescription, psId.get());
} else {
summary =
String.format(
"Description of patch set %d changed to \"%s\"", psId.get(), newDescription);
}
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(
psId, ctx.getUser(), ctx.getWhen(), summary, ChangeMessagesUtil.TAG_SET_DESCRIPTION);

18
javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
View File

@@ -1320,10 +1320,24 @@ public class RevisionIT extends AbstractDaemonTest {
public void description() throws Exception {
PushOneCommit.Result r = createChange();
assertDescription(r, "");
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).description("test");
assertDescription(r, "test");
// set description
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).description("foo");
assertDescription(r, "foo");
assertThat(Iterables.getLast(gApi.changes().id(r.getChangeId()).get().messages).message)
.isEqualTo("Description of patch set 1 set to \"foo\"");
// update description
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).description("bar");
assertDescription(r, "bar");
assertThat(Iterables.getLast(gApi.changes().id(r.getChangeId()).get().messages).message)
.isEqualTo("Description of patch set 1 changed to \"bar\"");
// remove description
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).description("");
assertDescription(r, "");
assertThat(Iterables.getLast(gApi.changes().id(r.getChangeId()).get().messages).message)
.isEqualTo("Description \"bar\" removed from patch set 1");
}
@Test