hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace GroupService by GroupBuilder in a couple tests

Browse Source
This commit is contained in:
Antoine Snyers
2020-04-06 15:51:44 +02:00
parent b49c86ac49
commit e62d912b11
1 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
dspace-server-webapp/src/test/java/org/dspace/app/rest/GroupRestRepositoryIT.java
View File

@@ -1640,72 +1640,52 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
@Test
public void deleteGroupTest() throws Exception {
context.turnOffAuthorisationSystem();
GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
Group parentGroup = GroupBuilder.createGroup(context)
.withName("test group")
.build();
Group parentGroup = null;
context.restoreAuthSystemState();
try {
context.turnOffAuthorisationSystem();
String authToken = getAuthToken(admin.getEmail(), password);
parentGroup = groupService.create(context);
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isOk());
context.restoreAuthSystemState();
getClient(authToken).perform(
delete("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isNoContent());
String authToken = getAuthToken(admin.getEmail(), password);
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isOk());
getClient(authToken).perform(
delete("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isNoContent());
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isNotFound());
} finally {
if (parentGroup != null) {
GroupBuilder.deleteGroup(parentGroup.getID());
}
}
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isNotFound());
}
@Test
public void deleteGroupUnauthorizedTest() throws Exception {
context.turnOffAuthorisationSystem();
GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
Group parentGroup = GroupBuilder.createGroup(context)
.withName("test group")
.build();
Group parentGroup = null;
context.restoreAuthSystemState();
try {
context.turnOffAuthorisationSystem();
String authToken = getAuthToken(admin.getEmail(), password);
parentGroup = groupService.create(context);
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isOk());
context.restoreAuthSystemState();
getClient().perform(
delete("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isUnauthorized());
String authToken = getAuthToken(admin.getEmail(), password);
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isOk());
getClient().perform(
delete("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isUnauthorized());
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isOk());
} finally {
if (parentGroup != null) {
GroupBuilder.deleteGroup(parentGroup.getID());
}
}
getClient(authToken).perform(
get("/api/eperson/groups/" + parentGroup.getID())
).andExpect(status().isOk());
}
@Test