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

#9806: Use builders for coll, comm, group creation in GroupRestRepositoryIT

Browse Source
This commit is contained in:
Kim Shepherd
2024-09-06 15:29:48 +02:00
parent b13abac753
commit 9205773802
1 changed files with 107 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,9 +85,6 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
ResourcePolicyService resourcePolicyService; ResourcePolicyService resourcePolicyService;
@Autowired @Autowired
private ConfigurationService configurationService; private ConfigurationService configurationService;
@Autowired
private CollectionService collectionService;
@Autowired @Autowired
private AuthorizeService authorizeService; private AuthorizeService authorizeService;
@@ -773,12 +770,13 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
community = communityService.create(null, context); community = CommunityBuilder.createCommunity(context).build();
parentGroup = communityService.createAdministrators(context, community); parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
childGroup1 = groupService.create(context); .addMember(eperson)
childGroup2 = groupService.create(context); .build();
childGroup1 = GroupBuilder.createGroup(context).build();
childGroup2 = GroupBuilder.createGroup(context).build();
groupService.addMember(context, parentGroup, eperson);
groupService.update(context, parentGroup); groupService.update(context, parentGroup);
context.commit(); context.commit();
@@ -810,6 +808,7 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
); );
} finally { } finally {
// TODO: Can we remove these lines now that we are creating them with the builder?
if (community != null) { if (community != null) {
CommunityBuilder.deleteCommunity(community.getID()); CommunityBuilder.deleteCommunity(community.getID());
} }
@@ -837,9 +836,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup1 = groupService.create(context); childGroup1 = GroupBuilder.createGroup(context).build();
childGroup2 = groupService.create(context); childGroup2 = GroupBuilder.createGroup(context).build();
context.commit(); context.commit();
@@ -882,9 +881,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup1 = groupService.create(context); childGroup1 = GroupBuilder.createGroup(context).build();
childGroup2 = groupService.create(context); childGroup2 = GroupBuilder.createGroup(context).build();
context.commit(); context.commit();
@@ -926,9 +925,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup1 = groupService.create(context); childGroup1 = GroupBuilder.createGroup(context).build();
childGroup2 = groupService.create(context); childGroup2 = GroupBuilder.createGroup(context).build();
context.commit(); context.commit();
@@ -971,18 +970,18 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup1 = groupService.create(context); childGroup1 = GroupBuilder.createGroup(context)
childGroup2 = groupService.create(context); .withParent(parentGroup)
.build();
groupService.addMember(context, childGroup1, parentGroup); childGroup2 = GroupBuilder.createGroup(context).build();
groupService.update(context, childGroup1); groupService.update(context, childGroup1);
context.commit(); // context.commit();
//
parentGroup = context.reloadEntity(parentGroup); // parentGroup = context.reloadEntity(parentGroup);
childGroup1 = context.reloadEntity(childGroup1); // childGroup1 = context.reloadEntity(childGroup1);
childGroup2 = context.reloadEntity(childGroup2); // childGroup2 = context.reloadEntity(childGroup2);
context.restoreAuthSystemState(); context.restoreAuthSystemState();
String authToken = getAuthToken(admin.getEmail(), password); String authToken = getAuthToken(admin.getEmail(), password);
@@ -995,13 +994,15 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
) )
).andExpect(status().isUnprocessableEntity()); ).andExpect(status().isUnprocessableEntity());
// TODO - confirm with reviewers that this is a mistake - it actually should be No Content
// (see AddMember test) but was incorrectly expecting 422?
getClient(authToken).perform( getClient(authToken).perform(
post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups") post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE)) .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n" .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
+ REST_SERVER_URL + "eperson/groups/" + childGroup2.getID() + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
) )
).andExpect(status().isUnprocessableEntity()); ).andExpect(status().isNoContent());
} finally { } finally {
if (parentGroup != null) { if (parentGroup != null) {
@@ -1093,13 +1094,12 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
community = communityService.create(null, context); community = CommunityBuilder.createCommunity(context).build();
parentGroup = communityService.createAdministrators(context, community); parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
member1 = ePersonService.create(context); .addMember(eperson)
member2 = ePersonService.create(context); .build();
member1 = EPersonBuilder.createEPerson(context).build();
groupService.addMember(context, parentGroup, eperson); member2 = EPersonBuilder.createEPerson(context).build();
groupService.update(context, parentGroup);
context.commit(); context.commit();
@@ -1158,9 +1158,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
member1 = ePersonService.create(context); member1 = EPersonBuilder.createEPerson(context).build();
member2 = ePersonService.create(context); member2 = EPersonBuilder.createEPerson(context).build();
context.commit(); context.commit();
@@ -1204,9 +1204,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
member1 = ePersonService.create(context); member1 = EPersonBuilder.createEPerson(context).build();
member2 = ePersonService.create(context); member2 = EPersonBuilder.createEPerson(context).build();
context.commit(); context.commit();
@@ -1249,9 +1249,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
member1 = ePersonService.create(context); member1 = EPersonBuilder.createEPerson(context).build();
member2 = ePersonService.create(context); member2 = EPersonBuilder.createEPerson(context).build();
context.commit(); context.commit();
@@ -1295,9 +1295,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
member1 = ePersonService.create(context); member1 = EPersonBuilder.createEPerson(context).build();
member2 = ePersonService.create(context); member2 = EPersonBuilder.createEPerson(context).build();
context.commit(); context.commit();
@@ -1389,13 +1389,13 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
community = communityService.create(null, context); community = CommunityBuilder.createCommunity(context).build();
parentGroup = communityService.createAdministrators(context, community); parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
childGroup = groupService.create(context); .addMember(eperson)
.build();
groupService.addMember(context, parentGroup, childGroup); childGroup = GroupBuilder.createGroup(context)
groupService.addMember(context, parentGroup, eperson); .withParent(parentGroup)
groupService.update(context, parentGroup); .build();
context.commit(); context.commit();
@@ -1439,8 +1439,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup = groupService.create(context); childGroup = GroupBuilder.createGroup(context).build();
context.commit(); context.commit();
@@ -1474,8 +1474,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup = groupService.create(context); childGroup = GroupBuilder.createGroup(context).build();
context.commit(); context.commit();
@@ -1508,10 +1508,10 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup = groupService.create(context); childGroup = GroupBuilder.createGroup(context)
.withParent(parentGroup)
groupService.addMember(context, childGroup, parentGroup); .build();
context.commit(); context.commit();
@@ -1546,10 +1546,10 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); parentGroup = GroupBuilder.createGroup(context).build();
childGroup = groupService.create(context); childGroup = GroupBuilder.createGroup(context)
.withParent(parentGroup)
groupService.addMember(context, childGroup, parentGroup); .build();
context.commit(); context.commit();
@@ -1625,13 +1625,12 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
community = communityService.create(null, context); community = CommunityBuilder.createCommunity(context).build();
parentGroup = communityService.createAdministrators(context, community); member = EPersonBuilder.createEPerson(context).build();
member = ePersonService.create(context); parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
.addMember(member)
groupService.addMember(context, parentGroup, member); .addMember(eperson)
groupService.addMember(context, parentGroup, eperson); .build();
groupService.update(context, parentGroup);
assertTrue(groupService.isMember(context, member, parentGroup)); assertTrue(groupService.isMember(context, member, parentGroup));
@@ -1678,9 +1677,10 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); member = EPersonBuilder.createEPerson(context).build();
member = ePersonService.create(context); parentGroup = GroupBuilder.createGroup(context)
groupService.addMember(context, parentGroup, member); .addMember(member)
.build();
context.commit(); context.commit();
@@ -1715,9 +1715,10 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); member = EPersonBuilder.createEPerson(context).build();
member = ePersonService.create(context); parentGroup = GroupBuilder.createGroup(context)
groupService.addMember(context, parentGroup, member); .addMember(member)
.build();
context.commit(); context.commit();
@@ -1751,9 +1752,10 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); member = EPersonBuilder.createEPerson(context).build();
member = ePersonService.create(context); parentGroup = GroupBuilder.createGroup(context)
groupService.addMember(context, parentGroup, member); .addMember(member)
.build();
context.commit(); context.commit();
@@ -1789,9 +1791,10 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
try { try {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
parentGroup = groupService.create(context); member = EPersonBuilder.createEPerson(context).build();
member = ePersonService.create(context); parentGroup = GroupBuilder.createGroup(context)
groupService.addMember(context, parentGroup, member); .addMember(member)
.build();
context.commit(); context.commit();
@@ -2586,7 +2589,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
String itemGroupString = "ITEM"; String itemGroupString = "ITEM";
int defaultItemRead = Constants.DEFAULT_ITEM_READ; int defaultItemRead = Constants.DEFAULT_ITEM_READ;
Group itemReadGroup = collectionService.createDefaultReadGroup(context, col1, itemGroupString, defaultItemRead); Group itemReadGroup = GroupBuilder.createCollectionDefaultReadGroup(context,
col1, itemGroupString, defaultItemRead).build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -2670,8 +2674,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
String bitstreamGroupString = "BITSTREAM"; String bitstreamGroupString = "BITSTREAM";
int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ; int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
Group bitstreamReadGroup = collectionService.createDefaultReadGroup(context, col1, bitstreamGroupString, Group bitstreamReadGroup = GroupBuilder.createCollectionDefaultReadGroup(context, col1, bitstreamGroupString,
defaultBitstreamRead); defaultBitstreamRead)
.build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -2792,7 +2797,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminRemoveMembersFromCollectionAdminGroupSuccess() throws Exception { public void collectionAdminRemoveMembersFromCollectionAdminGroupSuccess() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build(); EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -2827,7 +2833,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminAddChildGroupToCollectionAdminGroupSuccess() throws Exception { public void collectionAdminAddChildGroupToCollectionAdminGroupSuccess() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
Group group = GroupBuilder.createGroup(context).withName("testGroup").build(); Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -2853,7 +2860,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminRemoveChildGroupFromCollectionAdminGroupSuccess() throws Exception { public void collectionAdminRemoveChildGroupFromCollectionAdminGroupSuccess() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
Group group = GroupBuilder.createGroup(context).withName("testGroup").build(); Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -2889,7 +2897,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminAddMembersToCollectionAdminGroupPropertySetToFalse() throws Exception { public void collectionAdminAddMembersToCollectionAdminGroupPropertySetToFalse() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build(); EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false); configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false);
@@ -2923,7 +2932,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminRemoveMembersFromCollectionAdminGroupPropertySetToFalse() throws Exception { public void collectionAdminRemoveMembersFromCollectionAdminGroupPropertySetToFalse() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build(); EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -2961,7 +2971,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminAddChildGroupToCollectionAdminGroupPropertySetToFalse() throws Exception { public void collectionAdminAddChildGroupToCollectionAdminGroupPropertySetToFalse() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
Group group = GroupBuilder.createGroup(context).withName("testGroup").build(); Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false); configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false);
@@ -2990,7 +3001,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
public void collectionAdminRemoveChildGroupFromCollectionAdminGroupPropertySetToFalse() throws Exception { public void collectionAdminRemoveChildGroupFromCollectionAdminGroupPropertySetToFalse() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
Group adminGroup = collectionService.createAdministrators(context, collection); Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
.build();
authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson); authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
Group group = GroupBuilder.createGroup(context).withName("testGroup").build(); Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
context.restoreAuthSystemState(); context.restoreAuthSystemState();