Merge pull request #11033 from IQSS/11032-async-datasetit-test-failure

add wait to async export call

Author: ofahimIQSS

src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java

@@ -4242,7 +4242,7 @@ public void testCitationDate() throws IOException {
                 .statusCode(OK.getStatusCode())
                 .body("data.message", is(expectedCitation));
 
-        Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken);
+        Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken, true);
         exportDatasetAsDublinCore.prettyPrint();
         exportDatasetAsDublinCore.then().assertThat()
                 .body("oai_dc.type", equalTo("Dataset"))
@@ -4259,7 +4259,7 @@ public void testCitationDate() throws IOException {
         rexport.then().assertThat().statusCode(OK.getStatusCode());
 
         String todayDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        Response exportPostClear = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken);
+        Response exportPostClear = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken, true);
         exportPostClear.prettyPrint();
         exportPostClear.then().assertThat()
                 .body("oai_dc.type", equalTo("Dataset"))

src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java

@@ -2161,19 +2161,22 @@ static Response uploadProvFreeForm(String idOrPersistentId, JsonObject jsonObjec
 //        return requestSpecification.delete("/api/files/" + idInPath + "/prov-freeform" + optionalQueryParam);
 //    }
     static Response exportDataset(String datasetPersistentId, String exporter) {
-        return exportDataset(datasetPersistentId, exporter, null);
+        return exportDataset(datasetPersistentId, exporter, null, false);
     }
-
     static Response exportDataset(String datasetPersistentId, String exporter, String apiToken) {
-//        http://localhost:8080/api/datasets/export?exporter=dataverse_json&persistentId=doi%3A10.5072/FK2/W6WIMQ
+        return exportDataset(datasetPersistentId, exporter, apiToken, false);
+    }
+    static Response exportDataset(String datasetPersistentId, String exporter, String apiToken, boolean wait) {
+        // Wait for the Async call to finish to get the updated data
+        if (wait) {
+            sleepForReexport(datasetPersistentId, apiToken, 10);
+        }
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
                     .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
         }
         return requestSpecification
-                //                .header(API_TOKEN_HTTP_HEADER, apiToken)
-                //                .get("/api/datasets/:persistentId/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter);
                 .get("/api/datasets/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter);
     }