Curry pair and triple fuzzers.

elm-explorations · Oct 22, 2020 · 387aa2d · 387aa2d
1 parent 06401ce
commit 387aa2d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/src/Fuzz.elm b/src/Fuzz.elm
@@ -493,17 +493,17 @@ array fuzzer =
     map Array.fromList (list fuzzer)
 
 
-{-| Turn a pair of fuzzers into a fuzzer of pairs.
+{-| Create a fuzzer of pairs from two fuzzers.
 -}
-pair : ( Fuzzer a, Fuzzer b ) -> Fuzzer ( a, b )
-pair ( fuzzerA, fuzzerB ) =
+pair : Fuzzer a -> Fuzzer b -> Fuzzer ( a, b )
+pair fuzzerA fuzzerB =
     map2 (\a b -> ( a, b )) fuzzerA fuzzerB
 
 
-{-| Turn a triple of fuzzers into a fuzzer of triples.
+{-| Create a fuzzer of triples from three fuzzers.
 -}
-triple : ( Fuzzer a, Fuzzer b, Fuzzer c ) -> Fuzzer ( a, b, c )
-triple ( fuzzerA, fuzzerB, fuzzerC ) =
+triple : Fuzzer a -> Fuzzer b -> Fuzzer c -> Fuzzer ( a, b, c )
+triple fuzzerA fuzzerB fuzzerC =
     map3 (\a b c -> ( a, b, c )) fuzzerA fuzzerB fuzzerC
 
 

diff --git a/src/Test.elm b/src/Test.elm
@@ -294,7 +294,7 @@ for example like this:
 
 
     fuzzWith { runs = 4200 }
-        (pair ( list int, int ))
+        (pair (list int) int)
         "List.reverse never influences List.member" <|
             \(nums, target) ->
                 List.member target (List.reverse nums)
@@ -399,7 +399,7 @@ fuzz2 :
 fuzz2 fuzzA fuzzB desc =
     let
         fuzzer =
-            Fuzz.pair ( fuzzA, fuzzB )
+            Fuzz.pair fuzzA fuzzB
     in
     (\f ( a, b ) -> f a b) >> fuzz fuzzer desc
 
@@ -419,7 +419,7 @@ fuzz3 :
 fuzz3 fuzzA fuzzB fuzzC desc =
     let
         fuzzer =
-            Fuzz.triple ( fuzzA, fuzzB, fuzzC )
+            Fuzz.triple fuzzA fuzzB fuzzC
     in
     uncurry3 >> fuzz fuzzer desc
 

diff --git a/tests/src/FloatWithinTests.elm b/tests/src/FloatWithinTests.elm
@@ -129,7 +129,7 @@ floatWithinTests =
                             a |> Expect.notWithin (Absolute (abs epsilon)) b
                     in
                     different withinTest notWithinTest
-            , fuzz2 (pair ( float, float )) (pair ( float, float )) "within and notWithin should never agree on absolute or relative tolerance" <|
+            , fuzz2 (pair float float) (pair float float) "within and notWithin should never agree on absolute or relative tolerance" <|
                 \( absoluteEpsilon, relativeEpsilon ) ( a, b ) ->
                     let
                         withinTest =

diff --git a/tests/src/FuzzerTests.elm b/tests/src/FuzzerTests.elm
@@ -43,19 +43,15 @@ fuzzerTests =
 
                         aFuzzer =
                             triple
-                                ( pair ( list int, array float )
-                                , pair
-                                    ( maybe bool
-                                    , result unit char
-                                    )
-                                , pair
-                                    ( triple
-                                        ( percentage
-                                        , map2 (+) int int
-                                        , frequency [ ( 1, constant True ), ( 3, constant False ) ]
-                                        )
-                                    , triple ( intRange 0 100, floatRange -51 pi, map abs int )
+                                (pair (list int) (array float))
+                                (pair (maybe bool) (result unit char))
+                                (pair
+                                    (triple
+                                        percentage
+                                        (map2 (+) int int)
+                                        (frequency [ ( 1, constant True ), ( 3, constant False ) ])
                                     )
+                                    (triple (intRange 0 100) (floatRange -51 pi) (map abs int))
                                 )
                                 |> Test.Runner.fuzz