commit 99f87d695cd370e2654818781b2dfd5709197589
author Han-Wen Nienhuys <hanwen@google.com> Mon Dec 10 18:40:40 2018 +0100
committer Han-Wen Nienhuys <hanwen@google.com> Tue Dec 11 13:31:21 2018 +0100
tree ab9e7a71dd4143035e9670ad28b22deda1e2bab7
parent a4908690924e7abe78e94fd1df7a1384ef1e95f5

Remove syntactic sugar method AbstractDaemonTest#getHead(project)

This method is going to be moved into a fluent API, where we want to
minimize the API surface to keep it clean and orthogonal.

In addition, getHead(p) is less readable than getHead(p, "HEAD") as
the latter is more explicit.

Change-Id: If4923f32da7d0bae15ad1b278937b4a35c083426

java/com/google/gerrit/acceptance/AbstractDaemonTest.java

diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index 362803f..ce23510 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -1177,10 +1177,6 @@
     }
   }
 
-  protected RevCommit getHead(Repository repo) throws Exception {
-    return getHead(repo, "HEAD");
-  }
-
   @Nullable
   protected RevCommit getRemoteHead(Project.NameKey project, String branch) throws Exception {
     try (Repository repo = repoManager.openRepository(project)) {

javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java

diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index 887035b..fd72862 100644
--- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -2910,7 +2910,7 @@
         TreeWalk.forPath(
             allUsersRepo.getRepository(),
             AccountProperties.ACCOUNT_CONFIG,
-            getHead(allUsersRepo.getRepository()).getTree())) {
+            getHead(allUsersRepo.getRepository(), "HEAD").getTree())) {
       assertThat(tw).isNotNull();
       ac.fromText(
           new String(

javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java

diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index bde042f..9522114 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -1491,7 +1491,7 @@
 
   private PushOneCommit.Result createCherryPickableMerge(
       String parent1FileName, String parent2FileName) throws Exception {
-    RevCommit initialCommit = getHead(repo());
+    RevCommit initialCommit = getHead(repo(), "HEAD");
 
     String branchAName = "branchA";
     createBranch(new Branch.NameKey(project, branchAName));

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

diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index 7529ee3..9e7fe9b 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -2360,7 +2360,7 @@
         testRepo
             .commit()
             .message("Foo")
-            .parent(getHead(testRepo.getRepository()))
+            .parent(getHead(testRepo.getRepository(), "HEAD"))
             .insertChangeId()
             .create();
     testRepo.reset(c);
@@ -2388,7 +2388,7 @@
         testRepo
             .commit()
             .message("Foo")
-            .parent(getHead(testRepo.getRepository()))
+            .parent(getHead(testRepo.getRepository(), "HEAD"))
             .insertChangeId()
             .create();
     String id = GitUtil.getChangeId(testRepo, c).get();
@@ -2415,7 +2415,7 @@
         testRepo
             .commit()
             .message("Foo")
-            .parent(getHead(testRepo.getRepository()))
+            .parent(getHead(testRepo.getRepository(), "HEAD"))
             .insertChangeId()
             .create();
     testRepo.reset(c);
@@ -2436,7 +2436,7 @@
 
   @Test
   public void pushCommitsWithSameTreeNoFilesChangedWasRebased() throws Exception {
-    RevCommit head = getHead(testRepo.getRepository());
+    RevCommit head = getHead(testRepo.getRepository(), "HEAD");
     RevCommit c = testRepo.commit().message("Foo").parent(head).insertChangeId().create();
     testRepo.reset(c);
 

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

diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index bab4c1d..78220dc 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -1305,7 +1305,7 @@
 
   protected void assertRebase(TestRepository<?> testRepo, boolean contentMerge) throws Exception {
     Repository repo = testRepo.getRepository();
-    RevCommit localHead = getHead(repo);
+    RevCommit localHead = getHead(repo, "HEAD");
     RevCommit remoteHead = getRemoteHead();
     assertThat(localHead.getId()).isNotEqualTo(remoteHead.getId());
     assertThat(remoteHead.getParentCount()).isEqualTo(1);