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

106812: Fix and add new tests

Browse Source
This commit is contained in:
Yana De Pauw
2023-09-29 10:36:43 +02:00
parent eb905037f7
commit 25793a55d2
2 changed files with 116 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
View File

@@ -998,7 +998,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
AtomicReference<Integer> idRef = new AtomicReference<Integer>();
try {
Community community = CommunityBuilder.createCommunity(context)
.withName("My commynity")
.withName("My community")
.build();
EPerson eperson1 = EPersonBuilder.createEPerson(context)
@@ -1045,6 +1045,98 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
ResourcePolicyBuilder.delete(idRef.get());
}
}
@Test
public void createWithGroupTest() throws Exception {
context.turnOffAuthorisationSystem();
AtomicReference<Integer> idRef = new AtomicReference<Integer>();
try {
Community community = CommunityBuilder.createCommunity(context)
.withName("My community")
.build();
EPerson eperson1 = EPersonBuilder.createEPerson(context)
.withEmail("eperson1@mail.com")
.withPassword("qwerty01")
.build();
Group group1 = GroupBuilder.createGroup(context)
.withName("Group 1")
.addMember(eperson1)
.build();
context.restoreAuthSystemState();
ObjectMapper mapper = new ObjectMapper();
ResourcePolicyRest resourcePolicyRest = new ResourcePolicyRest();
resourcePolicyRest.setPolicyType(ResourcePolicy.TYPE_SUBMISSION);
resourcePolicyRest.setAction(Constants.actionText[Constants.READ]);
String authToken = getAuthToken(admin.getEmail(), password);
getClient(authToken)
.perform(post("/api/authz/resourcepolicies")
.content(mapper.writeValueAsBytes(resourcePolicyRest))
.param("resource", community.getID().toString())
.param("group", group1.getID().toString())
.param("projections", "full")
.contentType(contentType))
.andExpect(status().isCreated())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$", ResourcePolicyMatcher.matchFullEmbeds()))
.andExpect(jsonPath("$", Matchers.allOf(
hasJsonPath("$.name", is(resourcePolicyRest.getName())),
hasJsonPath("$.description", is(resourcePolicyRest.getDescription())),
hasJsonPath("$.policyType", is(resourcePolicyRest.getPolicyType())),
hasJsonPath("$.action", is(resourcePolicyRest.getAction())),
hasJsonPath("$.startDate", is(resourcePolicyRest.getStartDate())),
hasJsonPath("$.endDate", is(resourcePolicyRest.getEndDate())),
hasJsonPath("$.type", is(resourcePolicyRest.getType())))))
.andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
String authToken1 = getAuthToken(eperson1.getEmail(), "qwerty01");
getClient(authToken1).perform(get("/api/authz/resourcepolicies/" + idRef.get()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$._links.self.href",
Matchers.containsString("/api/authz/resourcepolicies/" + idRef.get())));
} finally {
ResourcePolicyBuilder.delete(idRef.get());
}
}
@Test
public void createWithoutGroupOrPersonTest() throws Exception {
context.turnOffAuthorisationSystem();
Community community = CommunityBuilder.createCommunity(context)
.withName("My commynity")
.build();
context.restoreAuthSystemState();
ObjectMapper mapper = new ObjectMapper();
ResourcePolicyRest resourcePolicyRest = new ResourcePolicyRest();
resourcePolicyRest.setPolicyType(ResourcePolicy.TYPE_SUBMISSION);
resourcePolicyRest.setAction(Constants.actionText[Constants.ADMIN]);
String authToken = getAuthToken(admin.getEmail(), password);
getClient(authToken).perform(post("/api/authz/resourcepolicies")
.content(mapper.writeValueAsBytes(resourcePolicyRest))
.param("resource", community.getID().toString())
.contentType(contentType))
.andExpect(status().isBadRequest());
getClient(authToken).perform(get("/api/authz/resourcepolicies/search/resource")
.param("uuid", community.getID().toString())
.param("action", "ADMIN"))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$._links.self.href",
Matchers.containsString("api/authz/resourcepolicies/search/resource")))
.andExpect(jsonPath("$.page.totalElements", is(0)));
}
@Test
public void createOneUnAuthenticatedTest() throws Exception {

29
dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
View File

@@ -6722,7 +6722,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
.build();
witem.getItem().setDiscoverable(false);
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup).withDspaceObject(witem.getItem())
.withPolicyType(TYPE_CUSTOM)
.withName("administrator")
.build();
ResourcePolicyBuilder.createResourcePolicy(context, null, anonymousGroup)
@@ -7119,7 +7121,10 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
.withDspaceObject(witem.getItem())
.withPolicyType(TYPE_CUSTOM)
.withName("administrator")
.build();
Calendar calendar = Calendar.getInstance();
@@ -7198,7 +7203,10 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
.withDspaceObject(witem.getItem())
.withPolicyType(TYPE_CUSTOM)
.withName("administrator")
.build();
context.restoreAuthSystemState();
@@ -7258,7 +7266,10 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
.withDspaceObject(witem.getItem())
.withPolicyType(TYPE_CUSTOM)
.withName("administrator")
.build();
context.restoreAuthSystemState();
@@ -7320,7 +7331,10 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
.withDspaceObject(witem.getItem())
.withPolicyType(TYPE_CUSTOM)
.withName("administrator")
.build();
context.restoreAuthSystemState();
@@ -7382,7 +7396,10 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
.build();
.withDspaceObject(witem.getItem())
.withPolicyType(TYPE_CUSTOM)
.withName("administrator")
.build();
context.restoreAuthSystemState();