opendev/gerrit
Code Issues Proposed changes

Remove access of groups related db tables from GroupsIT

Browse Source 
Change-Id: I806d1d43156db24a92863f2f1195f445caf99f85
This commit is contained in:
Alice Kober-Sotzek
2017-07-26 15:03:39 +02:00
parent 4b3b146cd3
commit 21fde902d9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
View File

@@ -21,7 +21,6 @@ import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GerritConfig; import com.google.gerrit.acceptance.GerritConfig;
@@ -47,7 +46,11 @@ import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.group.GroupsUpdate;
import com.google.gerrit.server.group.ServerInitiated;
import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -58,6 +61,8 @@ import org.junit.Test;
@NoHttpd @NoHttpd
public class GroupsIT extends AbstractDaemonTest { public class GroupsIT extends AbstractDaemonTest {
@Inject @ServerInitiated private Provider<GroupsUpdate> groupsUpdateProvider;
@Test @Test
public void addToNonExistingGroup_NotFound() throws Exception { public void addToNonExistingGroup_NotFound() throws Exception {
exception.expect(ResourceNotFoundException.class); exception.expect(ResourceNotFoundException.class);
@@ -238,7 +243,7 @@ public class GroupsIT extends AbstractDaemonTest {
public void createdOnFieldDefaultsToAuditCreationInstantBeforeSchemaUpgrade() throws Exception { public void createdOnFieldDefaultsToAuditCreationInstantBeforeSchemaUpgrade() throws Exception {
String newGroupName = name("newGroup"); String newGroupName = name("newGroup");
GroupInfo newGroup = gApi.groups().create(newGroupName).get(); GroupInfo newGroup = gApi.groups().create(newGroupName).get();
setCreatedOnToNull(new AccountGroup.Id(newGroup.groupId)); setCreatedOnToNull(new AccountGroup.UUID(newGroup.id));
GroupInfo updatedGroup = gApi.groups().id(newGroup.id).get(); GroupInfo updatedGroup = gApi.groups().id(newGroup.id).get();
assertThat(updatedGroup.createdOn).isEqualTo(AccountGroup.auditCreationInstantTs()); assertThat(updatedGroup.createdOn).isEqualTo(AccountGroup.auditCreationInstantTs());
@@ -682,11 +687,8 @@ public class GroupsIT extends AbstractDaemonTest {
return name; return name;
} }
private void setCreatedOnToNull(AccountGroup.Id groupId) throws Exception { private void setCreatedOnToNull(AccountGroup.UUID groupUuid) throws Exception {
AccountGroup group = db.accountGroups().get(groupId); groupsUpdateProvider.get().updateGroup(db, groupUuid, group -> group.setCreatedOn(null));
group.setCreatedOn(null);
db.accountGroups().update(ImmutableList.of(group));
groupCache.evict(group);
} }
private void assertBadRequest(Groups.ListRequest req) throws Exception { private void assertBadRequest(Groups.ListRequest req) throws Exception {