tdd-util 0.2.0.1 → 0.2.0.2

raw patch · 2 files changed

+43/−6 lines, 2 filesdep ~QuickCheck

Dependency ranges changed: QuickCheck

Files

• src/Test/Util/Framework.hs +16/−0
• tdd-util.cabal +27/−6

@@ -1,3 +1,5 @@+{-# LANGUAGE CPP #-}+ -- | "Test.Util.Framework" is a super-module that re-exports other modules -- pertaining to TDD, so that they can be imported under a single module. --@@ -18,6 +20,12 @@ -- -- Unfortunately, Haskell's design makes it inconvenient to rename classes. -- In this module, 'Testable' is not re-exported from any module.+--+-- QuickCheck-2.6's new "Test.QuickCheck.Test.interrupted" is not exported+-- under a name that does not conflict with+-- "Test.QuickCheck.Property.interrupted", from either modules+-- ("Test.QuickCheck.Test" and "Test.QuickCheck"), since its existence would depend on+-- the version of QuickCheck. module Test.Util.Framework     ( module Test.HUnit     , module Test.QuickCheck@@ -47,7 +55,11 @@ import           System.Random (StdGen) import           Test.HUnit hiding (Test, Testable, assert, State, test) import qualified Test.HUnit+#ifdef QUICKCHECK26+import           Test.QuickCheck hiding (Testable, interrupted)+#else import           Test.QuickCheck hiding (Testable)+#endif /* #ifdef QUICKCHECK26 */ import           Test.QuickCheck.All import           Test.QuickCheck.Arbitrary import           Test.QuickCheck.Function@@ -60,7 +72,11 @@ import qualified Test.QuickCheck.Property import           Test.QuickCheck.State hiding (State) import qualified Test.QuickCheck.State+#ifdef QUICKCHECK26+import           Test.QuickCheck.Test hiding (test, interrupted)+#else import           Test.QuickCheck.Test hiding (test)+#endif /* #ifdef QUICKCHECK26 */ import qualified Test.QuickCheck.Test import           Test.QuickCheck.Text import           Test.Framework hiding (Test)

@@ -1,5 +1,5 @@ name:                  tdd-util-version:               0.2.0.1+version:               0.2.0.2 cabal-version:         >= 1.10 build-type:            Simple license:               BSD3@@ -233,6 +233,13 @@ category:              Testing tested-with:           GHC == 7.6.1 +flag QuickCheck26+  default: True+  manual: False+  description:+    Build with QuickCheck >= 2.6, which introduces+    "Test.QuickCheck.Test.interrupted".+ library   default-language: Haskell2010   hs-source-dirs: src@@ -241,6 +248,8 @@     GADTs    ,TemplateHaskell    ,DeriveDataTypeable+  other-extensions:+    CPP   build-depends:     base         >= 4 && < 6    ,lens@@ -252,10 +261,16 @@    ,parallel-io    ,MonadCatchIO-transformers    ,HUnit-   ,QuickCheck   >= 2 && < 3    ,test-framework    ,test-framework-hunit    ,test-framework-quickcheck2+  if flag(QuickCheck26)+    cpp-options: -DQUICKCHECK26+    build-depends:+      QuickCheck   >= 2.6 && < 3+  else+    build-depends:+      QuickCheck   >= 2   && < 2.6   exposed-modules:     Test.Util    ,Test.Util.Framework@@ -281,16 +296,22 @@    ,parallel-io    ,MonadCatchIO-transformers    ,HUnit-   ,QuickCheck   >= 2 && < 3    ,test-framework    ,test-framework-hunit    ,test-framework-quickcheck2+  if flag(QuickCheck26)+    cpp-options: -DQUICKCHECK26+    build-depends:+      QuickCheck   >= 2.6 && < 3+  else+    build-depends:+      QuickCheck   >= 2   && < 2.6   other-modules:     Tests    ,Test.Test.Util    ,Test.Test.Util.Framework  source-repository head-    type:     git-    location: git://github.com/bairyn/tdd-util.git-    tag:      0.1.0.1+  type:     git+  location: git://github.com/bairyn/tdd-util.git+  tag:      0.2.0.2