From e6c82b7ba767ec9adb1cd7484d80a58a39f50d6d Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 27 Jun 2014 10:55:07 -0700 Subject: [PATCH] Verify change and commit messages in cherry-pick test Change-Id: I87d4954c523c02024d0895b946ef9489ccb3e84f --- .../acceptance/api/revision/RevisionIT.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java index d77f11f093..9653ffaf38 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -136,13 +136,18 @@ public class RevisionIT extends AbstractDaemonTest { .name(project.get()) .branch(in.destination) .create(new BranchInput()); - ChangeApi cApi = gApi.changes() - .id(r.getChangeId()) - .revision(r.getCommit().name()) + ChangeApi orig = gApi.changes() + .id("p~master~" + r.getChangeId()); + + assertEquals(1, orig.get().messages.size()); + ChangeApi cherry = orig.revision(r.getCommit().name()) .cherryPick(in); - cApi.current() + assertEquals(2, orig.get().messages.size()); + + assertTrue(cherry.get().subject.contains(in.message)); + cherry.current() .review(ReviewInput.approve()); - cApi.current() + cherry.current() .submit(); }