From be58de63cd39cadd3b81e4415d699a824fe96980 Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Thu, 13 Aug 2020 12:07:02 -0400 Subject: [PATCH 1/3] removed checking of specific messages from error assertions --- .../harvard/iq/dataverse/api/DownloadFilesIT.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java index 4f4c34c1c8b..908beeac941 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DownloadFilesIT.java @@ -93,8 +93,7 @@ public void downloadAllFilesByVersion() throws IOException { downloadFiles2.prettyPrint(); downloadFiles2.then().assertThat() .statusCode(UNAUTHORIZED.getStatusCode()) - .body("status", equalTo("ERROR")) - .body("message", equalTo("User :guest is not permitted to perform requested action.")); + .body("status", equalTo("ERROR")); UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken) .then().assertThat().statusCode(OK.getStatusCode()); @@ -200,16 +199,14 @@ public void downloadAllFilesByVersion() throws IOException { downloadFiles10.prettyPrint(); downloadFiles10.then().assertThat() .statusCode(UNAUTHORIZED.getStatusCode()) - .body("status", equalTo("ERROR")) - .body("message", equalTo("User :guest is not permitted to perform requested action.")); + .body("status", equalTo("ERROR")); // Users are told about bad API tokens. Response downloadFiles11 = UtilIT.downloadFiles(datasetPid, "junkToken"); downloadFiles11.prettyPrint(); downloadFiles11.then().assertThat() .statusCode(UNAUTHORIZED.getStatusCode()) - .body("status", equalTo("ERROR")) - .body("message", equalTo("Bad api key ")); + .body("status", equalTo("ERROR")); } @@ -283,8 +280,7 @@ public void downloadAllFilesRestricted() throws IOException { downloadFiles3.prettyPrint(); downloadFiles3.then().assertThat() .statusCode(FORBIDDEN.getStatusCode()) - .body("status", equalTo("ERROR")) - .body("message", equalTo("'/api/v1/access/dataset/%3ApersistentId' you are not authorized to access this object via this api endpoint. Please check your code for typos, or consult our API guide at http://guides.dataverse.org.")); + .body("status", equalTo("ERROR")); // The creator uploads a README that will be public. Path pathToReadme = Paths.get(Files.createTempDirectory(null) + File.separator + "README.md"); From b8b2a1a8076cc2262017079284ff6e360b538aca Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Thu, 13 Aug 2020 13:01:10 -0400 Subject: [PATCH 2/3] add sleepforLock for ingested file --- src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java index 6c85b8d4269..dd905112b32 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java @@ -84,6 +84,7 @@ public void testFileLevelTool1() { uploadTabularFile.then().assertThat() .statusCode(OK.getStatusCode()); + assertTrue("Failed test if Ingest Lock exceeds max duration " + pathToTabularFile , UtilIT.sleepForLock(datasetId.longValue(), "Ingest", apiToken, UtilIT.MAXIMUM_INGEST_LOCK_DURATION)); Integer tabularFileId = JsonPath.from(uploadTabularFile.getBody().asString()).getInt("data.files[0].dataFile.id"); JsonObjectBuilder job = Json.createObjectBuilder(); From 93f451a46b598494b075f1963e353e2858b6635e Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Thu, 13 Aug 2020 13:13:36 -0400 Subject: [PATCH 3/3] Update ExternalToolsIT.java --- src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java index dd905112b32..af217e0cddb 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java @@ -17,6 +17,7 @@ import org.hamcrest.Matchers; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.assertTrue; public class ExternalToolsIT {