Merge pull request #278 from bakeemawaytoys/Natural_Gen_Shrink

mperry · web-flow · commit 34534a8be8b1 · 2016-06-16T15:01:42.000+10:00
Switched the the Gen and Shrink implementations for Natural to use Bi…
diff --git a/quickcheck/src/main/java/fj/test/Arbitrary.java b/quickcheck/src/main/java/fj/test/Arbitrary.java
@@ -475,12 +475,6 @@ public Gen<Short> f(final Integer i) {
     }
   });
 
-  /**
-   * An arbitrary implementation for naturals.
-   */
-  public static final Gen<Natural> arbNatural = arbLong.filter(not(longEqual.eq(Long.MIN_VALUE)))
-      .map(Longs.abs).map(Natural::natural).map(o -> o.some());
-
   /**
    * An arbitrary implementation for character values.
    */
@@ -1179,6 +1173,11 @@ public static <A> Gen<SynchronousQueue<A>> arbSynchronousQueue(final Gen<A> aa)
 
   // END java.math
 
+  /**
+   * An arbitrary implementation for naturals.
+   */
+  public static final Gen<Natural> arbNatural = arbBigInteger.map(BigInteger::abs).map(Natural::natural).map(o -> o.some());
+
   /**
    * An arbitrary implementation for locales.
    */
diff --git a/quickcheck/src/main/java/fj/test/Shrink.java b/quickcheck/src/main/java/fj/test/Shrink.java
@@ -184,10 +184,6 @@ public static <A> Shrink<A> empty() {
    */
   public static final Shrink<Double> shrinkDouble = shrinkLong.map(Long_Double, Double_Long);
 
-  /**
-   * A shrink strategy for naturals.
-   */
-  public static final Shrink<Natural> shrinkNatural = shrinkLong.map(l -> Natural.natural(l).orSome(Natural.ZERO), Natural::longValue);
 
   /**
    * Returns a shrink strategy for optional values. A 'no value' is already fully
@@ -701,6 +697,12 @@ public static <A> Shrink<SynchronousQueue<A>> shrinkSynchronousQueue(final Shrin
 
   // END java.math
 
+  /**
+   * A shrink strategy for naturals.
+   */
+  public static final Shrink<Natural> shrinkNatural = shrinkBigInteger.map(l -> Natural.natural(l).orSome(Natural.ZERO), Natural::bigIntegerValue);
+
+
   /**
    * Returns a shrinking strategy for product-1 values.
    *
