opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* 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
This commit is contained in:
David Pursehouse
2018-03-18 23:03:46 +09:00
parent c1c2a5404a ae7c5da295
commit f4fb10467f
7 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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});
}

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

@@ -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);