diff options
author | Dave Borowitz <dborowitz@google.com> | 2016-06-13 18:01:55 -0400 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2016-07-06 11:50:16 +0900 |
commit | e4f1396aba2043c1c1847fad15039e0d04545579 (patch) | |
tree | 6db5eddc516b0b7921a7c7fc0673ae9956e74e61 | |
parent | a0157917f266606b3bc5bbe865dca569c15489cc (diff) |
AbstractPushForReview: Add test for message output
Change-Id: Ibca2d62d474a6cb638a879c24c28edb644d64959
-rw-r--r-- | gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java | 34 |
1 files changed, 34 insertions, 0 deletions
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 f64a8a2f70..50fbec2343 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 @@ -35,6 +35,7 @@ import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.testutil.TestTimeUtil; import com.google.gerrit.server.git.ProjectConfig; +import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.PushResult; import org.junit.AfterClass; @@ -91,6 +92,39 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { } @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 String topic = "my/topic"; |