diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java index f5922f2e5b..0e1389bcfa 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -125,6 +125,39 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { r.assertChange(Change.Status.NEW, null); } + @Test + public void testOutput() throws Exception { + String url = canonicalWebUrl.get(); + ObjectId initialHead = testRepo.getRepository().resolve("HEAD"); + PushOneCommit.Result r1 = pushTo("refs/for/master"); + Change.Id id1 = r1.getChange().getId(); + r1.assertOkStatus(); + r1.assertChange(Change.Status.NEW, null); + r1.assertMessage( + "New changes:\n" + + " " + url + id1 + " " + r1.getCommit().getShortMessage() + "\n"); + + testRepo.reset(initialHead); + String newMsg = r1.getCommit().getShortMessage() + " v2"; + testRepo.branch("HEAD").commit() + .message(newMsg) + .insertChangeId(r1.getChangeId().substring(1)) + .create(); + PushOneCommit.Result r2 = pushFactory.create( + db, admin.getIdent(), testRepo, "another commit", "b.txt", "bbb") + .to("refs/for/master"); + Change.Id id2 = r2.getChange().getId(); + r2.assertOkStatus(); + r2.assertChange(Change.Status.NEW, null); + r2.assertMessage( + "New changes:\n" + + " " + url + id2 + " another commit\n" + + "\n" + + "\n" + + "Updated changes:\n" + + " " + url + id1 + " " + newMsg + "\n"); + } + @Test public void testPushForMasterWithTopic() throws Exception { // specify topic in ref