add unit tests

wcm-io · Sep 4, 2023 · 0bfa813 · 0bfa813
1 parent 6959eff
commit 0bfa813
Show file tree

Hide file tree

Showing 5 changed files with 486 additions and 7 deletions.
diff --git a/bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v3/ImageV3Impl.java b/bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v3/ImageV3Impl.java
@@ -144,6 +144,7 @@ private void activate() {
     // resolve media and properties from DAM asset
     ComponentFeatureImageResolver imageResolver = new ComponentFeatureImageResolver(resource, getCurrentPage(), currentStyle, mediaHandler)
         .targetPage(link.getLinkObject().getTargetPage())
+        .altValueFromDam(altFromAsset)
         .mediaHandlerProperty(PROP_CSS_CLASS, "cmp-image__image")
         .mediaHandlerProperty("itemprop", "contentUrl");
     String imageTitle = title;
@@ -152,10 +153,6 @@ private void activate() {
     }
     media = imageResolver.buildMedia();
 
-    media = HandlerUnwrapper.get(mediaHandler, resource)
-        .decorative(isDecorative)
-        .forceAltValueFromAsset(altFromAsset)
-        .build();
     if (media.isValid() && !media.getRendition().isImage()) {
       // no image asset selected (cannot be rendered) - set to invalid
       media = mediaHandler.invalid();

diff --git a/...ore/src/main/java/io/wcm/wcm/core/components/impl/util/ComponentFeatureImageResolver.java b/...ore/src/main/java/io/wcm/wcm/core/components/impl/util/ComponentFeatureImageResolver.java
@@ -57,7 +57,7 @@ public class ComponentFeatureImageResolver {
 
   private final boolean imageFromPageImage;
   private final boolean altValueFromPageImage;
-  private final boolean altValueFromDam;
+  private boolean altValueFromDam;
   private final boolean isDecorative;
   private final String componentAltText;
 
@@ -105,6 +105,15 @@ public ComponentFeatureImageResolver mediaHandlerProperty(@NotNull String key, @
     return this;
   }
 
+  /**
+   * @param value Alt Value from DAM
+   * @return self
+   */
+  public ComponentFeatureImageResolver altValueFromDam(boolean value) {
+    this.altValueFromDam = value;
+    return this;
+  }
+
   /**
    * Build media after resolving feature images and alt. texts.
    * @return Media
@@ -167,6 +176,7 @@ else if (!(altValueFromPageImage || altValueFromDam)) {
       // otherwise rely to default media handler behavior
       builder.altText(componentAltText);
     }
+    builder.forceAltValueFromAsset(altValueFromDam);
 
     // apply custom media handling properties
     mediaHandlerProperties.entrySet().forEach(entry -> builder.property(entry.getKey(), entry.getValue()));

diff --git a/bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/ImageV2ImplTest.java b/bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/ImageV2ImplTest.java
@@ -201,7 +201,7 @@ void testWithUploadedImage() {
   }
 
   @Test
-  @SuppressWarnings({ "null", "deprecation" })
+  @SuppressWarnings("deprecation")
   void testWithImageAndLink() {
     enableDataLayer(context, true);