Merge pull request #4720 from IQSS/4719-searchit-fixes

4719 searchit fixes
IQSS · May 29, 2018 · e600c29 · e600c29
2 parents d685091 + c441c6c
commit e600c29
Showing 1 changed file with 33 additions and 19 deletions.
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
@@ -329,9 +329,33 @@ public void testDatasetThumbnail() {
                 .body("data.items[0].name", CoreMatchers.equalTo("Darwin's Finches"))
                 .statusCode(200);
 
+        //Unpublished datafiles no longer populate the dataset thumbnail
         Response getThumbnail2 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
+        System.out.println("getThumbnail2: ");
         getThumbnail2.prettyPrint();
         getThumbnail2.then().assertThat()
+                //                .body("data.datasetThumbnail", CoreMatchers.equalTo("randomFromDataFile" + dataFileId1))
+                .body("data.datasetThumbnailBase64image", CoreMatchers.equalTo(null))
+                .body("data.isUseGenericThumbnail", CoreMatchers.equalTo(false))
+                .body("data.dataFileId", CoreMatchers.equalTo(null))
+                .body("data.datasetLogoPresent", CoreMatchers.equalTo(false))
+                .statusCode(200);
+
+        //We now need to publish for the dataset to get the thumbnail
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        publishDataverse.prettyPrint();
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
+        publishDataset.prettyPrint();
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response getThumbnail3 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
+        System.out.println("getThumbnail3: ");
+        getThumbnail3.prettyPrint();
+        getThumbnail3.then().assertThat()
                 //                .body("data.datasetThumbnail", CoreMatchers.equalTo("randomFromDataFile" + dataFileId1))
                 .body("data.datasetThumbnailBase64image", CoreMatchers.equalTo(treesAsBase64))
                 .body("data.isUseGenericThumbnail", CoreMatchers.equalTo(false))
@@ -399,9 +423,9 @@ public void testDatasetThumbnail() {
                 .statusCode(200);
 
         logger.info("Second DataFile has been uploaded and switched to as the thumbnail:");
-        Response getThumbnail3 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
-        getThumbnail3.prettyPrint();
-        getThumbnail3.then().assertThat()
+        Response getThumbnail4 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
+        getThumbnail4.prettyPrint();
+        getThumbnail4.then().assertThat()
                 //                .body("data.datasetThumbnail", CoreMatchers.equalTo("dataverseproject.png"))
                 .body("data.datasetThumbnailBase64image", CoreMatchers.equalTo(dataverseProjectLogoAsBase64))
                 .body("data.isUseGenericThumbnail", CoreMatchers.equalTo(false))
@@ -460,9 +484,9 @@ public void testDatasetThumbnail() {
                 .statusCode(200);
 
         logger.info("Dataset logo has been uploaded and becomes the thumbnail:");
-        Response getThumbnail4 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
-        getThumbnail4.prettyPrint();
-        getThumbnail4.then().assertThat()
+        Response getThumbnail5 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
+        getThumbnail5.prettyPrint();
+        getThumbnail5.then().assertThat()
                 //                .body("data.datasetThumbnail", CoreMatchers.equalTo(null))
                 .body("data.isUseGenericThumbnail", CoreMatchers.equalTo(false))
                 .body("data.datasetThumbnailBase64image", CoreMatchers.equalTo(datasetLogoAsBase64))
@@ -502,9 +526,9 @@ public void testDatasetThumbnail() {
                 .statusCode(200);
 
         logger.info("Deleting the dataset logo means that the thumbnail is not set. It should be the generic icon:");
-        Response getThumbnail5 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
-        getThumbnail5.prettyPrint();
-        getThumbnail5.then().assertThat()
+        Response getThumbnail6 = UtilIT.getDatasetThumbnailMetadata(datasetId, apiToken);
+        getThumbnail6.prettyPrint();
+        getThumbnail6.then().assertThat()
                 //                .body("data.datasetThumbnail", CoreMatchers.equalTo(null))
                 .body("data.isUseGenericThumbnail", CoreMatchers.equalTo(true))
                 .body("data.datasetLogoPresent", CoreMatchers.equalTo(false))
@@ -539,16 +563,6 @@ public void testDatasetThumbnail() {
                 .body("data.message", CoreMatchers.equalTo("Thumbnail set to " + treesAsBase64))
                 .statusCode(200);
 
-        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
-        publishDataverse.prettyPrint();
-        publishDataverse.then().assertThat()
-                .statusCode(OK.getStatusCode());
-
-        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
-        publishDataset.prettyPrint();
-        publishDataset.then().assertThat()
-                .statusCode(OK.getStatusCode());
-
         Response getThumbnailImageNoSpecialAccess99 = UtilIT.getDatasetThumbnail(datasetPersistentId, noSpecialAcessApiToken);
 //        getThumbnailImageNoSpecialAccess99.prettyPrint();
         getThumbnailImageNoSpecialAccess99.then().assertThat()