commit 970b118ed4545bfd8606508b0b1a34960628e4ef
author Dave Borowitz <dborowitz@google.com> Tue Dec 11 20:38:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 11 20:38:23 2018 +0000
tree ae9c3ebacd8b0e8f7dfcf6e184a7630ace885314
parent c876731e28e19040e364f71b07653bab39984616
parent 9e15115be447d32e71b5a8b00108e92c8db3c0b5

Merge "Inline AbstractDaemonTest#getRelated"

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 8a77829..ff0013d 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -49,7 +49,6 @@
 import com.google.gerrit.common.data.PermissionRule;
 import com.google.gerrit.common.data.PermissionRule.Action;
 import com.google.gerrit.extensions.api.GerritApi;
-import com.google.gerrit.extensions.api.changes.RelatedChangeAndCommitInfo;
 import com.google.gerrit.extensions.api.changes.ReviewInput;
 import com.google.gerrit.extensions.api.changes.RevisionApi;
 import com.google.gerrit.extensions.api.changes.SubmittedTogetherInfo;
@@ -1650,13 +1649,4 @@
     comments.sort(Comparator.comparing(c -> c.id));
     return comments;
   }
-
-  protected List<RelatedChangeAndCommitInfo> getRelated(PatchSet.Id ps) throws Exception {
-    return getRelated(ps.getParentKey(), ps.get());
-  }
-
-  protected List<RelatedChangeAndCommitInfo> getRelated(Change.Id changeId, int ps)
-      throws Exception {
-    return gApi.changes().id(changeId.get()).revision(ps).related().changes;
-  }
 }

javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java

diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index 7983770..324f33b 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -943,7 +943,8 @@
     ri2 = ci2.revisions.get(ci2.currentRevision);
     assertThat(ri2.commit.parents.get(0).commit).isEqualTo(r1.getCommit().name());
 
-    List<RelatedChangeAndCommitInfo> related = getRelated(id2, ri2._number);
+    List<RelatedChangeAndCommitInfo> related =
+        gApi.changes().id(id2.get()).revision(ri2._number).related().changes;
     assertThat(related).hasSize(2);
     assertThat(related.get(0)._changeNumber).isEqualTo(id2.get());
     assertThat(related.get(0)._revisionNumber).isEqualTo(2);
@@ -977,7 +978,7 @@
     ri2 = ci2.revisions.get(ci2.currentRevision);
     assertThat(ri2.commit.parents.get(0).commit).isEqualTo(r1.getCommit().name());
 
-    assertThat(getRelated(id2, ri2._number)).isEmpty();
+    assertThat(gApi.changes().id(id2.get()).revision(ri2._number).related().changes).isEmpty();
   }
 
   @Test
@@ -1003,7 +1004,7 @@
     RevisionInfo ri3 = ci3.revisions.get(ci3.currentRevision);
     assertThat(ri3.commit.parents.get(0).commit).isEqualTo(r1.getCommit().name());
 
-    assertThat(getRelated(id3, ri3._number)).isEmpty();
+    assertThat(gApi.changes().id(id3.get()).revision(ri3._number).related().changes).isEmpty();
   }
 
   @Test

javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java

diff --git a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
index 8e8aeac..fd5afef 100644
--- a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
@@ -622,7 +622,8 @@
 
   private void assertRelated(PatchSet.Id psId, RelatedChangeAndCommitInfo... expected)
       throws Exception {
-    List<RelatedChangeAndCommitInfo> actual = getRelated(psId);
+    List<RelatedChangeAndCommitInfo> actual =
+        gApi.changes().id(psId.getParentKey().get()).revision(psId.get()).related().changes;
     assertThat(actual).named("related to " + psId).hasSize(expected.length);
     for (int i = 0; i < actual.size(); i++) {
       String name = "index " + i + " related to " + psId;