opendev/gerrit
Code Issues Proposed changes

Refactor array usage to list for RepositoryConfig and GroupSetProvider

Browse Source 
Have getOwnerGroups return a list of strings rather than an array in
RepositoryConfig.

Replace string array usage with a list for the GroupSetProvider
constructor, to simplify the life of its caller(s) now using the
aforementioned list-returning getOwnerGroups.

Update the impacted RepositoryConfigTest tests accordingly. That
includes a minor refactoring in testAllBasePath, for consistency
purposes.

Change-Id: I540dae480a37c3bbb144fef48a95ba4ff29a019f
This commit is contained in:
Marco Miller
2016-04-06 17:42:29 -04:00
parent c2353a6a97
commit 823a4c25d4
5 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java
View File

@@ -16,7 +16,7 @@ package com.google.gerrit.server.config;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.Lists;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.reviewdb.client.Project.NameKey;
@@ -26,7 +26,6 @@ import org.junit.Test;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
public class RepositoryConfigTest {
@@ -98,48 +97,46 @@ public class RepositoryConfigTest {
@Test
public void testOwnerGroupsWhenNotConfigured() {
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject"))).isEqualTo(
new String[] {});
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject"))).isEmpty();
}
@Test
public void testOwnerGroupsForStarFilter() {
String[] ownerGroups = new String[] {"group1", "group2"};
configureOwnerGroups("*", Lists.newArrayList(ownerGroups));
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject"))).isEqualTo(
ownerGroups);
ImmutableList<String> ownerGroups = ImmutableList.of("group1", "group2");
configureOwnerGroups("*", ownerGroups);
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject")))
.containsExactlyElementsIn(ownerGroups);
}
@Test
public void testOwnerGroupsForSpecificFilter() {
String[] ownerGroups = new String[] {"group1", "group2"};
configureOwnerGroups("someProject", Lists.newArrayList(ownerGroups));
ImmutableList<String> ownerGroups = ImmutableList.of("group1", "group2");
configureOwnerGroups("someProject", ownerGroups);
assertThat(repoCfg.getOwnerGroups(new NameKey("someOtherProject")))
.isEqualTo(new String[] {});
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject"))).isEqualTo(
ownerGroups);
.isEmpty();
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject")))
.containsExactlyElementsIn(ownerGroups);
}
@Test
public void testOwnerGroupsForStartWithFilter() {
String[] ownerGroups1 = new String[] {"group1"};
String[] ownerGroups2 = new String[] {"group2"};
String[] ownerGroups3 = new String[] {"group3"};
ImmutableList<String> ownerGroups1 = ImmutableList.of("group1");
ImmutableList<String> ownerGroups2 = ImmutableList.of("group2");
ImmutableList<String> ownerGroups3 = ImmutableList.of("group3");
configureOwnerGroups("*", Lists.newArrayList(ownerGroups1));
configureOwnerGroups("somePath/*", Lists.newArrayList(ownerGroups2));
configureOwnerGroups("somePath/somePath/*",
Lists.newArrayList(ownerGroups3));
configureOwnerGroups("*", ownerGroups1);
configureOwnerGroups("somePath/*", ownerGroups2);
configureOwnerGroups("somePath/somePath/*", ownerGroups3);
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject"))).isEqualTo(
ownerGroups1);
assertThat(repoCfg.getOwnerGroups(new NameKey("someProject")))
.containsExactlyElementsIn(ownerGroups1);
assertThat(repoCfg.getOwnerGroups(new NameKey("somePath/someProject")))
.isEqualTo(ownerGroups2);
.containsExactlyElementsIn(ownerGroups2);
assertThat(
repoCfg.getOwnerGroups(new NameKey("somePath/somePath/someProject")))
.isEqualTo(ownerGroups3);
.containsExactlyElementsIn(ownerGroups3);
}
private void configureOwnerGroups(String projectFilter,
@@ -196,8 +193,10 @@ public class RepositoryConfigTest {
@Test
public void testAllBasePath() {
List<Path> allBasePaths = Arrays.asList(Paths.get("/someBasePath1"),
Paths.get("/someBasePath2"), Paths.get("/someBasePath2"));
ImmutableList<Path> allBasePaths = ImmutableList.of(
Paths.get("/someBasePath1"),
Paths.get("/someBasePath2"),
Paths.get("/someBasePath2"));
configureBasePath("*", allBasePaths.get(0).toString());
configureBasePath("project/*", allBasePaths.get(1).toString());