Merge pull request #12173 from GlobalDataverseCommunityConsortium/MyDataTestFix

Fix another MyData test

Author: pdurbin

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

@@ -32,15 +32,15 @@ public static void setUpClass() {
     }
 
     @Test
-    public void testRetrieveMyDataAsJsonString() {
+    public void testRetrieveMyDataAsJsonString() throws InterruptedException {
         // Call with bad API token
         ArrayList<Long> emptyRoleIdsList = new ArrayList<>();
         Response badApiTokenResponse = UtilIT.retrieveMyDataAsJsonString("bad-token", "dummy-user-identifier", emptyRoleIdsList);
         badApiTokenResponse.then().assertThat().body("status", equalTo(ApiConstants.STATUS_ERROR)).body("message", equalTo(ApiKeyAuthMechanism.RESPONSE_MESSAGE_BAD_API_KEY)).statusCode(UNAUTHORIZED.getStatusCode());
 
         // Call as superuser with invalid user identifier
         Response createUserResponse = UtilIT.createRandomUser();
-        Response makeSuperUserResponse = UtilIT.makeSuperUser(UtilIT.getUsernameFromResponse(createUserResponse));
+        Response makeSuperUserResponse = UtilIT.setSuperuserStatus(UtilIT.getUsernameFromResponse(createUserResponse), true);
         assertEquals(OK.getStatusCode(), makeSuperUserResponse.getStatusCode());
         String superUserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
 
@@ -87,6 +87,7 @@ public void testRetrieveMyDataAsJsonString() {
         // Call as normal user with one valid dataverse role and one dataverse result
         UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR.toString(),
                 "@" + normalUserUsername, superUserApiToken);
+        Thread.sleep(4000);
         Response oneDataverseResponse = UtilIT.retrieveMyDataAsJsonString(normalUserApiToken, "", new ArrayList<>(Arrays.asList(5L)));
         oneDataverseResponse.prettyPrint();
 
@@ -118,7 +119,7 @@ public void testRetrieveMyDataCollections() throws InterruptedException {
         Response retrieveMyCollectionListResponse;
         // Create Superuser
         Response createUserResponse = UtilIT.createRandomUser();
-        Response makeSuperUserResponse = UtilIT.makeSuperUser(UtilIT.getUsernameFromResponse(createUserResponse));
+        Response makeSuperUserResponse = UtilIT.setSuperuserStatus(UtilIT.getUsernameFromResponse(createUserResponse), true);
         assertEquals(OK.getStatusCode(), makeSuperUserResponse.getStatusCode());
         String superUserUsername = UtilIT.getUsernameFromResponse(createUserResponse);
         String superUserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
@@ -476,6 +477,8 @@ public void testRetrieveMyDataWithCollections() {
 
         UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());
 
+        UtilIT.sleepForReindex(datasetPid, apiToken, 5);
+        
         // Test that the Dataverse collection that the dataset was created in is returned
         Response myDataResponse = UtilIT.retrieveMyDataAsJsonString(apiToken, "", new ArrayList<>(Arrays.asList(6L)), "&show_collections=true");
         myDataResponse.prettyPrint();