Merge changes Ice802901,Id9dfcde2,Iedd92690

* changes:
  DisabledChangeHooks: Remove unused implementation of EventDispatcher interface
  AccessIT: Add assertion about expected ref-updated events
  EventRecorder#assertRefUpdatedEvents: Fix NPE when expecting null ref

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;
     }
   }

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/AccessIT.java

@@ -29,10 +29,12 @@ import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
 import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
 import com.google.gerrit.reviewdb.client.AccountGroup;
+import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.config.AllProjectsNameProvider;
 import com.google.gerrit.server.group.SystemGroupBackend;
 
 import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -64,6 +66,9 @@ public class AccessIT extends AbstractDaemonTest {
 
   @Test
   public void addAccessSection() throws Exception {
+    Project.NameKey p = new Project.NameKey(newProjectName);
+    RevCommit initialHead = getRemoteHead(p, "refs/meta/config");
+
     ProjectAccessInput accessInput = newProjectAccessInput();
     AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
 
@@ -71,6 +76,10 @@ public class AccessIT extends AbstractDaemonTest {
     pApi.access(accessInput);
 
     assertThat(pApi.access().local).isEqualTo(accessInput.add);
+
+    RevCommit updatedHead = getRemoteHead(p, "refs/meta/config");
+    eventRecorder.assertRefUpdatedEvents(p.get(), "refs/meta/config",
+        initialHead, updatedHead);
   }
 
   @Test

gerrit-server/src/main/java/com/google/gerrit/common/DisabledChangeHooks.java

@@ -21,10 +21,6 @@ import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.events.ChangeEvent;
-import com.google.gerrit.server.events.Event;
-import com.google.gerrit.server.events.ProjectEvent;
-import com.google.gerrit.server.events.RefEvent;
 
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.RefUpdate;
@@ -33,7 +29,7 @@ import java.util.Map;
 import java.util.Set;
 
 /** Does not invoke hooks. */
-public final class DisabledChangeHooks implements ChangeHooks, EventDispatcher {
+public final class DisabledChangeHooks implements ChangeHooks {
   @Override
   public void doChangeAbandonedHook(Change change, Account account,
       PatchSet patchSet, String reason, ReviewDb db) {
@@ -110,20 +106,4 @@ public final class DisabledChangeHooks implements ChangeHooks, EventDispatcher {
   @Override
   public void doProjectCreatedHook(Project.NameKey project, String headName) {
   }
-
-  @Override
-  public void postEvent(Change change, ChangeEvent event, ReviewDb db) {
-  }
-
-  @Override
-  public void postEvent(Branch.NameKey branchName, RefEvent event) {
-  }
-
-  @Override
-  public void postEvent(Project.NameKey projectName, ProjectEvent event) {
-  }
-
-  @Override
-  public void postEvent(Event event, ReviewDb db) {
-  }
 }