Added: empty content validation for featured items

IQSS · Jan 14, 2025 · f4b6e0c · f4b6e0c
1 parent 5c61511
commit f4b6e0c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/...u/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseFeaturedItemCommand.java b/...u/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseFeaturedItemCommand.java
@@ -30,7 +30,7 @@ public AbstractWriteDataverseFeaturedItemCommand(DataverseRequest request, Datav
     }
 
     protected void validateAndSetContent(DataverseFeaturedItem featuredItem, String content) throws InvalidCommandArgumentsException {
-        if (content == null) {
+        if (content == null || content.trim().isEmpty()) {
             throw new InvalidCommandArgumentsException(
                     BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentShouldBeProvided"),
                     this

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -989,7 +989,7 @@ dataverse.create.error.jsonparsetodataverse=Error parsing the POSTed json into a
 dataverse.create.featuredItem.error.imageFileProcessing=Error processing featured item file: {0}
 dataverse.create.featuredItem.error.fileSizeExceedsLimit=File exceeds the maximum size of {0}
 dataverse.create.featuredItem.error.invalidFileType=Invalid image file type
-dataverse.create.featuredItem.error.contentShouldBeProvided=Featured item 'content' property should be provided.
+dataverse.create.featuredItem.error.contentShouldBeProvided=Featured item 'content' property should be provided and not empty.
 dataverse.create.featuredItem.error.contentExceedsLengthLimit=Featured item content exceeds the maximum allowed length of {0} characters.
 dataverse.update.featuredItems.error.missingInputParams=All input parameters (id, content, displayOrder, keepFile, fileNames) are required.
 dataverse.update.featuredItems.error.inputListsSizeMismatch=All input lists (id, content, displayOrder, keepFile, fileNames) must have the same size.

diff --git a/.../edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommandTest.java b/.../edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseFeaturedItemCommandTest.java
@@ -10,6 +10,8 @@
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -122,16 +124,14 @@ void execute_invalidFileTypeProvided_throwsInvalidCommandArgumentsException() th
     }
 
     @Test
-    void execute_contentNotProvided_throwsInvalidCommandArgumentsException() {
-        testNewDataverseFeaturedItemDTO.setContent(null);
-        InputStream inputStreamMock = mock(InputStream.class);
-        testNewDataverseFeaturedItemDTO.setImageFileInputStream(inputStreamMock);
+    void execute_contentIsNull_throwsInvalidCommandArgumentsException() {
+        assertContentShouldBeProvidedInvalidCommandArgumentsException(null);
+    }
 
-        InvalidCommandArgumentsException exception = assertThrows(InvalidCommandArgumentsException.class, () -> sut.execute(contextStub));
-        assertEquals(
-                BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentShouldBeProvided"),
-                exception.getMessage()
-        );
+    @ParameterizedTest
+    @ValueSource(strings = {" ", ""})
+    void execute_contentIsEmpty_throwsInvalidCommandArgumentsException(String content) {
+        assertContentShouldBeProvidedInvalidCommandArgumentsException(content);
     }
 
     @Test
@@ -150,6 +150,18 @@ void execute_contentExceedsLimit_throwsInvalidCommandArgumentsException() {
         );
     }
 
+    private void assertContentShouldBeProvidedInvalidCommandArgumentsException(String content) {
+        testNewDataverseFeaturedItemDTO.setContent(content);
+        InputStream inputStreamMock = mock(InputStream.class);
+        testNewDataverseFeaturedItemDTO.setImageFileInputStream(inputStreamMock);
+
+        InvalidCommandArgumentsException exception = assertThrows(InvalidCommandArgumentsException.class, () -> sut.execute(contextStub));
+        assertEquals(
+                BundleUtil.getStringFromBundle("dataverse.create.featuredItem.error.contentShouldBeProvided"),
+                exception.getMessage()
+        );
+    }
+
     private String createContentExceedingMaxLength() {
         return "a".repeat(Math.max(0, DataverseFeaturedItem.MAX_FEATURED_ITEM_CONTENT_SIZE + 1));
     }