Extract createGroup(GroupInput) method in AbstractQueryGroupsTest The default implementation won't work for some subclasses. Release-Notes: skip Bug: Google b/262373851 Change-Id: Ie70b7e2bacc858712fc76083883cacd39c72c081
diff --git a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java index b263ab6..12bafd5 100644 --- a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java +++ b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
@@ -440,10 +440,8 @@ return createGroupWithDescription(name, null, members); } - protected void deleteGroup(AccountGroup.UUID uuid) throws Exception { - for (GroupIndex index : groupIndexes.getWriteIndexes()) { - index.delete(uuid); - } + protected GroupInfo createGroup(GroupInput in) throws Exception { + return gApi.groups().create(in).get(); } protected GroupInfo createGroupWithDescription( @@ -453,21 +451,27 @@ in.description = description; in.members = Arrays.asList(members).stream().map(a -> String.valueOf(a._accountId)).collect(toList()); - return gApi.groups().create(in).get(); + return createGroup(in); } protected GroupInfo createGroupWithOwner(String name, GroupInfo ownerGroup) throws Exception { GroupInput in = new GroupInput(); in.name = name; in.ownerId = ownerGroup.id; - return gApi.groups().create(in).get(); + return createGroup(in); } protected GroupInfo createGroupThatIsVisibleToAll(String name) throws Exception { GroupInput in = new GroupInput(); in.name = name; in.visibleToAll = true; - return gApi.groups().create(in).get(); + return createGroup(in); + } + + protected void deleteGroup(AccountGroup.UUID uuid) throws Exception { + for (GroupIndex index : groupIndexes.getWriteIndexes()) { + index.delete(uuid); + } } protected GroupInfo getGroup(AccountGroup.UUID uuid) throws Exception {