opendev/gerrit
Code Issues Proposed changes

Test for expected comment in cherry pick acceptance tests

Browse Source 
Change-Id: I9647222956efa38afcabb7d157b2e634d02c92a0
This commit is contained in:
Orgad Shaneh
2015-02-03 14:55:39 +02:00
committed by David Pursehouse
parent cf700f2375
commit cd8e95486a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
View File

@@ -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<ChangeMessageInfo> 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());