opendev/gerrit
Code Issues Proposed changes

Merge "AbstractSubmit: Add stricter assertions about ref-updated event content" into stable-2.12

Browse Source
This commit is contained in:
Edwin Kempin
2016-05-30 11:23:59 +00:00
committed by Gerrit Code Review
parent 24b8e70f96 4a127f395e
commit cc91bb2494
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -86,7 +86,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
} }
private Map<String, String> mergeResults; private Map<String, String> mergeResults;
private Map<String, String> refUpdatedEvents; private Map<String, RefUpdateAttribute> refUpdatedEvents;
@Inject @Inject
private ChangeNotes.Factory notesFactory; private ChangeNotes.Factory notesFactory;
@@ -116,7 +116,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
} else if (event instanceof RefUpdatedEvent) { } else if (event instanceof RefUpdatedEvent) {
RefUpdatedEvent e = (RefUpdatedEvent) event; RefUpdatedEvent e = (RefUpdatedEvent) event;
RefUpdateAttribute r = e.refUpdate; RefUpdateAttribute r = e.refUpdate;
refUpdatedEvents.put(r.project + "-" + r.refName, r.newRev); refUpdatedEvents.put(r.project + "-" + r.refName, r);
} }
} }
@@ -252,9 +252,13 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
String newRev = mergeResults.get(Integer.toString(change._number)); String newRev = mergeResults.get(Integer.toString(change._number));
assertThat(newRev).isNotNull(); assertThat(newRev).isNotNull();
assertThat(branch.revision).isEqualTo(newRev); assertThat(branch.revision).isEqualTo(newRev);
newRev = refUpdatedEvents.get(change.project + "-" + branch.ref); RefUpdateAttribute refUpdate =
assertThat(newRev).isNotNull(); refUpdatedEvents.get(change.project + "-" + branch.ref);
assertThat(branch.revision).isEqualTo(newRev); assertThat(refUpdate).isNotNull();
assertThat(refUpdate.newRev).isNotNull();
assertThat(refUpdate.oldRev).isNotNull();
assertThat(refUpdate.newRev).isNotEqualTo(refUpdate.oldRev);
assertThat(branch.revision).isEqualTo(refUpdate.newRev);
} }
b.consume(); b.consume();
} }