From d3125d5c55e44b2742e8e547e74f53a5e96d7d7d Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 13 Oct 2017 11:06:35 -0400 Subject: [PATCH 1/2] remove FIXME in test now that code is working #4139 I'm not sure when this was fixed. Probably 4.8. --- .../java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java b/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java index e60e168d114..46a37e41731 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java @@ -286,8 +286,7 @@ public void testCuratorSendsCommentsToAuthor() { Response authorsChecksForCommentsPostPublication = UtilIT.getNotifications(authorApiToken); authorsChecksForCommentsPostPublication.prettyPrint(); authorsChecksForCommentsPostPublication.then().assertThat() - // FIXME: Why is this ASSIGNROLE and not "your dataset has been published"? - .body("data.notifications[0].type", equalTo("ASSIGNROLE")) + .body("data.notifications[0].type", equalTo("PUBLISHEDDS")) .body("data.notifications[1].type", equalTo("RETURNEDDS")) // .body("data.notifications[1].reasonsForReturn[0].message", equalTo("You forgot to upload any files.")) // .body("data.notifications[1].reasonsForReturn[1].message", equalTo("A README is required.")) From 736a1ca56c444b29318e7bf2e4851c3ad464d9b4 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 13 Oct 2017 11:45:29 -0400 Subject: [PATCH 2/2] tests shouldn't depend on DCM running or being on Mac #4189 --- src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java index d19b000a276..91aa921df67 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java @@ -956,6 +956,11 @@ public void testCreateDatasetWithDcmDependency() { .body("message", equalTo("User @" + noPermsUsername + " is not permitted to perform requested action.")) .statusCode(UNAUTHORIZED.getStatusCode()); + boolean stopEarlyBecauseYouDoNotHaveDcmInstalled = true; + if (stopEarlyBecauseYouDoNotHaveDcmInstalled) { + return; + } + boolean stopEarlyToVerifyTheScriptWasCreated = false; if (stopEarlyToVerifyTheScriptWasCreated) { logger.info("On the DCM, does /deposit/gen/upload-" + datasetId + ".bash exist? It should! Creating the dataset should be enough to create it."); @@ -1138,7 +1143,7 @@ public void testDcmChecksumValidationMessages() throws IOException, InterruptedE * "files.sha" and (if checksum validation succeeds) the DCM moves the * files and the "files.sha" file into the uploadFolder. */ - boolean doExtraTesting = true; + boolean doExtraTesting = false; if (doExtraTesting) {