Add tests for auto width and original width and height ( "ow", "oh") values

Author: Amir Tocker

cloudinary-core/src/main/java/com/cloudinary/Transformation.java

@@ -469,10 +469,10 @@ public String generate(Map options) {
         String angle = StringUtils.join(ObjectUtils.asArray(options.get("angle")), ".");
 
         boolean noHtmlSizes = hasLayer || StringUtils.isNotBlank(angle) || "fit".equals(crop) || "limit".equals(crop);
-        if (width != null && (width.equals("auto") || Float.parseFloat(width) < 1 || noHtmlSizes || isResponsive)) {
+        if (width != null && (width.startsWith("auto") || !isValidAttrValue(width) || noHtmlSizes || isResponsive)) {
             this.htmlWidth = null;
         }
-        if (height != null && (Float.parseFloat(height) < 1 || noHtmlSizes || isResponsive)) {
+        if (height != null && (!isValidAttrValue(height) || noHtmlSizes || isResponsive)) {
             this.htmlHeight = null;
         }
 
@@ -607,6 +607,21 @@ public String generate(Map options) {
         return StringUtils.join(transformations, "/");
     }
 
+    /**
+     * Check if the value is a float >= 1
+     * @param value
+     * @return true if the value is a float >= 1
+     */
+    private boolean isValidAttrValue(String value) {
+        final float parseFloat;
+        try {
+            parseFloat = Float.parseFloat(value);
+        } catch (NumberFormatException e) {
+            return false;
+        }
+        return parseFloat >= 1;
+    }
+
     public String getHtmlWidth() {
         return htmlWidth;
     }

cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java

@@ -272,6 +272,20 @@ public void testVariousOptions() {
         assertEquals(DEFAULT_UPLOAD_PATH + "g_center,p_a,q_0.4,r_3,x_1,y_2/test", result);
     }
 
+    @Test
+    public void testQuality() {
+        // should use x, y, radius, prefix, gravity and quality from options
+        Transformation transformation = new Transformation().quality(0.4);
+        String result = cloudinary.url().transformation(transformation).generate("test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "q_0.4/test", result);
+        transformation = new Transformation().quality("auto");
+        result = cloudinary.url().transformation(transformation).generate("test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "q_auto/test", result);
+        transformation = new Transformation().quality("auto:good");
+        result = cloudinary.url().transformation(transformation).generate("test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "q_auto:good/test", result);
+    }
+
     @Test
     public void testTransformationSimple() {
         // should support named transformation
@@ -576,6 +590,28 @@ public void testResponsiveWidth() {
         assertEquals(DEFAULT_UPLOAD_PATH + "c_crop,h_100,w_100/c_pad,w_auto/test", result);
         Transformation.setResponsiveWidthTransformation(null);
     }
+    @Test
+    public void testShouldSupportAutoWidth(){
+        String trans;
+
+    trans = new Transformation().width("auto:20").crop("fill").generate();
+    assertEquals("c_fill,w_auto:20", trans);
+    trans = new Transformation().width("auto:20:350").crop("fill").generate();
+    assertEquals("c_fill,w_auto:20:350", trans);
+    trans = new Transformation().width("auto:breakpoints").crop("fill").generate();
+    assertEquals("c_fill,w_auto:breakpoints", trans);
+    trans = new Transformation().width("auto:breakpoints_100_1900_20_15").crop("fill").generate();
+    assertEquals("c_fill,w_auto:breakpoints_100_1900_20_15", trans);
+    trans = new Transformation().width("auto:breakpoints:json").crop("fill").generate();
+    assertEquals("c_fill,w_auto:breakpoints:json", trans);
+    }
+
+
+    @Test
+    public void testShouldSupportOhOw(){
+        String trans = new Transformation().width("ow").height("oh").crop("crop").generate();
+        assertEquals("c_crop,h_oh,w_ow", trans);
+    }
 
     @Test
     public void testVideoCodec() {