add & update tests

Author: samyuktaprabhu

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/common/ApplicationHandlerHelper.java

@@ -37,20 +37,12 @@ public final class ApplicationHandlerHelper {
   private static final String ANNOTATION_IS_MEDIA_DATA = "_is_media_data";
   private static final String ANNOTATION_CORE_MEDIA_TYPE = "Core.MediaType";
   private static final ObjectMapper objectMapper = new ObjectMapper();
+  private static final TypeReference<List<String>> STRING_LIST_TYPE_REF = new TypeReference<>() {};
 
   /** Filter to support extraction of file name for attachment validation */
   public static final Filter FILE_NAME_FILTER =
       (path, element, type) -> element.getName().contentEquals("fileName");
 
-  /**
-   * A filter for acceptable media types. The filter checks if the entity is a media entity and if
-   * the element has the annotation "Core.AcceptableMediaTypes".
-   */
-  public static final Filter ACCEPTABLE_MEDIA_TYPE_FILTER =
-      (path, element, type) ->
-          element.getName().contentEquals("content")
-              && element.findAnnotation("Core.AcceptableMediaTypes").isPresent();
-
   /**
    * A filter for media content fields. The filter checks if the entity is a media entity and if the
    * element has the annotation "Core.MediaType".
@@ -161,20 +153,19 @@ public static void validateAcceptableMediaTypes(
     if (serviceEntity == null || !isMediaEntity(serviceEntity)) {
       return;
     }
-    List<String> allowedTypes = getEntityAcceptableMediaTypes(serviceEntity, cdsModel);
+    List<String> allowedTypes = getEntityAcceptableMediaTypes(serviceEntity);
     String fileName = extractFileName(entity, data);
     AttachmentValidationHelper.validateMediaTypeForAttachment(fileName, allowedTypes);
   }
 
-  protected static List<String> getEntityAcceptableMediaTypes(CdsEntity entity, CdsModel cdsModel) {
+  protected static List<String> getEntityAcceptableMediaTypes(CdsEntity entity) {
     Optional<CdsAnnotation<Object>> flatMap =
         entity.getElement("content").findAnnotation("Core.AcceptableMediaTypes");
     List<String> result =
         flatMap
             .map(
                 annotation ->
-                    objectMapper.convertValue(
-                        annotation.getValue(), new TypeReference<List<String>>() {}))
+                    objectMapper.convertValue(annotation.getValue(), STRING_LIST_TYPE_REF))
             .orElse(List.of("*/*"));
     return result;
   }

cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/CreateAttachmentsHandlerTest.java

@@ -80,8 +80,12 @@ static void classSetup() {
   void setup() {
     eventFactory = mock(ModifyAttachmentEventFactory.class);
     storageReader = mock(ThreadDataStorageReader.class);
-    cut = new CreateAttachmentsHandler(
-        eventFactory, storageReader, ModifyApplicationHandlerHelper.DEFAULT_SIZE_WITH_SCANNER);
+    cut =
+        new CreateAttachmentsHandler(
+            eventFactory,
+            storageReader,
+            ModifyApplicationHandlerHelper.DEFAULT_SIZE_WITH_SCANNER,
+            runtime);
 
     createContext = mock(CdsCreateEventContext.class);
     event = mock(ModifyAttachmentEvent.class);
@@ -335,7 +339,8 @@ void restoreError_proceedsSuccessfully_noException() {
   @Test
   void restoreError_contentTooLargeWithMaxSize_throwsWithMaxSize() {
     var context = mock(EventContext.class);
-    var originalException = new ServiceException(ExtendedErrorStatuses.CONTENT_TOO_LARGE, "original message");
+    var originalException =
+        new ServiceException(ExtendedErrorStatuses.CONTENT_TOO_LARGE, "original message");
     doThrow(originalException).when(context).proceed();
     when(context.get("attachment.MaxSize")).thenReturn("10MB");
 
@@ -349,7 +354,8 @@ void restoreError_contentTooLargeWithMaxSize_throwsWithMaxSize() {
   @Test
   void restoreError_contentTooLargeWithoutMaxSize_throwsWithoutMaxSize() {
     var context = mock(EventContext.class);
-    var originalException = new ServiceException(ExtendedErrorStatuses.CONTENT_TOO_LARGE, "original message");
+    var originalException =
+        new ServiceException(ExtendedErrorStatuses.CONTENT_TOO_LARGE, "original message");
     doThrow(originalException).when(context).proceed();
     when(context.get("attachment.MaxSize")).thenReturn(null);
 
@@ -386,14 +392,15 @@ void restoreError_methodHasCorrectAnnotations() throws NoSuchMethodException {
 
   @Test
   void processBeforeForMetadata_methodHasCorrectAnnotations() throws NoSuchMethodException {
-    Method method = cut.getClass().getDeclaredMethod("processBeforeForMetadata", EventContext.class, List.class);
+    Method method =
+        cut.getClass()
+            .getDeclaredMethod("processBeforeForMetadata", EventContext.class, List.class);
 
     Before beforeAnnotation = method.getAnnotation(Before.class);
     HandlerOrder handlerOrderAnnotation = method.getAnnotation(HandlerOrder.class);
 
     assertThat(beforeAnnotation.event())
-        .containsExactlyInAnyOrder(
-            CqnService.EVENT_CREATE, DraftService.EVENT_DRAFT_NEW);
+        .containsExactlyInAnyOrder(CqnService.EVENT_CREATE, DraftService.EVENT_DRAFT_NEW);
     assertThat(handlerOrderAnnotation.value()).isEqualTo(HandlerOrder.BEFORE);
   }
 
@@ -404,13 +411,17 @@ void processBeforeForMetadata_executesValidation() {
     List<CdsData> data = List.of(mock(CdsData.class));
     when(context.getTarget()).thenReturn(entity);
 
-    try (MockedStatic<ApplicationHandlerHelper> helper = mockStatic(ApplicationHandlerHelper.class)) {
-      helper.when(() -> ApplicationHandlerHelper.validateAcceptableMediaTypes(entity, data))
+    try (MockedStatic<ApplicationHandlerHelper> helper =
+        mockStatic(ApplicationHandlerHelper.class)) {
+      helper
+          .when(() -> ApplicationHandlerHelper.validateAcceptableMediaTypes(entity, data, runtime))
           .thenAnswer(invocation -> null);
       // when
-      new CreateAttachmentsHandler(eventFactory, storageReader, "400MB").processBeforeForMetadata(context, data);
+      new CreateAttachmentsHandler(eventFactory, storageReader, "400MB", runtime)
+          .processBeforeForMetadata(context, data);
       // then
-      helper.verify(() -> ApplicationHandlerHelper.validateAcceptableMediaTypes(entity, data));
+      helper.verify(
+          () -> ApplicationHandlerHelper.validateAcceptableMediaTypes(entity, data, runtime));
     }
   }