opendev/gerrit
Code Issues Proposed changes

Merge "AccountIT: Ensure user branch has been created before deleting"

Browse Source
This commit is contained in:
ekempin
2017-04-18 15:05:48 +00:00
committed by Gerrit Code Review
parent a505cf0a9d 779381f7e2
commit fd4da80ec3
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@@ -553,12 +553,7 @@ public class AccountIT extends AbstractDaemonTest {
@Test @Test
@Sandboxed @Sandboxed
public void fetchUserBranch() throws Exception { public void fetchUserBranch() throws Exception {
// change something in the user preferences to ensure that the user branch ensureUserBranchCreated(user);
// is created
setApiUser(user);
GeneralPreferencesInfo input = new GeneralPreferencesInfo();
input.changesPerPage = GeneralPreferencesInfo.defaults().changesPerPage + 10;
gApi.accounts().self().setPreferences(input);
TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers, user); TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers, user);
String userRefName = RefNames.refsUsers(user.id); String userRefName = RefNames.refsUsers(user.id);
@@ -608,11 +603,7 @@ public class AccountIT extends AbstractDaemonTest {
@Test @Test
public void pushToUserBranch() throws Exception { public void pushToUserBranch() throws Exception {
// change something in the user preferences to ensure that the user branch ensureUserBranchCreated(admin);
// is created
GeneralPreferencesInfo input = new GeneralPreferencesInfo();
input.changesPerPage = GeneralPreferencesInfo.defaults().changesPerPage + 10;
gApi.accounts().self().setPreferences(input);
TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers); TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers);
fetch(allUsersRepo, RefNames.refsUsers(admin.id) + ":userRef"); fetch(allUsersRepo, RefNames.refsUsers(admin.id) + ":userRef");
@@ -626,11 +617,7 @@ public class AccountIT extends AbstractDaemonTest {
@Test @Test
public void pushToUserBranchForReview() throws Exception { public void pushToUserBranchForReview() throws Exception {
// change something in the user preferences to ensure that the user branch ensureUserBranchCreated(admin);
// is created
GeneralPreferencesInfo input = new GeneralPreferencesInfo();
input.changesPerPage = GeneralPreferencesInfo.defaults().changesPerPage + 10;
gApi.accounts().self().setPreferences(input);
String userRefName = RefNames.refsUsers(admin.id); String userRefName = RefNames.refsUsers(admin.id);
TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers); TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers);
@@ -653,11 +640,7 @@ public class AccountIT extends AbstractDaemonTest {
@Test @Test
public void pushWatchConfigToUserBranch() throws Exception { public void pushWatchConfigToUserBranch() throws Exception {
// change something in the user preferences to ensure that the user branch ensureUserBranchCreated(admin);
// is created
GeneralPreferencesInfo input = new GeneralPreferencesInfo();
input.changesPerPage = GeneralPreferencesInfo.defaults().changesPerPage + 10;
gApi.accounts().self().setPreferences(input);
TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers); TestRepository<InMemoryRepository> allUsersRepo = cloneProject(allUsers);
fetch(allUsersRepo, RefNames.refsUsers(admin.id) + ":userRef"); fetch(allUsersRepo, RefNames.refsUsers(admin.id) + ":userRef");
@@ -700,6 +683,8 @@ public class AccountIT extends AbstractDaemonTest {
@Test @Test
@Sandboxed @Sandboxed
public void cannotDeleteUserBranch() throws Exception { public void cannotDeleteUserBranch() throws Exception {
ensureUserBranchCreated(admin);
grant( grant(
Permission.DELETE, Permission.DELETE,
allUsers, allUsers,
@@ -722,6 +707,8 @@ public class AccountIT extends AbstractDaemonTest {
@Test @Test
@Sandboxed @Sandboxed
public void deleteUserBranchWithAccessDatabaseCapability() throws Exception { public void deleteUserBranchWithAccessDatabaseCapability() throws Exception {
ensureUserBranchCreated(admin);
allowGlobalCapabilities(REGISTERED_USERS, GlobalCapability.ACCESS_DATABASE); allowGlobalCapabilities(REGISTERED_USERS, GlobalCapability.ACCESS_DATABASE);
grant( grant(
Permission.DELETE, Permission.DELETE,
@@ -1032,4 +1019,12 @@ public class AccountIT extends AbstractDaemonTest {
assertThat(accounts).hasSize(1); assertThat(accounts).hasSize(1);
assertThat(Iterables.getOnlyElement(accounts)).isEqualTo(expectedAccount.getId()); assertThat(Iterables.getOnlyElement(accounts)).isEqualTo(expectedAccount.getId());
} }
private void ensureUserBranchCreated(TestAccount account) throws Exception {
// Change something in the user preferences to ensure that the user branch is created.
setApiUser(account);
GeneralPreferencesInfo input = new GeneralPreferencesInfo();
input.changesPerPage = GeneralPreferencesInfo.defaults().changesPerPage + 10;
gApi.accounts().self().setPreferences(input);
}
} }