commit 519d05627bbd5f1445772863a75f094a75c21137
author David Pursehouse <dpursehouse@collab.net> Thu Oct 10 14:24:40 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Oct 10 14:25:03 2019 +0900
tree b413a757a09b3e63a676c63058246b59b2445dca
parent 79ebe17037e177f74ca6222bdf08c93a5d1ce7e5

ActionsIT: Use ExtensionRegistry for ChangeETagComputation

Change-Id: I8409afc80d22f97d81a52348148708735d80b0ab

javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java

diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java
index ae212b6..528e4c1 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java
@@ -22,6 +22,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.acceptance.ExtensionRegistry;
+import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
 import com.google.gerrit.acceptance.PushOneCommit;
 import com.google.gerrit.acceptance.TestProjectInput;
 import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
@@ -37,7 +39,6 @@
 import com.google.gerrit.extensions.registration.RegistrationHandle;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.server.change.ChangeETagComputation;
 import com.google.gerrit.server.change.RevisionJson;
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.gerrit.testing.ConfigSuite;
@@ -60,7 +61,7 @@
   @Inject private DynamicSet<ActionVisitor> actionVisitors;
   @Inject private RequestScopeOperations requestScopeOperations;
   @Inject private RevisionJson.Factory revisionJsonFactory;
-  @Inject private DynamicSet<ChangeETagComputation> changeETagComputations;
+  @Inject private ExtensionRegistry extensionRegistry;
 
   private RegistrationHandle visitorHandle;
 
@@ -213,11 +214,8 @@
     String change = createChange().getChangeId();
     String oldETag = getETag(change);
 
-    RegistrationHandle registrationHandle = changeETagComputations.add("gerrit", (p, id) -> "foo");
-    try {
+    try (Registration registration = extensionRegistry.newRegistration().add((p, id) -> "foo")) {
       assertThat(getETag(change)).isNotEqualTo(oldETag);
-    } finally {
-      registrationHandle.remove();
     }
 
     assertThat(getETag(change)).isEqualTo(oldETag);
@@ -228,11 +226,8 @@
     String change = createChange().getChangeId();
     String oldETag = getETag(change);
 
-    RegistrationHandle registrationHandle = changeETagComputations.add("gerrit", (p, id) -> null);
-    try {
+    try (Registration registration = extensionRegistry.newRegistration().add((p, id) -> null)) {
       assertThat(getETag(change)).isEqualTo(oldETag);
-    } finally {
-      registrationHandle.remove();
     }
   }
 
@@ -241,16 +236,14 @@
     String change = createChange().getChangeId();
     String oldETag = getETag(change);
 
-    RegistrationHandle registrationHandle =
-        changeETagComputations.add(
-            "gerrit",
-            (p, id) -> {
-              throw new StorageException("exception during test");
-            });
-    try {
+    try (Registration registration =
+        extensionRegistry
+            .newRegistration()
+            .add(
+                (p, id) -> {
+                  throw new StorageException("exception during test");
+                })) {
       assertThat(getETag(change)).isEqualTo(oldETag);
-    } finally {
-      registrationHandle.remove();
     }
   }