Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix formatting in MergeInput documentation
  Fix assertions on iterable size in tests
  Fix example ref in 'Create Merge Patch Set For Change' documentation
  Fix documentation for CreateMergePatchSetForChange REST API endpoint.
  LightweightPluginDaemonTest: Expose plugin guice injectors

Change-Id: I6a319c9de7d91efe138911411b0bd44d7431e62e

Documentation/rest-api-changes.txt

@@ -775,7 +775,7 @@ to the new merge commit.
   {
     "subject": "Merge dev_branch into master",
     "merge": {
-      "source": "refs/12/1234/1"
+      "source": "refs/changes/34/1234/1"
     }
   }
 ----
@@ -6425,8 +6425,8 @@ The `MergeInput` entity contains information about the merge
 |Field Name      ||Description
 |`source`   ||
 The source to merge from, e.g. a complete or abbreviated commit SHA-1,
-a complete reference name, a short reference name under refs/heads, refs/tags,
+a complete reference name, a short reference name under `refs/heads`, `refs/tags`,
-or refs/remotes namespace, etc.
+or `refs/remotes` namespace, etc.
 |`strategy`     |optional|
 The strategy of the merge, can be `recursive`, `resolve`,
 `simple-two-way-in-core`, `ours` or `theirs`, default will use project settings.

gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java

@@ -30,7 +30,7 @@ public class LightweightPluginDaemonTest extends AbstractDaemonTest {
 
   @Rule public TemporaryFolder tempDataDir = new TemporaryFolder();
 
-  private TestServerPlugin plugin;
+  protected TestServerPlugin plugin;
 
   @Before
   public void setUp() throws Exception {

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java

@@ -2676,7 +2676,7 @@ public class ChangeIT extends AbstractDaemonTest {
     gApi.changes().id(changeId).createMergePatchSet(in);
     ChangeInfo changeInfo =
         gApi.changes().id(changeId).get(ALL_REVISIONS, CURRENT_COMMIT, CURRENT_REVISION);
-    assertThat(changeInfo.revisions.size()).isEqualTo(2);
+    assertThat(changeInfo.revisions).hasSize(2);
     assertThat(changeInfo.subject).isEqualTo(in.subject);
     assertThat(changeInfo.revisions.get(changeInfo.currentRevision).commit.parents.get(0).commit)
         .isEqualTo(parent);
@@ -2714,7 +2714,7 @@ public class ChangeIT extends AbstractDaemonTest {
     ChangeInfo changeInfo =
         gApi.changes().id(changeId).get(ALL_REVISIONS, CURRENT_COMMIT, CURRENT_REVISION);
 
-    assertThat(changeInfo.revisions.size()).isEqualTo(2);
+    assertThat(changeInfo.revisions).hasSize(2);
     assertThat(changeInfo.subject).isEqualTo(in.subject);
     assertThat(changeInfo.revisions.get(changeInfo.currentRevision).commit.parents.get(0).commit)
         .isEqualTo(parent);

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java

@@ -770,7 +770,7 @@ public class CommentsIT extends AbstractDaemonTest {
     Map<String, List<CommentInfo>> commentsMap =
         getPublishedComments(result.getChangeId(), result.getCommit().name());
 
-    assertThat(commentsMap.size()).isEqualTo(1);
+    assertThat(commentsMap).hasSize(1);
     assertThat(commentsMap.get(FILE_NAME)).hasSize(1);
 
     String uuid = commentsMap.get(targetComment.path).get(0).id;

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java

@@ -46,22 +46,22 @@ public class QueryIT extends AbstractDaemonTest {
     String changeId2 = createChange().getChangeId();
 
     List<ChangeAttribute> changes = executeSuccessfulQuery("1234");
-    assertThat(changes.size()).isEqualTo(0);
+    assertThat(changes).isEmpty();
 
     changes = executeSuccessfulQuery(changeId1);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).project).isEqualTo(project.toString());
     assertThat(changes.get(0).id).isEqualTo(changeId1);
 
     changes = executeSuccessfulQuery(changeId1 + " OR " + changeId2);
-    assertThat(changes.size()).isEqualTo(2);
+    assertThat(changes).hasSize(2);
     assertThat(changes.get(0).project).isEqualTo(project.toString());
     assertThat(changes.get(0).id).isEqualTo(changeId2);
     assertThat(changes.get(1).project).isEqualTo(project.toString());
     assertThat(changes.get(1).id).isEqualTo(changeId1);
 
     changes = executeSuccessfulQuery("--start=1 " + changeId1 + " OR " + changeId2);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).project).isEqualTo(project.toString());
     assertThat(changes.get(0).id).isEqualTo(changeId1);
   }
@@ -71,14 +71,14 @@ public class QueryIT extends AbstractDaemonTest {
     String changeId = createChange().getChangeId();
     gApi.changes().id(changeId).current().review(ReviewInput.approve());
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets).isNull();
 
     changes = executeSuccessfulQuery("--all-approvals " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets).isNotNull();
     assertThat(changes.get(0).patchSets.get(0).approvals).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).approvals.size()).isEqualTo(1);
+    assertThat(changes.get(0).patchSets.get(0).approvals).hasSize(1);
   }
 
   @Test
@@ -89,20 +89,20 @@ public class QueryIT extends AbstractDaemonTest {
     gApi.changes().id(changeId).addReviewer(in);
 
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).allReviewers).isNull();
 
     changes = executeSuccessfulQuery("--all-reviewers " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).allReviewers).isNotNull();
-    assertThat(changes.get(0).allReviewers.size()).isEqualTo(1);
+    assertThat(changes.get(0).allReviewers).hasSize(1);
   }
 
   @Test
   public void commitMessageOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     List<ChangeAttribute> changes = executeSuccessfulQuery("--commit-message " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).commitMessage).isNotNull();
     assertThat(changes.get(0).commitMessage).contains(PushOneCommit.SUBJECT);
   }
@@ -113,20 +113,20 @@ public class QueryIT extends AbstractDaemonTest {
     amendChange(changeId);
 
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).currentPatchSet).isNull();
 
     changes = executeSuccessfulQuery("--current-patch-set " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).currentPatchSet).isNotNull();
     assertThat(changes.get(0).currentPatchSet.number).isEqualTo(2);
 
     gApi.changes().id(changeId).current().review(ReviewInput.approve());
     changes = executeSuccessfulQuery("--current-patch-set " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).currentPatchSet).isNotNull();
     assertThat(changes.get(0).currentPatchSet.approvals).isNotNull();
-    assertThat(changes.get(0).currentPatchSet.approvals.size()).isEqualTo(1);
+    assertThat(changes.get(0).currentPatchSet.approvals).hasSize(1);
   }
 
   @Test
@@ -136,13 +136,13 @@ public class QueryIT extends AbstractDaemonTest {
     amendChange(changeId);
 
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets).isNull();
 
     changes = executeSuccessfulQuery("--patch-sets " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets).isNotNull();
-    assertThat(changes.get(0).patchSets.size()).isEqualTo(3);
+    assertThat(changes.get(0).patchSets).hasSize(3);
   }
 
   @Test
@@ -159,22 +159,22 @@ public class QueryIT extends AbstractDaemonTest {
 
     List<ChangeAttribute> changes =
         executeSuccessfulQuery("--current-patch-set --files " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).currentPatchSet.files).isNotNull();
-    assertThat(changes.get(0).currentPatchSet.files.size()).isEqualTo(2);
+    assertThat(changes.get(0).currentPatchSet.files).hasSize(2);
 
     changes = executeSuccessfulQuery("--patch-sets --files " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).files).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).files.size()).isEqualTo(2);
+    assertThat(changes.get(0).patchSets.get(0).files).hasSize(2);
 
     gApi.changes().id(changeId).current().review(ReviewInput.approve());
     changes = executeSuccessfulQuery("--patch-sets --files --all-approvals " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).files).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).files.size()).isEqualTo(2);
+    assertThat(changes.get(0).patchSets.get(0).files).hasSize(2);
     assertThat(changes.get(0).patchSets.get(0).approvals).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).approvals.size()).isEqualTo(1);
+    assertThat(changes.get(0).patchSets.get(0).approvals).hasSize(1);
   }
 
   @Test
@@ -182,13 +182,13 @@ public class QueryIT extends AbstractDaemonTest {
     String changeId = createChange().getChangeId();
 
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).comments).isNull();
 
     changes = executeSuccessfulQuery("--comments " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).comments).isNotNull();
-    assertThat(changes.get(0).comments.size()).isEqualTo(1);
+    assertThat(changes.get(0).comments).hasSize(1);
   }
 
   @Test
@@ -205,13 +205,13 @@ public class QueryIT extends AbstractDaemonTest {
     gApi.changes().id(changeId).current().review(review);
 
     List<ChangeAttribute> changes = executeSuccessfulQuery("--current-patch-set " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).currentPatchSet.comments).isNull();
 
     changes = executeSuccessfulQuery("--current-patch-set --comments " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).currentPatchSet.comments).isNotNull();
-    assertThat(changes.get(0).currentPatchSet.comments.size()).isEqualTo(1);
+    assertThat(changes.get(0).currentPatchSet.comments).hasSize(1);
   }
 
   @Test
@@ -228,30 +228,30 @@ public class QueryIT extends AbstractDaemonTest {
     gApi.changes().id(changeId).current().review(review);
 
     List<ChangeAttribute> changes = executeSuccessfulQuery("--patch-sets " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).comments).isNull();
 
     changes = executeSuccessfulQuery("--patch-sets --comments " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).comments).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).comments.size()).isEqualTo(1);
+    assertThat(changes.get(0).patchSets.get(0).comments).hasSize(1);
 
     changes = executeSuccessfulQuery("--patch-sets --comments --files " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).comments).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).comments.size()).isEqualTo(1);
+    assertThat(changes.get(0).patchSets.get(0).comments).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).files).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).files.size()).isEqualTo(2);
+    assertThat(changes.get(0).patchSets.get(0).files).hasSize(2);
 
     gApi.changes().id(changeId).current().review(ReviewInput.approve());
     changes = executeSuccessfulQuery("--patch-sets --comments --files --all-approvals " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).comments).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).comments.size()).isEqualTo(1);
+    assertThat(changes.get(0).patchSets.get(0).comments).hasSize(1);
     assertThat(changes.get(0).patchSets.get(0).files).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).files.size()).isEqualTo(2);
+    assertThat(changes.get(0).patchSets.get(0).files).hasSize(2);
     assertThat(changes.get(0).patchSets.get(0).approvals).isNotNull();
-    assertThat(changes.get(0).patchSets.get(0).approvals.size()).isEqualTo(1);
+    assertThat(changes.get(0).patchSets.get(0).approvals).hasSize(1);
   }
 
   @Test
@@ -259,34 +259,34 @@ public class QueryIT extends AbstractDaemonTest {
     String changeId1 = createChange().getChangeId();
     String changeId2 = createChange().getChangeId();
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId1);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).dependsOn).isNull();
 
     changes = executeSuccessfulQuery("--dependencies " + changeId1);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).dependsOn).isNull();
 
     changes = executeSuccessfulQuery(changeId2);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).dependsOn).isNull();
 
     changes = executeSuccessfulQuery("--dependencies " + changeId2);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).dependsOn).isNotNull();
-    assertThat(changes.get(0).dependsOn.size()).isEqualTo(1);
+    assertThat(changes.get(0).dependsOn).hasSize(1);
   }
 
   @Test
   public void submitRecordsOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).submitRecords).isNull();
 
     changes = executeSuccessfulQuery("--submit-records " + changeId);
-    assertThat(changes.size()).isEqualTo(1);
+    assertThat(changes).hasSize(1);
     assertThat(changes.get(0).submitRecords).isNotNull();
-    assertThat(changes.get(0).submitRecords.size()).isEqualTo(1);
+    assertThat(changes.get(0).submitRecords).hasSize(1);
   }
 
   @Test

gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java

@@ -85,7 +85,7 @@ public class MultiBaseLocalDiskRepositoryManagerTest extends GerritBaseTests {
         .isEqualTo(repoManager.getBasePath(someProjectKey).toAbsolutePath().toString());
 
     SortedSet<Project.NameKey> repoList = repoManager.list();
-    assertThat(repoList.size()).isEqualTo(1);
+    assertThat(repoList).hasSize(1);
     assertThat(repoList.toArray(new Project.NameKey[repoList.size()]))
         .isEqualTo(new Project.NameKey[] {someProjectKey});
   }
@@ -113,7 +113,7 @@ public class MultiBaseLocalDiskRepositoryManagerTest extends GerritBaseTests {
         .isEqualTo(alternateBasePath.toString());
 
     SortedSet<Project.NameKey> repoList = repoManager.list();
-    assertThat(repoList.size()).isEqualTo(1);
+    assertThat(repoList).hasSize(1);
     assertThat(repoList.toArray(new Project.NameKey[repoList.size()]))
         .isEqualTo(new Project.NameKey[] {someProjectKey});
   }
@@ -141,7 +141,7 @@ public class MultiBaseLocalDiskRepositoryManagerTest extends GerritBaseTests {
     createRepository(alternateBasePath, misplacedProject1);
 
     SortedSet<Project.NameKey> repoList = repoManager.list();
-    assertThat(repoList.size()).isEqualTo(2);
+    assertThat(repoList).hasSize(2);
     assertThat(repoList.toArray(new Project.NameKey[repoList.size()]))
         .isEqualTo(new Project.NameKey[] {altPathProject, basePathProject});
   }

gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java

@@ -353,7 +353,7 @@ public class ProjectConfigTest extends LocalDiskRepositoryTestCase {
 
     ProjectConfig cfg = read(rev);
     PluginConfig pluginCfg = cfg.getPluginConfig("somePlugin");
-    assertThat(pluginCfg.getNames().size()).isEqualTo(2);
+    assertThat(pluginCfg.getNames()).hasSize(2);
     assertThat(pluginCfg.getString("key1")).isEqualTo("value1");
     assertThat(pluginCfg.getStringList(("key2"))).isEqualTo(new String[] {"value2a", "value2b"});
   }
@@ -415,7 +415,7 @@ public class ProjectConfigTest extends LocalDiskRepositoryTestCase {
 
     ProjectConfig cfg = read(rev);
     PluginConfig pluginCfg = cfg.getPluginConfig("somePlugin");
-    assertThat(pluginCfg.getNames().size()).isEqualTo(1);
+    assertThat(pluginCfg.getNames()).hasSize(1);
     assertThat(pluginCfg.getGroupReference("key1")).isEqualTo(developers);
   }
 
@@ -462,7 +462,7 @@ public class ProjectConfigTest extends LocalDiskRepositoryTestCase {
 
     ProjectConfig cfg = read(rev);
     PluginConfig pluginCfg = cfg.getPluginConfig("somePlugin");
-    assertThat(pluginCfg.getNames().size()).isEqualTo(1);
+    assertThat(pluginCfg.getNames()).hasSize(1);
     assertThat(pluginCfg.getGroupReference("key1")).isEqualTo(developers);
 
     pluginCfg.setGroupReference("key1", staff);