Implement all combinators in terms of toGenT / fromGenT

hedgehogqa · Apr 28, 2019 · d0d2f60 · d0d2f60
1 parent e945326
commit d0d2f60
Show file tree

Hide file tree

Showing 7 changed files with 141 additions and 361 deletions.
diff --git a/hedgehog-example/src/Test/Example/List.hs b/hedgehog-example/src/Test/Example/List.hs
@@ -49,8 +49,8 @@ prop_list =
         fmap show .
         fmap (\xs -> (cond xs, xs))
 
-    ts <- forAllWith renderTree (Gen.tree $ genList genInt)
-    xs0 <- forAll (Gen.liftTree ts)
+    ts <- forAllWith renderTree (Gen.toTree $ genList genInt)
+    xs0 <- forAll (Gen.fromTree ts)
 
     assert (cond xs0)
 
@@ -79,8 +79,8 @@ prop_state_list =
         fmap show .
         fmap (\xs -> (cond xs, xs))
 
-    ts <- forAllWith renderTree (Gen.tree $ hoist (`Lazy.evalStateT` 0) $ genList genStateInt)
-    xs0 <- forAll (Gen.liftTree ts)
+    ts <- forAllWith renderTree (Gen.toTree $ hoist (`Lazy.evalStateT` 0) $ genList genStateInt)
+    xs0 <- forAll (Gen.fromTree ts)
 
     assert (cond xs0)
 
@@ -121,8 +121,8 @@ prop_writer_list =
         Tree.render .
         fmap (\(ns, ws) -> show (cond ns, ns) ++ " (" ++ renderLog ws ++ ")")
 
-    ts <- forAllWith renderTree (Gen.tree . Lazy.runWriterT $ genWriterList genWriterInt)
-    (xs0, _) <- forAll (Gen.liftTree ts)
+    ts <- forAllWith renderTree (Gen.toTree . Lazy.runWriterT $ genWriterList genWriterInt)
+    (xs0, _) <- forAll (Gen.fromTree ts)
 
     assert (cond xs0)
 

diff --git a/hedgehog-quickcheck/src/Hedgehog/Gen/QuickCheck.hs b/hedgehog-quickcheck/src/Hedgehog/Gen/QuickCheck.hs
@@ -16,7 +16,7 @@ import qualified Test.QuickCheck.Random as QuickCheck
 
 seedQCGen :: MonadGen m => m QuickCheck.QCGen
 seedQCGen =
-  QuickCheck.mkQCGen <$> Gen.lift (Gen.integral_ Range.constantBounded)
+  QuickCheck.mkQCGen <$> fromGenT (Gen.integral_ Range.constantBounded)
 
 -- | Create a Hedgehog 'Gen' from a QuickCheck 'QuickCheck.Gen'.
 --

diff --git a/hedgehog/src/Hedgehog.hs b/hedgehog/src/Hedgehog.hs
@@ -56,8 +56,6 @@ module Hedgehog (
 
   , forAll
   , forAllWith
-  , classify
-  , cover
   , discard
 
   , check
@@ -112,6 +110,8 @@ module Hedgehog (
   , evalExceptT
 
   -- * Coverage
+  , classify
+  , cover
   , label
   , collect
 

diff --git a/hedgehog/src/Hedgehog/Gen.hs b/hedgehog/src/Hedgehog/Gen.hs
@@ -1,9 +1,6 @@
 module Hedgehog.Gen (
-  -- * Combinators
-    lift
-
   -- ** Shrinking
-  , shrink
+    shrink
   , prune
 
   -- ** Size