Merge "Fix NPE when checking visibility of edits on non-visible changes"

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index b32349b..a3ca832 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -82,6 +82,7 @@
 import com.google.gerrit.server.util.MagicBranch;
 import com.google.gerrit.testutil.ConfigSuite;
 import com.google.gerrit.testutil.FakeEmailSender.Message;
+import com.google.gerrit.testutil.SshMode;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.io.ByteArrayOutputStream;
@@ -147,7 +148,9 @@
 
   @After
   public void removeAccountIndexEventCounter() {
-    accountIndexEventCounterHandle.remove();
+    if (accountIndexEventCounterHandle != null) {
+      accountIndexEventCounterHandle.remove();
+    }
   }
 
   @Before
@@ -209,7 +212,11 @@
     TestAccount foo = accounts.create("foo");
     AccountInfo info = gApi.accounts().id(foo.id.get()).get();
     assertThat(info.username).isEqualTo("foo");
-    accountIndexedCounter.assertReindexOf(foo, 2); // account creation + adding SSH keys
+    if (SshMode.useSsh()) {
+      accountIndexedCounter.assertReindexOf(foo, 2); // account creation + adding SSH keys
+    } else {
+      accountIndexedCounter.assertReindexOf(foo, 1); // account creation
+    }
 
     // check user branch
     try (Repository repo = repoManager.openRepository(allUsers);
@@ -376,7 +383,6 @@
     gApi.accounts()
         .self()
         .setStars(triplet, new StarsInput(ImmutableSet.of(DEFAULT_LABEL, "blue", IGNORE_LABEL)));
-    accountIndexedCounter.assertNoReindex();
   }
 
   @Test
@@ -653,12 +659,13 @@
     assertThat(userSelfRef).isNotNull();
     assertThat(userSelfRef.getObjectId()).isEqualTo(userRef.getObjectId());
 
+    accountIndexedCounter.assertNoReindex();
+
     // fetching user branch of another user fails
     String otherUserRefName = RefNames.refsUsers(admin.id);
     exception.expect(TransportException.class);
     exception.expectMessage("Remote does not have " + otherUserRefName + " available for fetch.");
     fetch(allUsersRepo, otherUserRefName + ":otherUserRef");
-    accountIndexedCounter.assertNoReindex();
   }
 
   @Test