4223969 · streamly · git.iko.soy

git.iko.soy/streamly

Allow QuickCheck version to be >= 2.13

commit4223969ab5e20d2f8c20b9403032b9eb56951cbb authoradithyaov <adi.obilisetty@gmail.com> dateTue 13 Oct 2020, 20:05 (6 years ago) parent875e48f

3 files changed+47−14

compare with master

unifiedsplit

streamly.cabal+14−12 test/Streamly/Test/Internal/Data/Parser.hs+17−1 test/Streamly/Test/Internal/Data/Parser/ParserD.hs+16−1

streamly.cabal+14−12

@@ -330,7 +330,7 @@ common prelude-test-options

330330 build-depends:

331331 streamly

332332 , base >= 4.9 && < 5

333− , QuickCheck >= 2.14 && < 2.15

333+ , QuickCheck >= 2.13 && < 2.15

334334 , hspec >= 2.0 && < 3

335335 , exceptions >= 0.8 && < 0.11

336336 default-language: Haskell2010

@@ -555,7 +555,7 @@ test-suite internal-prelude-test

555555 build-depends:

556556 streamly

557557 , base >= 4.9 && < 5

558− , QuickCheck >= 2.14 && < 2.15

558+ , QuickCheck >= 2.13 && < 2.15

559559 , hspec >= 2.0 && < 3

560560 default-language: Haskell2010

561561

@@ -683,7 +683,7 @@ test-suite array-test

683683 build-depends:

684684 streamly

685685 , base >= 4.9 && < 5

686− , QuickCheck >= 2.14 && < 2.15

686+ , QuickCheck >= 2.13 && < 2.15

687687 , hspec >= 2.0 && < 3

688688 default-language: Haskell2010

689689

@@ -697,7 +697,7 @@ test-suite internal-data-fold-test

697697 streamly

698698 , base >= 4.9 && < 5

699699 , hspec >= 2.0 && < 3

700− , QuickCheck >= 2.14 && < 2.15

700+ , QuickCheck >= 2.13 && < 2.15

701701 default-language: Haskell2010

702702

703703test-suite Data.Unfold

@@ -710,7 +710,7 @@ test-suite Data.Unfold

710710 streamly

711711 , base >= 4.8 && < 5

712712 , hspec >= 2.0 && < 3

713− , QuickCheck >= 2.10 && < 2.15

713+ , QuickCheck >= 2.13 && < 2.15

714714 , transformers >= 0.4 && < 0.6

715715 default-language: Haskell2010

716716

@@ -725,8 +725,9 @@ test-suite internal-data-parser-test

725725 streamly

726726 , base >= 4.9 && < 5

727727 , hspec >= 2.0 && < 3

728− , QuickCheck >= 2.14 && < 2.15

728+ , QuickCheck >= 2.13 && < 2.15

729729 , transformers >= 0.4 && < 0.6

730+ , random >= 1.0.0 && < 2

730731 default-language: Haskell2010

731732

732733test-suite internal-data-parser-parserd-test

@@ -739,8 +740,9 @@ test-suite internal-data-parser-parserd-test

739740 streamly

740741 , base >= 4.9 && < 5

741742 , hspec >= 2.0 && < 3

742− , QuickCheck >= 2.14 && < 2.15

743+ , QuickCheck >= 2.13 && < 2.15

743744 , transformers >= 0.4 && < 0.6

745+ , random >= 1.0.0 && < 2

744746 default-language: Haskell2010

745747

746748test-suite data-array-test

@@ -752,7 +754,7 @@ test-suite data-array-test

752754 build-depends:

753755 streamly

754756 , base >= 4.9 && < 5

755− , QuickCheck >= 2.14 && < 2.15

757+ , QuickCheck >= 2.13 && < 2.15

756758 , hspec >= 2.0 && < 3

757759 default-language: Haskell2010

758760

@@ -766,7 +768,7 @@ test-suite smallarray-test

766768 build-depends:

767769 streamly

768770 , base >= 4.9 && < 5

769− , QuickCheck >= 2.14 && < 2.15

771+ , QuickCheck >= 2.13 && < 2.15

770772 , hspec >= 2.0 && < 3

771773 default-language: Haskell2010

772774

@@ -780,7 +782,7 @@ test-suite primarray-test

780782 build-depends:

781783 streamly

782784 , base >= 4.9 && < 5

783− , QuickCheck >= 2.14 && < 2.15

785+ , QuickCheck >= 2.13 && < 2.15

784786 , hspec >= 2.0 && < 3

785787 default-language: Haskell2010

786788

@@ -794,7 +796,7 @@ test-suite prim-pinned-array-test

794796 build-depends:

795797 streamly

796798 , base >= 4.9 && < 5

797− , QuickCheck >= 2.14 && < 2.15

799+ , QuickCheck >= 2.13 && < 2.15

798800 , hspec >= 2.0 && < 3

799801 default-language: Haskell2010

800802

@@ -807,7 +809,7 @@ test-suite string-test

807809 build-depends:

808810 streamly

809811 , base >= 4.9 && < 5

810− , QuickCheck >= 2.14 && < 2.15

812+ , QuickCheck >= 2.13 && < 2.15

811813 , hspec >= 2.0 && < 3

812814 default-language: Haskell2010

813815

test/Streamly/Test/Internal/Data/Parser.hs+17−1

@@ -9,7 +9,7 @@ import Test.Hspec (Spec, hspec, describe)

99import Test.Hspec.QuickCheck

1010import Test.QuickCheck

1111 (arbitrary, forAll, choose, elements, Property, property, listOf,

12− vectorOf, counterexample, Gen, chooseAny)

12+ vectorOf, counterexample, Gen)

1313import Test.QuickCheck.Monadic (monadicIO, PropertyM, assert, monitor, run)

1414

1515import Prelude hiding (sequence)

@@ -21,6 +21,22 @@ import qualified Streamly.Internal.Data.Array.Storable.Foreign as A

2121import qualified Test.Hspec as H

2222import qualified Prelude

2323

24+#if MIN_VERSION_QuickCheck(2,14,0)

25+

26+import Test.QuickCheck (chooseAny)

27+

28+#else

29+

30+import System.Random (Random(random))

31+import Test.QuickCheck.Gen (Gen(MkGen))

32+

33+-- | Generates a random element over the natural range of `a`.

34+chooseAny :: Random a => Gen a

35+chooseAny = MkGen (\r _ -> let (x,_) = random r in x)

36+

37+#endif

38+

39+

2440maxTestCount :: Int

2541maxTestCount = 100

2642

test/Streamly/Test/Internal/Data/Parser/ParserD.hs+16−1

@@ -8,7 +8,7 @@ import Data.Word (Word8, Word32, Word64)

88import Test.Hspec (Spec, hspec, describe)

99import Test.Hspec.QuickCheck

1010import Test.QuickCheck

11− (arbitrary, forAll, choose, chooseAny, elements, Property,

11+ (arbitrary, forAll, choose, elements, Property,

1212 property, listOf, vectorOf, counterexample, (.&&.), Gen)

1313import Test.QuickCheck.Monadic

1414 (monadicIO, PropertyM, assert, monitor, run)

@@ -22,6 +22,21 @@ import qualified Test.Hspec as H

2222

2323import Prelude hiding (sequence)

2424

25+#if MIN_VERSION_QuickCheck(2,14,0)

26+

27+import Test.QuickCheck (chooseAny)

28+

29+#else

30+

31+import System.Random (Random(random))

32+import Test.QuickCheck.Gen (Gen(MkGen))

33+

34+-- | Generates a random element over the natural range of `a`.

35+chooseAny :: Random a => Gen a

36+chooseAny = MkGen (\r _ -> let (x,_) = random r in x)

37+

38+#endif

39+

2540maxTestCount :: Int

2641maxTestCount = 100

2742