Merge "Improve atom explanations display"
diff --git a/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java b/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java
index 9d6331d..cf8c585 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java
@@ -356,8 +356,8 @@
@Test
public void testInvalidListChangeOption() throws Exception {
PushOneCommit.Result r = createChange();
- RestResponse rep = adminRestSession.get("/changes/" + r.getChange().getId() + "/?O=ffffffff");
- rep.assertBadRequest();
+ RestResponse resp = adminRestSession.get("/changes/" + r.getChange().getId() + "/?O=ffffffff");
+ resp.assertBadRequest();
}
/**
diff --git a/javatests/com/google/gerrit/acceptance/api/project/AccessReviewIT.java b/javatests/com/google/gerrit/acceptance/api/project/AccessReviewIT.java
index c03a710..b8163a0 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/AccessReviewIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/AccessReviewIT.java
@@ -60,9 +60,9 @@
a.permissions = ImmutableMap.of("read", p);
in.add = ImmutableMap.of("refs/heads/*", a);
- RestResponse rep =
+ RestResponse resp =
adminRestSession.put("/projects/" + defaultMessageProject.get() + "/access:review", in);
- rep.assertCreated();
+ resp.assertCreated();
List<ChangeInfo> result =
gApi.changes()
diff --git a/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java b/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java
index 1bc7f39..59d6f81 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java
@@ -214,15 +214,15 @@
@Test
public void httpGet() throws Exception {
- RestResponse rep =
+ RestResponse resp =
adminRestSession.get(
"/projects/"
+ normalProject.get()
+ "/check.access"
+ "?ref=refs/heads/master&perm=viewPrivateChanges&account="
+ user.email());
- rep.assertOK();
- assertThat(rep.getEntityContent()).contains("403");
+ resp.assertOK();
+ assertThat(resp.getEntityContent()).contains("403");
}
@Test
diff --git a/plugins/download-commands b/plugins/download-commands
index bfb522f..15f2608 160000
--- a/plugins/download-commands
+++ b/plugins/download-commands
@@ -1 +1 @@
-Subproject commit bfb522f79240f4baf3398952998bded95a804af2
+Subproject commit 15f26084cc2d1b2055e5fa5f9b0d5583883896a9