opendev/gerrit
Code Issues Proposed changes

Merge changes I4aa7ab9c,I5ba29aa5,Ie824acdb

Browse Source 
* changes:
  SubmittedTogether: Also work for already submitted changes
  MergeOp: Record the change set
  Move SubmittedTogether assertion to AbstractDaemon
This commit is contained in:
Dave Borowitz
2015-10-06 20:00:27 +00:00
committed by Gerrit Code Review
parent 85cbe36cc1 018b1e28e7
commit e628ec3ee6
13 changed files with 241 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -14,12 +14,15 @@
package com.google.gerrit.acceptance;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.GitUtil.initSsh;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static com.google.gerrit.server.project.Util.block;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.google.common.primitives.Chars;
import com.google.gerrit.acceptance.AcceptanceTestRequestScope.Context;
@@ -594,4 +597,17 @@ public abstract class AbstractDaemonTest {
.revision(1)
.actions();
}
protected void assertSubmittedTogether(String chId, String... expected)
throws Exception {
List<ChangeInfo> actual = gApi.changes().id(chId).submittedTogether();
assertThat(actual).hasSize(expected.length);
assertThat(Iterables.transform(actual,
new Function<ChangeInfo, String>() {
@Override
public String apply(ChangeInfo input) {
return input.changeId;
}
})).containsExactly((Object[])expected).inOrder();
}
}