git.iko.soy/streamly
on master help sign in
Refactor Concurrent ops into a separate test suite.
0f77322Pranay Sashank
streamly.cabal+8−7
compare with master
unifiedsplit
@@ -577,13 +577,6 @@ test-suite pure-streams-streamly
577 , hspec >= 2.0 && < 3
577 , hspec >= 2.0 && < 3
578 default-language: Haskell2010
578 default-language: Haskell2010
579
579
580−test-suite properties
581− import: test-options, prelude-test-options
582− type: exitcode-stdio-1.0
583− main-is: Prop.hs
584− other-modules: Streamly.Test.Common
585− , Streamly.Test.Prelude
586−
587test-suite Prelude.Serial
580test-suite Prelude.Serial
588 import: test-options, prelude-test-options
581 import: test-options, prelude-test-options
589 type: exitcode-stdio-1.0
582 type: exitcode-stdio-1.0
@@ -648,6 +641,14 @@ test-suite Prelude.Parallel
648 other-modules: Streamly.Test.Common
641 other-modules: Streamly.Test.Common
649 , Streamly.Test.Prelude
642 , Streamly.Test.Prelude
650
643
644+test-suite Prelude.Concurrent
645+ import: test-options, prelude-test-options
646+ type: exitcode-stdio-1.0
647+ main-is: Streamly/Test/Prelude/Concurrent.hs
648+ ghc-options: -main-is Streamly.Test.Prelude.Concurrent.main
649+ other-modules: Streamly.Test.Common
650+ , Streamly.Test.Prelude
651+
651test-suite array-test
652test-suite array-test
652 import: test-options
653 import: test-options
653 type: exitcode-stdio-1.0
654 type: exitcode-stdio-1.0
test/Prop.hs → test/Streamly/Test/Prelude/Concurrent.hsrenamed+38−7
@@ -1,6 +1,15 @@
1+-- |
2+-- Module : Streamly.Test.Prelude.Concurrent
3+-- Copyright : (c) 2020 Composewell Technologies
4+--
5+-- License : BSD-3-Clause
6+-- Maintainer : streamly@composewell.com
7+-- Stability : experimental
8+-- Portability : GHC
9+
1{-# LANGUAGE OverloadedLists #-}
10{-# LANGUAGE OverloadedLists #-}
2
11
3−module Main (main) where
12+module Streamly.Test.Prelude.Concurrent where
4
13
5import Control.Concurrent (MVar, takeMVar, putMVar, newEmptyMVar)
14import Control.Concurrent (MVar, takeMVar, putMVar, newEmptyMVar)
6import Control.Exception
15import Control.Exception
@@ -8,15 +17,16 @@ import Control.Exception
8 BlockedIndefinitelyOnSTM(..), Handler(..))
17 BlockedIndefinitelyOnSTM(..), Handler(..))
9import Control.Monad (when, forM_, replicateM_)
18import Control.Monad (when, forM_, replicateM_)
10import Data.IORef (readIORef, modifyIORef, newIORef)
19import Data.IORef (readIORef, modifyIORef, newIORef)
20+#if __GLASGOW_HASKELL__ < 808
21+import Data.Semigroup ((<>))
22+#endif
11import GHC.Word (Word8)
23import GHC.Word (Word8)
12−
13import Test.Hspec.QuickCheck
24import Test.Hspec.QuickCheck
25+import Test.Hspec as H
14import Test.QuickCheck
26import Test.QuickCheck
15 (Property, withMaxSuccess)
27 (Property, withMaxSuccess)
16import Test.QuickCheck.Monadic (monadicIO, run)
28import Test.QuickCheck.Monadic (monadicIO, run)
17
29
18−import Test.Hspec as H
19−
20import Streamly
30import Streamly
21import qualified Streamly.Prelude as S
31import qualified Streamly.Prelude as S
22
32
@@ -218,6 +228,26 @@ main = hspec
218 $ modifyMaxSuccess (const 10)
228 $ modifyMaxSuccess (const 10)
219#endif
229#endif
220 $ do
230 $ do
231+ -- We can have these in Test.Prelude, but I think it's unnecessary.
232+ let serialOps :: IsStream t => ((SerialT IO a -> t IO a) -> Spec) -> Spec
233+ serialOps spec = mapOps spec $ makeOps serially
234+#ifndef COVERAGE_BUILD
235+ <> [("rate AvgRate 0.00000001", serially . avgRate 0.00000001)]
236+ <> [("maxBuffer -1", serially . maxBuffer (-1))]
237+#endif
238+
239+ let aheadOps :: IsStream t => ((AheadT IO a -> t IO a) -> Spec) -> Spec
240+ aheadOps spec = mapOps spec $ makeOps aheadly
241+#ifndef COVERAGE_BUILD
242+ <> [("maxBuffer (-1)", aheadly . maxBuffer (-1))]
243+#endif
244+
245+ let asyncOps :: IsStream t => ((AsyncT IO a -> t IO a) -> Spec) -> Spec
246+ asyncOps spec = mapOps spec $ makeOps asyncly
247+#ifndef COVERAGE_BUILD
248+ <> [("maxBuffer (-1)", asyncly . maxBuffer (-1))]
249+#endif
250+
221 -- For concurrent application test we need a buffer of at least size 2 to
251 -- For concurrent application test we need a buffer of at least size 2 to
222 -- allow two threads to run.
252 -- allow two threads to run.
223 let makeConcurrentAppOps :: IsStream t
253 let makeConcurrentAppOps :: IsStream t
@@ -267,9 +297,10 @@ main = hspec
267 forOps (mkOps parallely) $ concurrentOps folded "parallely folded" sortEq
297 forOps (mkOps parallely) $ concurrentOps folded "parallely folded" sortEq
268
298
269 describe "Concurrent application" $ do
299 describe "Concurrent application" $ do
270−-- serialOps $ prop "serial" . concurrentApplication (==)
300+ serialOps $ prop "serial" . concurrentApplication (==)
271−-- asyncOps $ prop "async" . concurrentApplication sortEq
301+ asyncOps $ prop "async" . concurrentApplication sortEq
272−-- aheadOps $ prop "ahead" . concurrentApplication (==)
302+ aheadOps $ prop "ahead" . concurrentApplication (==)
303+
273 parallelConcurrentAppOps $
304 parallelConcurrentAppOps $
274 prop "parallel" . concurrentApplication sortEq
305 prop "parallel" . concurrentApplication sortEq
275
306