opendev/gerrit
Code Issues Proposed changes

EventRecorder#assertRefUpdatedEvents: Fix NPE when expecting null ref

Browse Source 
Change-Id: Iedd92690d7045f394c777613b33b6f44a34ab377
This commit is contained in:
David Pursehouse
2016-06-21 16:25:01 +09:00
parent 396e639355
commit e70dae7d20
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java
View File

@@ -155,8 +155,14 @@ public class EventRecorder {
int i = 0; int i = 0;
for (RefUpdatedEvent event : events) { for (RefUpdatedEvent event : events) {
RefUpdateAttribute actual = event.refUpdate.get(); RefUpdateAttribute actual = event.refUpdate.get();
assertThat(actual.oldRev).isEqualTo(expected[i].name()); String oldRev = expected[i] == null
assertThat(actual.newRev).isEqualTo(expected[i+1].name()); ? ObjectId.zeroId().name()
: expected[i].name();
String newRev = expected[i+1] == null
? ObjectId.zeroId().name()
: expected[i+1].name();
assertThat(actual.oldRev).isEqualTo(oldRev);
assertThat(actual.newRev).isEqualTo(newRev);
i += 2; i += 2;
} }
} }