Merge pull request #1685 from Ro4052/fix/playground-demo

Fix playground demo bug (#1646)

core/src/main/java/com/scottlogic/datahelix/generator/core/generation/string/generators/FakerGenerator.java

@@ -20,6 +20,7 @@
 import com.scottlogic.datahelix.generator.common.RandomNumberGenerator;
 import com.scottlogic.datahelix.generator.common.util.OrderedRandom;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.stream.Stream;
 
 public class FakerGenerator implements StringGenerator {
@@ -71,6 +72,30 @@ public Stream<String> generateRandomValues(RandomNumberGenerator randomNumberGen
     }
 
     private String getFakerValue(Faker faker) {
-        return faker.expression("#{" + this.fakerSpec + "}");
+        try {
+            return faker.expression("#{" + this.fakerSpec + "}");
+        } catch (Exception e) {
+            return getFakerValueWorkaround(faker);
+        }
+    }
+
+    /*
+     *  This method is a temporary workaround for the issue highlighted here:
+     *  https://github.com/DiUS/java-faker/issues/474
+     * 
+     *  Once the underlying issue has been fixed, this method can be removed.
+     */
+    private String getFakerValueWorkaround(Faker faker) {
+        String elements[] = this.fakerSpec.split("\\.");
+        Object obj = faker;
+        for (String element : elements) {
+            try {
+                obj = obj.getClass().getMethod(element).invoke(obj);
+            } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return (String) obj;
     }
 }

core/src/test/java/com/scottlogic/datahelix/generator/core/generation/string/generators/FakerGeneratorTest.java

@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -74,4 +75,21 @@ void generateRandomValuesRestrictedMax() {
 
         assertTrue(results.allMatch(str -> str.length() <= length));
     }
+
+    @Test
+    void generateWithCompositeExpression() {
+        String jobTitleRegex = "^[A-Za-z]+ [A-Za-z]+$";
+        StringRestrictions restrictions = StringRestrictionsFactory.forStringMatching(
+            Pattern.compile(jobTitleRegex), false
+        );
+        RegexStringGenerator regex = (RegexStringGenerator) restrictions.createGenerator();
+        FakerGenerator generator = new FakerGenerator(regex, "job.title");
+
+        final int size = 10;
+
+        Stream<String> results = generator.generateRandomValues(new JavaUtilRandomNumberGenerator())
+            .limit(size);
+
+        assertTrue(results.allMatch(str -> str.matches(jobTitleRegex)));
+    }
 }

gradle.properties

@@ -39,4 +39,4 @@ CUCUMBER_VERSION=4.0.0
 CUCUMBER_EXPRESSIONS_VERSION=6.0.1
 CUCUMBER_PICOCONTAINER_VERSION=1.2.5
 
-FAKER_VERSION=1.0.1
+FAKER_VERSION=1.0.2