opendev/gerrit
Code Issues Proposed changes

Merge changes I738f6323,I14df4962,I9b24d26e

Browse Source 
* changes:
  assertSubmittedTogether: Remove hasSize assertion
  SubmittedTogetherIT: Cleanup topicChaining test
  SubmittedTogetherIT: Rename respectsWholeTopicAndAncestors test
This commit is contained in:
David Pursehouse
2017-10-18 09:50:51 +00:00
committed by Gerrit Code Review
parent f73cadcffb 98f2664177
commit 4a67cda68b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1007,7 +1007,6 @@ public abstract class AbstractDaemonTest {
gApi.changes().id(chId).submittedTogether(EnumSet.of(NON_VISIBLE_CHANGES));
assertThat(info.nonVisibleChanges).isEqualTo(0);
assertThat(actual).hasSize(expected.length);
assertThat(changeIds(actual)).containsExactly((Object[]) expected).inOrder();
assertThat(changeIds(info.changes)).containsExactly((Object[]) expected).inOrder();
}

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java
View File

@@ -106,7 +106,7 @@ public class SubmittedTogetherIT extends AbstractDaemonTest {
}
@Test
public void respectsWholeTopicAndAncestors() throws Exception {
public void respectWholeTopic() throws Exception {
RevCommit initialHead = getRemoteHead();
// Create two independent commits and push.
RevCommit c1_1 = commitBuilder().add("a.txt", "1").message("subject: 1").create();
@@ -152,7 +152,7 @@ public class SubmittedTogetherIT extends AbstractDaemonTest {
@Test
public void topicChaining() throws Exception {
RevCommit initialHead = getRemoteHead();
// Create two independent commits and push.
RevCommit c1_1 = commitBuilder().add("a.txt", "1").message("subject: 1").create();
String id1 = getChangeId(c1_1);
pushHead(testRepo, "refs/for/master/" + name("connectingTopic"), false);
@@ -162,7 +162,7 @@ public class SubmittedTogetherIT extends AbstractDaemonTest {
String id2 = getChangeId(c2_1);
pushHead(testRepo, "refs/for/master/" + name("connectingTopic"), false);
RevCommit c3_1 = commitBuilder().add("b.txt", "2").message("subject: 2").create();
RevCommit c3_1 = commitBuilder().add("b.txt", "3").message("subject: 3").create();
String id3 = getChangeId(c3_1);
pushHead(testRepo, "refs/for/master/" + name("unrelated-topic"), false);