Skip to content

Commit

Permalink
Replace usage of WsTester by WsActionTester in DeleteActionTest
Browse files Browse the repository at this point in the history
  • Loading branch information
@julienlancelot
julienlancelot committed Apr 13, 2017
1 parent b7b5715 commit afb4f1c
Showing 1 changed file with 26 additions and 16 deletions.
42 changes: 26 additions & 16 deletions server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java
View file
Expand Up @@ -38,7 +38,9 @@
import org.sonar.server.organization.TestDefaultOrganizationProvider; import org.sonar.server.organization.TestDefaultOrganizationProvider;
import org.sonar.server.tester.UserSessionRule; import org.sonar.server.tester.UserSessionRule;
import org.sonar.server.usergroups.DefaultGroupFinder; import org.sonar.server.usergroups.DefaultGroupFinder;
import org.sonar.server.ws.WsTester; import org.sonar.server.ws.TestRequest;
import org.sonar.server.ws.TestResponse;
import org.sonar.server.ws.WsActionTester;


import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
Expand All @@ -60,13 +62,26 @@ public class DeleteActionTest {
private ComponentDbTester componentTester = new ComponentDbTester(db); private ComponentDbTester componentTester = new ComponentDbTester(db);
private TestDefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private TestDefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
private GroupDto defaultGroup; private GroupDto defaultGroup;
private WsTester ws = new WsTester(new UserGroupsWs(new DeleteAction(db.getDbClient(), userSession, newGroupWsSupport(), defaultOrganizationProvider))); private WsActionTester ws = new WsActionTester(new DeleteAction(db.getDbClient(), userSession, newGroupWsSupport(), defaultOrganizationProvider));


@Before @Before
public void setUp() { public void setUp() {
defaultGroup = db.users().insertGroup(db.getDefaultOrganization(), SONAR_USERS_GROUP_NAME); defaultGroup = db.users().insertGroup(db.getDefaultOrganization(), SONAR_USERS_GROUP_NAME);
} }


@Test
public void response_has_no_content() throws Exception {
addAdmin(db.getDefaultOrganization());
GroupDto group = db.users().insertGroup();
loginAsAdminOnDefaultOrganization();

TestResponse response = newRequest()
.setParam("id", group.getId().toString())
.execute();

assertThat(response.getStatus()).isEqualTo(204);
}

@Test @Test
public void delete_by_id() throws Exception { public void delete_by_id() throws Exception {
addAdmin(db.getDefaultOrganization()); addAdmin(db.getDefaultOrganization());
Expand All @@ -75,8 +90,7 @@ public void delete_by_id() throws Exception {


newRequest() newRequest()
.setParam("id", group.getId().toString()) .setParam("id", group.getId().toString())
.execute() .execute();
.assertNoContent();


assertThat(db.users().selectGroupById(group.getId())).isNull(); assertThat(db.users().selectGroupById(group.getId())).isNull();
} }
Expand All @@ -89,8 +103,7 @@ public void delete_by_name_on_default_organization() throws Exception {


newRequest() newRequest()
.setParam(PARAM_GROUP_NAME, group.getName()) .setParam(PARAM_GROUP_NAME, group.getName())
.execute() .execute();
.assertNoContent();


assertThat(db.users().selectGroupById(group.getId())).isNull(); assertThat(db.users().selectGroupById(group.getId())).isNull();
} }
Expand All @@ -105,8 +118,7 @@ public void delete_by_name_and_organization() throws Exception {
newRequest() newRequest()
.setParam(PARAM_ORGANIZATION_KEY, org.getKey()) .setParam(PARAM_ORGANIZATION_KEY, org.getKey())
.setParam(PARAM_GROUP_NAME, group.getName()) .setParam(PARAM_GROUP_NAME, group.getName())
.execute() .execute();
.assertNoContent();


assertThat(db.users().selectGroupById(group.getId())).isNull(); assertThat(db.users().selectGroupById(group.getId())).isNull();
} }
Expand Down Expand Up @@ -135,8 +147,7 @@ public void delete_members() throws Exception {


newRequest() newRequest()
.setParam("id", group.getId().toString()) .setParam("id", group.getId().toString())
.execute() .execute();
.assertNoContent();


assertThat(db.countRowsOfTable("groups_users")).isEqualTo(0); assertThat(db.countRowsOfTable("groups_users")).isEqualTo(0);
} }
Expand All @@ -151,8 +162,7 @@ public void delete_permissions() throws Exception {


newRequest() newRequest()
.setParam("id", group.getId().toString()) .setParam("id", group.getId().toString())
.execute() .execute();
.assertNoContent();


assertThat(db.countRowsOfTable("group_roles")).isEqualTo(0); assertThat(db.countRowsOfTable("group_roles")).isEqualTo(0);
} }
Expand All @@ -169,7 +179,7 @@ public void delete_group_from_permission_templates() throws Exception {


newRequest() newRequest()
.setParam("id", group.getId().toString()) .setParam("id", group.getId().toString())
.execute().assertNoContent(); .execute();


assertThat(db.countRowsOfTable("perm_templates_groups")).isEqualTo(0); assertThat(db.countRowsOfTable("perm_templates_groups")).isEqualTo(0);
} }
Expand Down Expand Up @@ -261,7 +271,7 @@ public void delete_admin_group_succeeds_if_other_groups_have_administrators() th
assertThat(db.users().selectGroupPermissions(adminGroup2, null)).hasSize(1); assertThat(db.users().selectGroupPermissions(adminGroup2, null)).hasSize(1);
} }


private WsTester.Result executeDeleteGroupRequest(GroupDto adminGroup1) throws Exception { private TestResponse executeDeleteGroupRequest(GroupDto adminGroup1) throws Exception {
return newRequest() return newRequest()
.setParam(PARAM_GROUP_ID, adminGroup1.getId().toString()) .setParam(PARAM_GROUP_ID, adminGroup1.getId().toString())
.execute(); .execute();
Expand All @@ -284,8 +294,8 @@ private void loginAsAdmin(OrganizationDto org) {
userSession.logIn().addPermission(ADMINISTER, org); userSession.logIn().addPermission(ADMINISTER, org);
} }


private WsTester.TestRequest newRequest() { private TestRequest newRequest() {
return ws.newPostRequest("api/user_groups", "delete"); return ws.newRequest();
} }


private GroupWsSupport newGroupWsSupport() { private GroupWsSupport newGroupWsSupport() {
Expand Down

0 comments on commit afb4f1c

Please sign in to comment.