Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test for bitstream with null value for sizebytes #774

Merged
merged 5 commits into from
Oct 10, 2024
+41 −2
Merged

test for bitstream with null value for sizebytes #774

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec63fca
test for bitstream with null value for sizebytes
Paurikova2 Oct 3, 2024
a6983f6
fix inserting null value to long
Paurikova2 Oct 3, 2024
a6d347b
fix deleted bitstream test
Paurikova2 Oct 3, 2024
0056698
send message to throwing exception
Paurikova2 Oct 3, 2024
548a868
replaced !isNull by nonNull
Paurikova2 Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinBitstreamImportController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ public BitstreamRest importBitstreamForExistingFile(HttpServletRequest request)

Boolean deleted = Boolean.parseBoolean(deletedString);
//set size bytes
bitstream.setSizeBytes(bitstreamRest.getSizeBytes());
if (!Objects.isNull(bitstreamRest.getSizeBytes())) {
Paurikova2 marked this conversation as resolved.
Show resolved Hide resolved
bitstream.setSizeBytes(bitstreamRest.getSizeBytes());
} else {
log.info("SizeBytes is null. Bitstream UUID: " + bitstream.getID());
}
//set checksum
bitstream.setChecksum(bitstreamRest.getCheckSum().getValue());
//set checksum algorithm
Expand Down
35 changes: 35 additions & 0 deletions ...ce-server-webapp/src/test/java/org/dspace/app/rest/ClarinBitstreamImportControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,41 @@ public void importBitstreamForExistingFileValidationErrorTest() throws Exception
assertEquals(bitstreamService.findAll(context).size(), 0);
}

@Test
public void importDeletedBitstreamTest() throws Exception {
//input data
ObjectNode checksumNode = jsonNodeFactory.objectNode();
checksumNode.set("checkSumAlgorithm", null);
checksumNode.set("value", null);
ObjectNode node = jsonNodeFactory.objectNode();
node.set("sizeBytes", null);
node.set("checkSum", checksumNode);

//create new bitstream for existing file
ObjectMapper mapper = new ObjectMapper();
uuid = UUID.fromString(read( getClient(token).perform(post("/api/clarin/import/core/bitstream")
.content(mapper.writeValueAsBytes(node))
.contentType(contentType)
.param("internal_id", internalId)
.param("storeNumber", "0")
.param("deleted", "true"))
.andExpect(status().isOk())
.andReturn().getResponse().getContentAsString(),
"$.id"));

bitstream = bitstreamService.find(context, uuid);
assertEquals(bitstream.getSizeBytes(), 0);
assertEquals(bitstream.getInternalId(), internalId);
assertEquals(bitstream.getStoreNumber(), 0);
assertEquals(bitstream.getSequenceID(), -1);
assertEquals(bitstream.isDeleted(), true);

//clean all
context.turnOffAuthorisationSystem();
BitstreamBuilder.deleteBitstream(uuid);
context.restoreAuthSystemState();
}

private void checkCreatedBitstream(UUID uuid, String internalId, int storeNumber,
String bitstreamFormat, int sequence, boolean deleted, long sizeBytes,
String checkSum) throws SQLException {
Expand Down
Loading