randomDecimal helper now accepts integer and string bounds in addition to decimal

Author: Tom Akehurst

src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/HelperUtils.java

@@ -3,6 +3,10 @@
 public class HelperUtils {
 
     public static Integer coerceToInt(Object value) {
+        if (value == null) {
+            return null;
+        }
+
         if (Number.class.isAssignableFrom(value.getClass())) {
             return ((Number) value).intValue();
         }
@@ -13,4 +17,20 @@ public static Integer coerceToInt(Object value) {
 
         return null;
     }
+
+    public static Double coerceToDouble(Object value) {
+        if (value == null) {
+            return null;
+        }
+
+        if (Number.class.isAssignableFrom(value.getClass())) {
+            return ((Number) value).doubleValue();
+        }
+
+        if (CharSequence.class.isAssignableFrom(value.getClass())) {
+            return Double.parseDouble(value.toString());
+        }
+
+        return null;
+    }
 }

src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/RandomDecimalHelper.java

@@ -21,14 +21,15 @@
 import java.math.BigDecimal;
 import java.util.concurrent.ThreadLocalRandom;
 
+import static com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HelperUtils.coerceToDouble;
 import static java.math.BigDecimal.ROUND_HALF_UP;
 
 public class RandomDecimalHelper extends HandlebarsHelper<Void> {
 
     @Override
     public Object apply(Void context, Options options) throws IOException {
-        double lowerBound = options.hash("lower", Double.MIN_VALUE);
-        double upperBound = options.hash("upper", Double.MAX_VALUE);
+        double lowerBound = coerceToDouble(options.hash("lower", Double.MIN_VALUE));
+        double upperBound = coerceToDouble(options.hash("upper", Double.MAX_VALUE));
 
         return ThreadLocalRandom.current().nextDouble(lowerBound, upperBound);
     }

src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/ResponseTemplateTransformerTest.java

@@ -918,8 +918,13 @@ public void generatesARandomInt() {
     public void generatesARandomDecimal() {
         assertThat(transform("{{randomDecimal}}"), matchesPattern("[\\-0-9\\.E]+"));
         assertThat(transformToDouble("{{randomDecimal lower=-10.1 upper=-0.9}}"), allOf(greaterThanOrEqualTo(-10.1), lessThanOrEqualTo(-0.9)));
+        assertThat(transformToDouble("{{randomDecimal lower='-10.1' upper='-0.9'}}"), allOf(greaterThanOrEqualTo(-10.1), lessThanOrEqualTo(-0.9)));
         assertThat(transformToDouble("{{randomDecimal upper=12.5}}"), lessThanOrEqualTo(12.5));
         assertThat(transformToDouble("{{randomDecimal lower=-24.01}}"), greaterThanOrEqualTo(-24.01));
+        assertThat(transformToDouble("{{randomDecimal lower=-1 upper=1}}"), Matchers.allOf(
+                greaterThanOrEqualTo(-1.0),
+                lessThanOrEqualTo(1.0)
+        ));
     }
 
     @Test