From e70dae7d2084fcf0023590b6c89a30652da738da Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 21 Jun 2016 16:25:01 +0900 Subject: [PATCH] EventRecorder#assertRefUpdatedEvents: Fix NPE when expecting null ref Change-Id: Iedd92690d7045f394c777613b33b6f44a34ab377 --- .../com/google/gerrit/acceptance/EventRecorder.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java index 22725aefb0..4df1a4709a 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/EventRecorder.java @@ -155,8 +155,14 @@ public class EventRecorder { int i = 0; for (RefUpdatedEvent event : events) { RefUpdateAttribute actual = event.refUpdate.get(); - assertThat(actual.oldRev).isEqualTo(expected[i].name()); - assertThat(actual.newRev).isEqualTo(expected[i+1].name()); + String oldRev = expected[i] == null + ? 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; } }