summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-07-19 10:49:57 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2018-07-19 10:49:57 +0900
commitaedbcab4fd66753166968d8752e8128fe7e6b425 (patch)
tree4f7cdb5fff7560dea0ae1bcea6ff8386c8392ebb
parent13301df25cfb94b00c24c09b03fafeef693c696b (diff)
RestSession#postWithHeader: Make parameter order consistent with #putWithHeader
-rw-r--r--gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/RestSession.java4
-rw-r--r--gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java6
-rw-r--r--gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/RestSession.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/RestSession.java
index 300e75f255..ae921a59a0 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/RestSession.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/RestSession.java
@@ -116,10 +116,10 @@ public class RestSession extends HttpSession {
}
public RestResponse post(String endPoint, Object content) throws IOException {
- return postWithHeader(endPoint, content, null);
+ return postWithHeader(endPoint, null, content);
}
- public RestResponse postWithHeader(String endPoint, Object content, Header header)
+ public RestResponse postWithHeader(String endPoint, Header header, Object content)
throws IOException {
Request post = Request.Post(getUrl(endPoint));
if (header != null) {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
index c69391c3ec..54943e7514 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
@@ -475,7 +475,7 @@ public class ImpersonationIT extends AbstractDaemonTest {
in.drafts = DraftHandling.PUBLISH;
RestResponse res =
adminRestSession.postWithHeader(
- "/changes/" + r.getChangeId() + "/revisions/current/review", in, runAsHeader(user.id));
+ "/changes/" + r.getChangeId() + "/revisions/current/review", runAsHeader(user.id), in);
res.assertOK();
ChangeMessageInfo m = Iterables.getLast(gApi.changes().id(r.getChangeId()).get().messages);
@@ -507,13 +507,13 @@ public class ImpersonationIT extends AbstractDaemonTest {
in.message = "Message on behalf of";
String endpoint = "/changes/" + r.getChangeId() + "/revisions/current/review";
- RestResponse res = adminRestSession.postWithHeader(endpoint, in, runAsHeader(user2.id));
+ RestResponse res = adminRestSession.postWithHeader(endpoint, runAsHeader(user2.id), in);
res.assertForbidden();
assertThat(res.getEntityContent())
.isEqualTo("label required to post review on behalf of \"" + in.onBehalfOf + '"');
in.label("Code-Review", 1);
- adminRestSession.postWithHeader(endpoint, in, runAsHeader(user2.id)).assertOK();
+ adminRestSession.postWithHeader(endpoint, runAsHeader(user2.id), in).assertOK();
PatchSetApproval psa = Iterables.getOnlyElement(r.getChange().approvals().values());
assertThat(psa.getPatchSetId().get()).isEqualTo(1);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java
index 79a83eeb22..dc6a933a54 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java
@@ -1043,7 +1043,7 @@ public class ChangeRebuilderIT extends AbstractDaemonTest {
ci.message = "comment with impersonation";
ri.message = "message with impersonation";
ri.label("Code-Review", 1);
- adminRestSession.postWithHeader(prefix + "review", ri, runAs).assertOK();
+ adminRestSession.postWithHeader(prefix + "review", runAs, ri).assertOK();
di.message = "draft with impersonation";
adminRestSession.putWithHeader(prefix + "drafts", runAs, di).assertCreated();