From cd8e95486af94e4b2ced223cfd63b68eb66cb4e2 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 3 Feb 2015 14:55:39 +0200 Subject: [PATCH] Test for expected comment in cherry pick acceptance tests Change-Id: I9647222956efa38afcabb7d157b2e634d02c92a0 --- .../gerrit/acceptance/api/revision/RevisionIT.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 ff2944f98a..4a9a25cff8 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 @@ -36,6 +36,7 @@ import com.google.gerrit.extensions.api.changes.SubmitInput; import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.common.ChangeInfo; +import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.common.DiffInfo; import com.google.gerrit.extensions.common.MergeableInfo; @@ -55,6 +56,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -157,6 +159,16 @@ public class RevisionIT extends AbstractDaemonTest { .cherryPick(in); assertThat((Iterable)orig.get().messages).hasSize(2); + String cherryPickedRevision = cherry.get().currentRevision; + String expectedMessage = String.format( + "Patch Set 1: Cherry Picked\n\n" + + "This patchset was cherry picked to branch %s as commit %s", + in.destination, cherryPickedRevision); + + Iterator origIt = orig.get().messages.iterator(); + origIt.next(); + assertThat(origIt.next().message).isEqualTo(expectedMessage); + assertThat(cherry.get().subject).contains(in.message); assertThat(cherry.get().topic).isEqualTo("someTopic"); cherry.current().review(ReviewInput.approve());