Merge pull request #165 from mperry/partition-validation

mperry · mperry · commit a51c87469fdf · 2015-07-03T21:11:07.000+10:00
Implemented Validation.partition and arbitrary validations
diff --git a/core/src/main/java/fj/data/Validation.java b/core/src/main/java/fj/data/Validation.java
@@ -1287,6 +1287,16 @@ public Validation<NumberFormatException, Short> f(final String s) {
     }
   };
 
+  /**
+   * Partitions the list into the list of fails and the list of successes
+   */
+  public static <A, B> P2<List<A>, List<B>> partition(List<Validation<A, B>> list) {
+    return P.p(
+            list.filter(v -> v.isFail()).map(v -> v.fail()),
+            list.filter(v -> v.isSuccess()).map(v -> v.success())
+    );
+  }
+
     @Override
     public String toString() {
         return Show.validationShow(Show.<E>anyShow(), Show.<T>anyShow()).showS(this);
diff --git a/props-core/src/test/java/fj/data/properties/ValidationProperties.java b/props-core/src/test/java/fj/data/properties/ValidationProperties.java
@@ -0,0 +1,33 @@
+package fj.data.properties;
+
+import fj.P2;
+import fj.data.List;
+import fj.data.Validation;
+import fj.test.Arbitrary;
+import fj.test.Property;
+import fj.test.reflect.CheckParams;
+import fj.test.runner.PropertyTestRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static fj.test.Arbitrary.*;
+
+/**
+ * Created by MarkPerry on 3/07/2015.
+ */
+@RunWith(PropertyTestRunner.class)
+public class ValidationProperties {
+
+    public Property partition() {
+        Arbitrary<List<Validation<String, Integer>>> al = arbList(arbValidation(arbUSASCIIString, arbInteger));
+        return Property.property(al, list -> {
+            P2<List<String>, List<Integer>> p = Validation.partition(list);
+            boolean b1 = p._1().length() + p._2().length() == list.length();
+            boolean b2 = p._1().map(s -> Validation.<String, Integer>fail(s)).equals(list.filter(v -> v.isFail()));
+            boolean b3 = p._2().map(s -> Validation.<String, Integer>success(s)).equals(list.filter(v -> v.isSuccess()));
+            return Property.prop(b1 && b2 && b3);
+        });
+    }
+
+}
diff --git a/quickcheck/src/main/java/fj/test/Arbitrary.java b/quickcheck/src/main/java/fj/test/Arbitrary.java
@@ -737,6 +737,13 @@ public static <A> Arbitrary<NonEmptyList<A>> arbNonEmptyList(final Arbitrary<A>
     return arbitrary(Gen.listOf1(aa.gen).map(list -> NonEmptyList.fromList(list).some()));
   }
 
+    /**
+     * Returns an arbitrary Validation for the given arbitrary parameters.
+     */
+    public static <A, B> Arbitrary<Validation<A, B>> arbValidation(final Arbitrary<A> aa, final Arbitrary<B> ab) {
+        return arbitrary(arbBoolean.gen.bind(bool -> bool ? ab.gen.map(b -> Validation.<A, B>success(b)) : aa.gen.map(a -> Validation.<A, B>fail(a))));
+    }
+
   /**
    * Returns an arbitrary implementation for streams.
    *

Original file line number	Diff line number	Diff line change
`@@ -737,6 +737,13 @@ public static <A> Arbitrary<NonEmptyList<A>> arbNonEmptyList(final Arbitrary<A>`
`737`	`737`	`return arbitrary(Gen.listOf1(aa.gen).map(list -> NonEmptyList.fromList(list).some()));`
`738`	`738`	`}`
`739`	`739`
	`740`	`+ /**`
	`741`	`+ * Returns an arbitrary Validation for the given arbitrary parameters.`
	`742`	`+ */`
	`743`	`+ public static <A, B> Arbitrary<Validation<A, B>> arbValidation(final Arbitrary<A> aa, final Arbitrary<B> ab) {`
	`744`	`+ return arbitrary(arbBoolean.gen.bind(bool -> bool ? ab.gen.map(b -> Validation.<A, B>success(b)) : aa.gen.map(a -> Validation.<A, B>fail(a))));`
	`745`	`+ }`
	`746`	`+`
`740`	`747`	`/**`
`741`	`748`	`* Returns an arbitrary implementation for streams.`
`742`	`749`	`*`