hunit-dejafu 0.3.0.3 → 0.4.0.0

raw patch · 2 files changed

+74/−76 lines, 2 filesdep +randomdep ~dejafuPVP ok

version bump matches the API change (PVP)

Dependencies added: random

Dependency ranges changed: dejafu

API changes (from Hackage documentation)

Files

• Test/HUnit/DejaFu.hs +70/−73
• hunit-dejafu.cabal +4/−3

@@ -12,7 +12,7 @@  -- | -- Module      : Test.HUnit.DejaFu--- Copyright   : (c) 2016 Michael Walker+-- Copyright   : (c) 2017 Michael Walker -- License     : MIT -- Maintainer  : Michael Walker <mike@barrucadu.co.uk> -- Stability   : stable@@ -33,27 +33,28 @@   -- @instance Testable   (ConcIO   ())@   -- @instance Assertable (ConcIO   ())@   ---  -- These instances use the default memory model and schedule bounds.+  -- These instances use 'defaultWay' and 'defaultMemType'.    -- * Property testing     testAuto   , testDejafu   , testDejafus -  , testAuto'-  , testDejafu'-  , testDejafus'+  , testAutoWay+  , testDejafuWay+  , testDejafusWay    -- ** @IO@   , testAutoIO   , testDejafuIO   , testDejafusIO -  , testAutoIO'-  , testDejafuIO'-  , testDejafusIO'+  , testAutoWayIO+  , testDejafuWayIO+  , testDejafusWayIO    -- * Re-exports+  , Way(..)   , Bounds(..)   , MemType(..)   ) where@@ -61,37 +62,22 @@ import Control.Monad.Catch (try) import Control.Monad.ST (runST) import Data.List (intercalate, intersperse)-import Test.DejaFu-import qualified Test.DejaFu.SCT as SCT+import System.Random (RandomGen) import Test.HUnit (Assertable(..), Test(..), Testable(..), assertString) import Test.HUnit.Lang (HUnitFailure(..))--#if MIN_VERSION_dejafu(0,4,0)+import Test.DejaFu import qualified Test.DejaFu.Conc as Conc-#else-import qualified Test.DejaFu.Deterministic as Conc-#endif+import qualified Test.DejaFu.SCT as SCT  -- Can't put the necessary forall in the @Assertable Conc.ConcST t@ -- instance :( import Unsafe.Coerce (unsafeCoerce) -#if MIN_VERSION_dejafu(0,3,0)-type Trc = Conc.Trace Conc.ThreadId Conc.ThreadAction Conc.Lookahead-#else-type Trc = Conc.Trace-#endif--sctBoundST :: MemType -> Bounds -> (forall t. Conc.ConcST t a) -> [(Either Failure a, Trc)]-sctBoundIO :: MemType -> Bounds -> Conc.ConcIO a -> IO [(Either Failure a, Trc)]+runSCTst :: RandomGen g => Way g -> MemType -> (forall t. Conc.ConcST t a) -> [(Either Failure a, Conc.Trace)]+runSCTst way memtype conc = runST (SCT.runSCT way memtype conc) -#if MIN_VERSION_dejafu(0,4,0)-sctBoundST memtype cb conc = runST (SCT.sctBound memtype cb conc)-sctBoundIO = SCT.sctBound-#else-sctBoundST = SCT.sctBound-sctBoundIO = SCT.sctBoundIO-#endif+runSCTio :: RandomGen g => Way g -> MemType -> Conc.ConcIO a -> IO [(Either Failure a, Conc.Trace)]+runSCTio = SCT.runSCT  -------------------------------------------------------------------------------- -- Unit testing@@ -104,19 +90,19 @@  instance Assertable (Conc.ConcST t ()) where   assert conc = do-    let traces = sctBound' conc'+    let traces = runSCTst' conc'     assertString . showErr $ assertableP traces      where       conc' :: Conc.ConcST t (Either HUnitFailure ())       conc' = try conc -      sctBound' :: Conc.ConcST t (Either HUnitFailure ()) -> [(Either Failure (Either HUnitFailure ()), Trc)]-      sctBound' = unsafeCoerce $ sctBoundST defaultMemType defaultBounds+      runSCTst' :: Conc.ConcST t (Either HUnitFailure ()) -> [(Either Failure (Either HUnitFailure ()), Conc.Trace)]+      runSCTst' = unsafeCoerce $ runSCTst defaultWay defaultMemType  instance Assertable (Conc.ConcIO ()) where   assert conc = do-    traces <- sctBoundIO defaultMemType defaultBounds (try conc)+    traces <- runSCTio defaultWay defaultMemType (try conc)     assertString . showErr $ assertableP traces  assertableP :: Predicate (Either HUnitFailure ())@@ -137,25 +123,30 @@   => (forall t. Conc.ConcST t a)   -- ^ The computation to test   -> Test-testAuto = testAuto' defaultMemType+testAuto = testAutoWay defaultWay defaultMemType  -- | Variant of 'testAuto' which tests a computation under a given--- memory model.-testAuto' :: (Eq a, Show a)-  => MemType+-- execution way and memory model.+testAutoWay :: (Eq a, Show a, RandomGen g)+  => Way g+  -- ^ How to execute the concurrent program.+  -> MemType   -- ^ The memory model to use for non-synchronised @CRef@ operations.   -> (forall t. Conc.ConcST t a)   -- ^ The computation to test   -> Test-testAuto' memtype conc = testDejafus' memtype defaultBounds conc autocheckCases+testAutoWay way memtype conc =+  testDejafusWay way memtype conc autocheckCases  -- | Variant of 'testAuto' for computations which do 'IO'. testAutoIO :: (Eq a, Show a) => Conc.ConcIO a -> Test-testAutoIO = testAutoIO' defaultMemType+testAutoIO = testAutoWayIO defaultWay defaultMemType --- | Variant of 'testAuto'' for computations which do 'IO'.-testAutoIO' :: (Eq a, Show a) => MemType -> Conc.ConcIO a -> Test-testAutoIO' memtype concio = testDejafusIO' memtype defaultBounds concio autocheckCases+-- | Variant of 'testAutoWay' for computations which do 'IO'.+testAutoWayIO :: (Eq a, Show a, RandomGen g)+  => Way g -> MemType -> Conc.ConcIO a -> Test+testAutoWayIO way memtype concio =+  testDejafusWayIO way memtype concio autocheckCases  -- | Predicates for the various autocheck functions. autocheckCases :: Eq a => [(String, Predicate a)]@@ -174,15 +165,15 @@   -> Predicate a   -- ^ The predicate to check   -> Test-testDejafu = testDejafu' defaultMemType defaultBounds+testDejafu = testDejafuWay defaultWay defaultMemType --- | Variant of 'testDejafu' which takes a memory model and--- schedule bounds.-testDejafu' :: Show a-  => MemType+-- | Variant of 'testDejafu' which takes a way to execute the program+-- and a memory model.+testDejafuWay :: (Show a, RandomGen g)+  => Way g+  -- ^ How to execute the concurrent program.+  -> MemType   -- ^ The memory model to use for non-synchronised @CRef@ operations.-  -> Bounds-  -- ^ The schedule bound.   -> (forall t. Conc.ConcST t a)   -- ^ The computation to test   -> String@@ -190,7 +181,8 @@   -> Predicate a   -- ^ The predicate to check   -> Test-testDejafu' memtype cb conc name p = testDejafus' memtype cb conc [(name, p)]+testDejafuWay way memtype conc name p =+  testDejafusWay way memtype conc [(name, p)]  -- | Variant of 'testDejafu' which takes a collection of predicates to -- test. This will share work between the predicates, rather than@@ -201,44 +193,48 @@   -> [(String, Predicate a)]   -- ^ The list of predicates (with names) to check   -> Test-testDejafus = testDejafus' defaultMemType defaultBounds+testDejafus = testDejafusWay defaultWay defaultMemType --- | Variant of 'testDejafus' which takes a memory model and schedule--- bounds.-testDejafus' :: Show a-  => MemType+-- | Variant of 'testDejafus' which takes a way to execute the program+-- and a memory model.+testDejafusWay :: (Show a, RandomGen g)+  => Way g+  -- ^ How to execute the concurrent program.+  -> MemType   -- ^ The memory model to use for non-synchronised @CRef@ operations.-  -> Bounds-  -- ^ The schedule bounds   -> (forall t. Conc.ConcST t a)   -- ^ The computation to test   -> [(String, Predicate a)]   -- ^ The list of predicates (with names) to check   -> Test-testDejafus' = testst+testDejafusWay = testst  -- | Variant of 'testDejafu' for computations which do 'IO'. testDejafuIO :: Show a => Conc.ConcIO a -> String -> Predicate a -> Test-testDejafuIO = testDejafuIO' defaultMemType defaultBounds+testDejafuIO = testDejafuWayIO defaultWay defaultMemType --- | Variant of 'testDejafu'' for computations which do 'IO'.-testDejafuIO' :: Show a => MemType -> Bounds -> Conc.ConcIO a -> String -> Predicate a -> Test-testDejafuIO' memtype cb concio name p = testDejafusIO' memtype cb concio [(name, p)]+-- | Variant of 'testDejafuWay' for computations which do 'IO'.+testDejafuWayIO :: (Show a, RandomGen g)+  => Way g -> MemType -> Conc.ConcIO a -> String -> Predicate a -> Test+testDejafuWayIO way memtype concio name p =+  testDejafusWayIO way memtype concio [(name, p)]  -- | Variant of 'testDejafus' for computations which do 'IO'. testDejafusIO :: Show a => Conc.ConcIO a -> [(String, Predicate a)] -> Test-testDejafusIO = testDejafusIO' defaultMemType defaultBounds+testDejafusIO = testDejafusWayIO defaultWay defaultMemType --- | Variant of 'dejafus'' for computations which do 'IO'.-testDejafusIO' :: Show a => MemType -> Bounds -> Conc.ConcIO a -> [(String, Predicate a)] -> Test-testDejafusIO' = testio+-- | Variant of 'dejafusWay' for computations which do 'IO'.+testDejafusWayIO :: (Show a, RandomGen g)+  => Way g -> MemType -> Conc.ConcIO a -> [(String, Predicate a)] -> Test+testDejafusWayIO = testio  -------------------------------------------------------------------------------- -- HUnit integration  -- | Produce a HUnit 'Test' from a Deja Fu test.-testst :: Show a => MemType -> Bounds -> (forall t. Conc.ConcST t a) -> [(String, Predicate a)] -> Test-testst memtype cb conc tests = case map toTest tests of+testst :: (Show a, RandomGen g)+  => Way g -> MemType -> (forall t. Conc.ConcST t a) -> [(String, Predicate a)] -> Test+testst way memtype conc tests = case map toTest tests of   [t] -> t   ts  -> TestList ts @@ -246,11 +242,12 @@     toTest (name, p) = TestLabel name . TestCase $       assertString . showErr $ p traces -    traces = sctBoundST memtype cb conc+    traces = runSCTst way memtype conc  -- | Produce a HUnit 'Test' from an IO-using Deja Fu test.-testio :: Show a => MemType -> Bounds -> Conc.ConcIO a -> [(String, Predicate a)] -> Test-testio memtype cb concio tests = case map toTest tests of+testio :: (Show a, RandomGen g)+  => Way g -> MemType -> Conc.ConcIO a -> [(String, Predicate a)] -> Test+testio way memtype concio tests = case map toTest tests of   [t] -> t   ts  -> TestList ts @@ -260,7 +257,7 @@       -- really unsafe) here, as 'test' doesn't allow side-effects       -- (eg, constructing an 'MVar' to share the traces after one       -- test computed them).-      traces <- sctBoundIO memtype cb concio+      traces <- runSCTio way memtype concio       assertString . showErr $ p traces  --------------------------------------------------------------------------------

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                hunit-dejafu-version:             0.3.0.3+version:             0.4.0.0 synopsis:            Deja Fu support for the HUnit test framework.  description:@@ -33,7 +33,7 @@ source-repository this   type:     git   location: https://github.com/barrucadu/dejafu.git-  tag:      hunit-dejafu-0.3.0.3+  tag:      hunit-dejafu-0.4.0.0  library   exposed-modules:     Test.HUnit.DejaFu@@ -41,7 +41,8 @@   -- other-extensions:       build-depends:       base       >=4.8 && <5                      , exceptions >=0.7 && <0.9-                     , dejafu     >=0.2 && <0.5+                     , dejafu     >=0.5 && <0.6                      , HUnit      >=1.2 && <1.6+                     , random     >=1.0 && <1.2   -- hs-source-dirs:         default-language:    Haskell2010