Skip to content

Commit

Permalink
added metadata item and bitstream tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Paurikova2
Paurikova2 committed Oct 1, 2024
1 parent 0b3c0d7 commit 64d84a1
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 15 deletions.
180 changes: 166 additions & 14 deletions dspace-server-webapp/src/test/java/org/dspace/app/rest/ProvenanceServiceIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,29 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.lucene.util.Bits;
import org.checkerframework.checker.units.qual.A;
import org.dspace.app.rest.matcher.CollectionMatcher;
import org.dspace.app.rest.matcher.ItemMatcher;
import org.dspace.app.rest.model.patch.AddOperation;
import org.dspace.app.rest.model.patch.Operation;
import org.dspace.app.rest.model.patch.RemoveOperation;
import org.dspace.app.rest.model.patch.ReplaceOperation;
import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.dspace.authorize.AuthorizeException;
import org.dspace.builder.BitstreamBuilder;
import org.dspace.builder.BundleBuilder;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.ItemBuilder;
import org.dspace.content.Bitstream;
import org.dspace.content.Bundle;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.DSpaceObject;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.service.BitstreamService;
import org.dspace.content.service.ItemService;
import org.hamcrest.Matchers;
import org.hamcrest.core.StringContains;
Expand All @@ -31,18 +42,25 @@
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.ResultActions;

import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static java.nio.charset.Charset.defaultCharset;
import static org.apache.commons.io.IOUtils.toInputStream;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
import static org.hamcrest.Matchers.is;
import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
import static org.springframework.http.MediaType.parseMediaType;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
Expand All @@ -57,6 +75,8 @@ public class ProvenanceServiceIT extends AbstractControllerIntegrationTest {

@Autowired
private ItemService itemService;
@Autowired
private BitstreamService bitstreamService;

@Before
public void setup() throws Exception {
Expand All @@ -68,6 +88,19 @@ public void setup() throws Exception {
collection = CollectionBuilder.createCollection(context, parentCommunity).build();
}

private String provenanceMetadataModified(String metadata) {
// Regex to match the date pattern
String datePattern = "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z";
Pattern pattern = Pattern.compile(datePattern);
Matcher matcher = pattern.matcher(metadata);
String rspModifiedProvenance = metadata;
while (matcher.find()) {
String dateString = matcher.group(0);
rspModifiedProvenance = rspModifiedProvenance.replaceAll(dateString, "");
}
return rspModifiedProvenance;
}

private JsonNode preprocessingProvenance(String responseBody) throws JsonProcessingException {
//String responseBody = resultActions.andReturn().getResponse().getContentAsString();
JsonNode responseJson = objectMapper.readTree(responseBody);
Expand Down Expand Up @@ -106,6 +139,15 @@ private Item createItem() {
return item;
}

private Bitstream createBitstream(Item item) throws SQLException, AuthorizeException, IOException {
context.turnOffAuthorisationSystem();
Bundle bundle = BundleBuilder.createBundle(context, item).withName("test").build();
Bitstream bitstream = BitstreamBuilder.createBitstream(context, bundle,
toInputStream("Test Content", defaultCharset())).build();
context.restoreAuthSystemState();
return bitstream;
}

private void responseCheck(JsonNode response, String respKey) {
JsonNode expectedSubStr = suite.get(respKey);
JsonNode responseMetadata = response.get("metadata").get("dc.description.provenance");
Expand All @@ -123,15 +165,15 @@ private void responseCheck(JsonNode response, String respKey) {
}
}

private void itemCheck(Item item, String respKey) {
private void objectCheck(DSpaceObject obj, String respKey) {
String expectedSubStr = suite.get(respKey).asText();
List<MetadataValue> metadata = item.getMetadata();
List<MetadataValue> metadata = obj.getMetadata();
boolean contain = false;
for (MetadataValue value : metadata) {
if (!Objects.equals(value.getMetadataField().toString(), "dc_description_provenance")) {
continue;
}
if (value.getValue().contains(expectedSubStr)) {
if (provenanceMetadataModified(value.getValue()).contains(expectedSubStr)) {
contain = true;
break;
}
Expand All @@ -142,25 +184,25 @@ private void itemCheck(Item item, String respKey) {
}

@Test
public void makeDsicoverableTest() throws Exception {
public void makeDiscoverableTest() throws Exception {
String token = getAuthToken(admin.getEmail(), password);
Item item = createItem();
// List<Operation> ops = new ArrayList<Operation>();
// ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", true);
// ops.add(replaceOperation);
// String patchBody = getPatchContent(ops);
List<Operation> ops = new ArrayList<>();
ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", true);
ops.add(replaceOperation);
String patchBody = getPatchContent(ops);

// make discoverable
MvcResult mvcResult = getClient(token).perform(patch("/api/core/items/" + item.getID()
+ "/discoverable")
// .content(patchBody)
getClient(token).perform(patch("/api/core/items/" + item.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.uuid", Matchers.is(item.getID().toString())))
.andExpect(jsonPath("$.discoverable", Matchers.is(true)))
.andReturn();
responseCheck(Objects.requireNonNull(preprocessingProvenance(mvcResult.getResponse().getContentAsString())),
"discoverable");
objectCheck(itemService.find(context, item.getID()), "discoverable");
//responseCheck(Objects.requireNonNull(preprocessingProvenance(mvcResult.getResponse().getContentAsString())),
// "discoverable");
}

@Test
Expand All @@ -187,6 +229,116 @@ public void mappedCollection() throws Exception {
)))
.andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/core/items")))
;
itemCheck(itemService.find(context, item.getID()), "mapped");
objectCheck(itemService.find(context, item.getID()), "mapped");
}

@Test
public void addMetadata() throws Exception {
Item item = createItem();

String adminToken = getAuthToken(admin.getEmail(), password);

// Modify the entityType and verify the response already contains this modification
List<Operation> ops = new ArrayList<>();
AddOperation addOperation = new AddOperation("/metadata/dc.title", "Test");
ops.add(addOperation);
String patchBody = getPatchContent(ops);
getClient(adminToken).perform(patch("/api/core/items/" + item.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk());

objectCheck(itemService.find(context, item.getID()), "addMetadata");
}

@Test
public void replaceMetadata() throws Exception {
Item item = createItem();

String adminToken = getAuthToken(admin.getEmail(), password);
int index = 0;
// Modify the entityType and verify the response already contains this modification
List<Operation> ops = new ArrayList<>();
ReplaceOperation replaceOperation = new ReplaceOperation("/metadata/dc.title/" + index, "Test");
ops.add(replaceOperation);
String patchBody = getPatchContent(ops);
getClient(adminToken).perform(patch("/api/core/items/" + item.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk());

objectCheck(itemService.find(context, item.getID()), "replaceMetadata");
}

@Test
public void removeMetadata() throws Exception {
Item item = createItem();

String adminToken = getAuthToken(admin.getEmail(), password);
int index = 0;
// Modify the entityType and verify the response already contains this modification
List<Operation> ops = new ArrayList<>();
RemoveOperation removeOperation = new RemoveOperation("/metadata/dc.title" + index);
ops.add(removeOperation);
String patchBody = getPatchContent(ops);
getClient(adminToken).perform(patch("/api/core/items/" + item.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk());

objectCheck(itemService.find(context, item.getID()), "removeMetadata");
}

@Test
public void removeMetadataBitstream() throws Exception {
Item item = createItem();
Bitstream bitstream = createBitstream(item);
String adminToken = getAuthToken(admin.getEmail(), password);
int index = 0;
// Modify the entityType and verify the response already contains this modification
List<Operation> ops = new ArrayList<>();
AddOperation addOperation = new AddOperation("/metadata/dc.description", "test");
ops.add(addOperation);
String patchBody = getPatchContent(ops);
getClient(adminToken).perform(patch("/api/core/bitstreams/" + bitstream.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk());
objectCheck(itemService.find(context, item.getID()), "removeBitstreamMtd");
}

@Test
public void addMetadataBitstream() throws Exception {
Item item = createItem();
Bitstream bitstream = createBitstream(item);
String adminToken = getAuthToken(admin.getEmail(), password);
// Modify the entityType and verify the response already contains this modification
List<Operation> ops = new ArrayList<>();
AddOperation addOperation = new AddOperation("/metadata/dc.description", "test");
ops.add(addOperation);
String patchBody = getPatchContent(ops);
getClient(adminToken).perform(patch("/api/core/bitstreams/" + bitstream.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk());
objectCheck(itemService.find(context, item.getID()), "removeBitstreamMtd");
}

@Test
public void updateMetadataBitstream() throws Exception {
Item item = createItem();
Bitstream bitstream = createBitstream(item);
String adminToken = getAuthToken(admin.getEmail(), password);
int index = 0;
// Modify the entityType and verify the response already contains this modification
List<Operation> ops = new ArrayList<>();
ReplaceOperation replaceOperation = new ReplaceOperation("/metadata/dc.title" + index, "test 1");
ops.add(replaceOperation);
String patchBody = getPatchContent(ops);
getClient(adminToken).perform(patch("/api/core/bitstreams/" + bitstream.getID())
.content(patchBody)
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk());
objectCheck(itemService.find(context, item.getID()), "replaceBitstreamMtd");
}
}
7 changes: 6 additions & 1 deletion dspace-server-webapp/src/test/resources/org/dspace/app/rest/provenance-patch-suite.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"discoverable": "Item was made discoverable by first (admin) last (admin) ([email protected]) on \nNo. of bitstreams: 0\nItem was in collections:\n",
"mapped": "was mapped to collection"
"mapped": "was mapped to collection",
"addMetadata": "Item metadata (dc.title) was added by first (admin) last (admin) ([email protected]) on",
"replaceMetadata": "Item metadata (dc.title: Public item 1) was updated by first (admin) last (admin) ([email protected]) on \nNo. of bitstreams: 0",
"removeMetadata": "Item metadata (dc.title: Public item 1) was removed by first (admin) last (admin) ([email protected]) on \nNo. of bitstreams: 0",
"removeBitstreamMtd": "Item metadata (dc.description) was added by bitstream",
"replaceBitstreamMtd": "Item metadata (dc.description: test) was updated by bitstream"
}

0 comments on commit 64d84a1

Please sign in to comment.