commit c9b1ece4bf885d2468c9b08370be43925d4b69da
author David Pursehouse <dpursehouse@collab.net> Sat Dec 29 02:54:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 29 02:54:18 2018 +0000
tree 4536534fd6b7d3d8f0d49811e12328e9e5b01139
parent 3d27e0ce8ab0194473e6a477f7e8a60e19a32a37
parent 875e14da2b158c46957a7a8c1aba2feb1263cd3c

Merge changes Ida91cf7a,I34e51849

* changes:
  RefAdvertisementIT: Remove comment about enabled NoteDb
  RefAdvertisementIT: Simplify some tests

javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java

diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
index 4d45794..1a0f256 100644
--- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
@@ -259,16 +259,13 @@
   public void uploadPackSubsetOfBranchesVisibleWithEdit() throws Exception {
     allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
 
-    Change c = notesFactory.createChecked(project, cd3.getId()).getChange();
-    String changeId = c.getKey().get();
-
     // Admin's edit is not visible.
     setApiUser(admin);
-    gApi.changes().id(changeId).edit().create();
+    gApi.changes().id(cd3.getId().get()).edit().create();
 
     // User's edit is visible.
     setApiUser(user);
-    gApi.changes().id(changeId).edit().create();
+    gApi.changes().id(cd3.getId().get()).edit().create();
 
     assertUploadPackRefs(
         "HEAD",
@@ -287,21 +284,16 @@
     allow("refs/heads/master", Permission.READ, REGISTERED_USERS);
     allow("refs/*", Permission.VIEW_PRIVATE_CHANGES, REGISTERED_USERS);
 
-    Change change3 = notesFactory.createChecked(project, cd3.getId()).getChange();
-    String changeId3 = change3.getKey().get();
-    Change change4 = notesFactory.createChecked(project, cd4.getId()).getChange();
-    String changeId4 = change4.getKey().get();
-
     // Admin's edit on change3 is visible.
     setApiUser(admin);
-    gApi.changes().id(changeId3).edit().create();
+    gApi.changes().id(cd3.getId().get()).edit().create();
 
     // Admin's edit on change4 is not visible since user cannot see the change.
-    gApi.changes().id(changeId4).edit().create();
+    gApi.changes().id(cd4.getId().get()).edit().create();
 
     // User's edit is visible.
     setApiUser(user);
-    gApi.changes().id(changeId3).edit().create();
+    gApi.changes().id(cd3.getId().get()).edit().create();
 
     assertUploadPackRefs(
         "HEAD",
@@ -322,9 +314,8 @@
     deny("refs/heads/master", Permission.READ, REGISTERED_USERS);
     allow("refs/heads/branch", Permission.READ, REGISTERED_USERS);
 
-    String changeId = cd3.change().getKey().get();
     setApiUser(admin);
-    gApi.changes().id(changeId).edit().create();
+    gApi.changes().id(cd3.getId().get()).edit().create();
     setApiUser(user);
 
     assertUploadPackRefs(
@@ -410,7 +401,7 @@
     ReceiveCommitsAdvertiseRefsHook.Result r = getReceivePackRefs();
     assertThat(r.allRefs().keySet())
         .containsExactly(
-            // meta refs are excluded even when NoteDb is enabled.
+            // meta refs are excluded
             "HEAD",
             "refs/heads/branch",
             "refs/heads/master",