From f5f35fd72519fa95066c6f1cfc64530de01684d2 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 25 Jul 2022 14:42:11 -0400 Subject: [PATCH] add sleep in FilesIT, clean up assertions #6846 --- .../java/edu/harvard/iq/dataverse/api/FilesIT.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java index 15ee8f1dd82..950260d1400 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java @@ -650,14 +650,18 @@ public void testForceReplaceAndUpdate() { //"junk" passed below is to test that it is discarded String updateJsonString = "{\"description\":\""+updateDescription+"\",\"categories\":[\""+updateCategory+"\"],\"forceReplace\":false ,\"junk\":\"junk\"}"; Response updateMetadataFailResponse = UtilIT.updateFileMetadata(origFileId.toString(), updateJsonString, apiToken); - assertEquals(BAD_REQUEST.getStatusCode(), updateMetadataFailResponse.getStatusCode()); - + updateMetadataFailResponse.prettyPrint(); + updateMetadataFailResponse.then().assertThat().statusCode(BAD_REQUEST.getStatusCode()); + + UtilIT.sleepForLock(datasetId, null, apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION); + //Adding an additional fileMetadata update tests after this to ensure updating replaced files works msg("Update file metadata for new file"); //"junk" passed below is to test that it is discarded System.out.print("params: " + String.valueOf(newDfId) + " " + updateJsonString + " " + apiToken); Response updateMetadataResponse = UtilIT.updateFileMetadata(String.valueOf(newDfId), updateJsonString, apiToken); - assertEquals(OK.getStatusCode(), updateMetadataResponse.getStatusCode()); + updateMetadataResponse.prettyPrint(); + updateMetadataResponse.then().assertThat().statusCode(OK.getStatusCode()); //String updateMetadataResponseString = updateMetadataResponse.body().asString(); Response getUpdatedMetadataResponse = UtilIT.getDataFileMetadataDraft(newDfId, apiToken); String getUpMetadataResponseString = getUpdatedMetadataResponse.body().asString();