Trying to use Generex as proposed in Issue mtedone#218 to fill an email

daivanov · Oct 30, 2016 · 21335eb · 21335eb
1 parent 946ba4f
commit 21335eb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -428,6 +428,11 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.4</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.mifmif</groupId>
+			<artifactId>generex</artifactId>
+			<version>1.0.1</version>
+		</dependency>
 
 		<!-- Testing dependencies -->
 		<dependency>

diff --git a/src/main/java/uk/co/jemos/podam/common/BeanValidationStrategy.java b/src/main/java/uk/co/jemos/podam/common/BeanValidationStrategy.java
@@ -6,6 +6,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import com.mifmif.common.regex.Generex;
+
 import uk.co.jemos.podam.api.PodamUtils;
 import uk.co.jemos.podam.exceptions.PodamMockeryException;
 
@@ -177,9 +180,8 @@ public Object getValue() throws PodamMockeryException {
 		if (null != (minAnno = findTypeFromList(annotations, Pattern.class))) {
 
 			Pattern pattern = (Pattern) minAnno;
-			LOG.warn("At the moment PODAM doesn't support @Pattern({}),"
-					+ " returning null", pattern.regexp());
-			return null;
+			Generex generex = new Generex(pattern.regexp());
+			return generex.random();
 
 		}
 

diff --git a/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojo.java b/src/test/java/uk/co/jemos/podam/test/dto/ValidatedPojo.java
@@ -103,7 +103,7 @@ public class ValidatedPojo {
 	@Size(min = 2)
 	private Collection<String> minCollection;
 
-	@Pattern(regexp = "^[a-zA-Z0-9_]*$")
+	@Pattern(regexp = "[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}")
 	private String identifier;
 
 	@Email

diff --git a/src/test/java/uk/co/jemos/podam/test/unit/features/validatorFramework/ValidatedPojoTest.java b/src/test/java/uk/co/jemos/podam/test/unit/features/validatorFramework/ValidatedPojoTest.java
@@ -25,8 +25,14 @@ public void podamShouldFulfillMostOfTheJavaxValidationFramework() throws Excepti
 
 		PodamFactory podamFactory = podamFactorySteps.givenAPodamFactoryWithEmailStrategy();
 
-		ValidatedPojo pojo = podamInvocationSteps.whenIInvokeTheFactoryForClass(ValidatedPojo.class, podamFactory);
-		podamValidationSteps.theObjectShouldNotBeNull(pojo);
+		Object obj = podamInvocationSteps.whenIInvokeTheFactoryForClass(ValidatedPojo.class, podamFactory);
+		podamValidationSteps.theObjectShouldNotBeNull(obj);
+		podamValidationSteps.thePojoMustBeOfTheType(obj, ValidatedPojo.class);
+
+		ValidatedPojo pojo = (ValidatedPojo)obj;
+
+		podamValidationSteps.theStringMatchesAPattern(pojo.getIdentifier(), "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$");
+
 		podamValidationSteps.theObjectShouldNotBeNull(pojo.getBoolFalse());
 		podamValidationSteps.theObjectShouldNotBeNull(pojo.getBoolTrue());
 		podamValidationSteps.theStringFieldCannotBeNullOrEmpty(pojo.getFilledString());
@@ -49,7 +55,7 @@ public void podamShouldFulfillMostOfTheJavaxValidationFramework() throws Excepti
 		podamValidationSteps.theObjectShouldNotBeNull(pojo.getMaxCollection());
 		podamValidationSteps.theObjectShouldNotBeNull(pojo.getMinCollection());
 		podamValidationSteps.theObjectShouldNotBeNull(pojo.getEmail());
-		podamValidationSteps.theObjectShouldBeNull(pojo.getIdentifier());
+		podamValidationSteps.theObjectShouldNotBeNull(pojo.getIdentifier());
 
 		Validator validator = podamFactorySteps.givenAJavaxValidator();
 		validatorSteps.thePojoShouldNotViolateAnyValidationsOnValidatedPojo(validator, pojo);