Refactoring regex MockUnitString

Author: nomemory

Diff for: src/main/java/net/andreinc/mockneat/MockNeat.java

@@ -33,7 +33,7 @@
 import net.andreinc.mockneat.unit.objects.Factory;
 import net.andreinc.mockneat.unit.objects.Probabilities;
 import net.andreinc.mockneat.unit.objects.Reflect;
-import net.andreinc.mockneat.unit.regex.FromRegex;
+import net.andreinc.mockneat.unit.regex.Regex;
 import net.andreinc.mockneat.unit.seq.IntSeq;
 import net.andreinc.mockneat.unit.seq.LongSeq;
 import net.andreinc.mockneat.unit.text.*;
@@ -214,6 +214,8 @@ public <T, FT> Factory<T, FT> factory(Class<T> targetCls, Class<FT> factoryCls)
 
     public Passwords passwords() { return this.rPasswords; }
 
+    public Regex regex(String regex) { return new Regex(regex); }
+
     public <T> Probabilities<T> probabilites(Class<T> cls) { return new Probabilities<T>(this, cls); }
 
     public <T> Reflect<T> reflect(Class<T> cls) { return new Reflect<>(cls);}
@@ -232,8 +234,6 @@ public java.util.Random getRandom() {
         return random;
     }
 
-    public FromRegex fromRegex(String regex) { return new FromRegex(regex); }
-
     public <T> MockUnit<T> from(List<T> alphabet) {
         notEmpty(alphabet, ValidationUtils.INPUT_PARAMETER_NOT_NULL_OR_EMPTY, "alphabet");
         Supplier<T> supp = () -> {

Diff for: src/main/java/net/andreinc/mockneat/unit/regex/FromRegex.java renamed to src/main/java/net/andreinc/mockneat/unit/regex/Regex.java

@@ -9,14 +9,12 @@
 import static net.andreinc.mockneat.utils.ValidationUtils.validRegex;
 import static org.apache.commons.lang3.Validate.notNull;
 
-/**
- * Created by andreinicolinciobanu on 25/03/17.
- */
-public class FromRegex implements MockUnitString {
+//TODO add documentation
+public class Regex implements MockUnitString {
 
     private String regex;
 
-    public FromRegex(String regex) {
+    public Regex(String regex) {
         this.regex = regex;
     }
 

Diff for: src/test/java/net/andreinc/mockneat/Constants.java

@@ -26,6 +26,7 @@ public class Constants {
     public static final int EMAILS_CYCLES = 1000;
     public static final int FILES_CYCLES = 1000;
     public static final int FLOATS_CYCLES = 1000;
+    public static final int REGEX_CYLCES = 1000;
     public static final int FMT_CYCLES = 1000;
     public static final int GENDERS_CYCLES = 1000;
     public static final int IBANS_CYCLES = 1000;

Diff for: src/test/java/net/andreinc/mockneat/unit/regex/FromRegex.java

@@ -0,0 +1,29 @@
+package net.andreinc.mockneat.unit.regex;
+
+import org.junit.Test;
+
+import static net.andreinc.mockneat.Constants.*;
+import static net.andreinc.mockneat.utils.LoopsUtils.loop;
+
+public class RegexTest {
+
+    @Test(expected = NullPointerException.class)
+    public void testNulLRegex() throws Exception {
+        M.regex(null).val();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidRegex() throws Exception {
+        M.regex("1{").val();
+    }
+
+    @Test
+    public void testFromRegex() throws Exception {
+        loop(
+                REGEX_CYLCES,
+                MOCKS,
+                m -> m.regex("[0-3]([a-c]|[e-g]{1,2})").val(),
+                r -> r.matches("[0-3]([a-c]|[e-g]{1,2})")
+        );
+    }
+}