git.iko.soy/streamly
on master help sign in
Refactor ZipAsync ops into a separate test suite.
commitcfb953556d06402f6c35062d03355f29a512213d authorPranay Sashank <pranaysashank@composewell.com> dateFri 24 Jul 2020, 20:19 (6 years ago) parent9cec13f
3 files changed+70−22
compare with master
unifiedsplit
streamly.cabal+8 test/Prop.hs−22 test/Streamly/Test/Prelude/ZipAsync.hs+62
streamly.cabal+8
@@ -608,6 +608,14 @@ test-suite Prelude.ZipSerial
608608 other-modules: Streamly.Test.Common
609609 , Streamly.Test.Prelude
610610
611+test-suite Prelude.ZipAsync
612+ import: test-options, prelude-test-options
613+ type: exitcode-stdio-1.0
614+ main-is: Streamly/Test/Prelude/ZipAsync.hs
615+ ghc-options: -main-is Streamly.Test.Prelude.ZipAsync.main
616+ other-modules: Streamly.Test.Common
617+ , Streamly.Test.Prelude
618+
611619test-suite array-test
612620 import: test-options
613621 type: exitcode-stdio-1.0
test/Prop.hs−22
@@ -285,11 +285,6 @@ main = hspec
285285 parallelConcurrentAppOps spec =
286286 mapOps spec $ makeConcurrentAppOps parallely <> parallelCommonOps
287287
288− -- Note, the "pure" of applicative Zip streams generates and infinite
289− -- stream and therefore maxBuffer (-1) must not be used for that case.
290− let zipAsyncOps :: IsStream t => ((ZipAsyncM IO a -> t IO a) -> Spec) -> Spec
291− zipAsyncOps spec = mapOps spec $ makeOps zipAsyncly
292−
293288 describe "Construction" $ do
294289 aheadOps $ prop "aheadly replicateM" . constructWithReplicateM
295290 asyncOps $ prop "asyncly replicateM" . constructWithReplicateM
@@ -314,15 +309,12 @@ main = hspec
314309 wAsyncOps $ functorOps folded "wAsyncly folded" sortEq
315310 parallelOps $ functorOps S.fromFoldable "parallely" sortEq
316311 parallelOps $ functorOps folded "parallely folded" sortEq
317− zipAsyncOps $ functorOps S.fromFoldable "zipAsyncly" (==)
318− zipAsyncOps $ functorOps folded "zipAsyncly folded" (==)
319312
320313 describe "Semigroup operations" $ do
321314 aheadOps $ semigroupOps "aheadly" (==)
322315 asyncOps $ semigroupOps "asyncly" sortEq
323316 wAsyncOps $ semigroupOps "wAsyncly" sortEq
324317 parallelOps $ semigroupOps "parallely" sortEq
325− zipAsyncOps $ semigroupOps "zipAsyncly" (==)
326318
327319 describe "Applicative operations" $ do
328320 aheadOps $ prop "aheadly applicative" . applicativeOps S.fromFoldable (==)
@@ -335,9 +327,6 @@ main = hspec
335327
336328 -- XXX add tests for indexed/indexedR
337329 describe "Zip operations" $ do
338− zipAsyncOps $ prop "zipAsyncly applicative" . zipApplicative S.fromFoldable (==)
339− zipAsyncOps $ prop "zipAsyncly applicative folded" . zipApplicative folded (==)
340−
341330 -- We test only the serial zip with serial streams and the parallel
342331 -- stream, because the rate setting in these streams can slow down
343332 -- zipAsync.
@@ -418,50 +407,39 @@ main = hspec
418407 asyncOps $ transformCombineOpsCommon S.fromFoldable "asyncly" sortEq
419408 wAsyncOps $ transformCombineOpsCommon S.fromFoldable "wAsyncly" sortEq
420409 parallelOps $ transformCombineOpsCommon S.fromFoldable "parallely" sortEq
421− zipAsyncOps $ transformCombineOpsCommon S.fromFoldable "zipAsyncly" (==)
422410
423411 aheadOps $ transformCombineOpsCommon folded "aheadly" (==)
424412 asyncOps $ transformCombineOpsCommon folded "asyncly" sortEq
425413 wAsyncOps $ transformCombineOpsCommon folded "wAsyncly" sortEq
426414 parallelOps $ transformCombineOpsCommon folded "parallely" sortEq
427− zipAsyncOps $ transformCombineOpsCommon folded "zipAsyncly" (==)
428415
429416 aheadOps $ transformCombineOpsOrdered S.fromFoldable "aheadly" (==)
430− zipAsyncOps $ transformCombineOpsOrdered S.fromFoldable "zipAsyncly" (==)
431417
432418 aheadOps $ transformCombineOpsOrdered folded "aheadly" (==)
433− zipAsyncOps $ transformCombineOpsOrdered folded "zipAsyncly" (==)
434419
435420 describe "Stream elimination operations" $ do
436421 aheadOps $ eliminationOps S.fromFoldable "aheadly"
437422 asyncOps $ eliminationOps S.fromFoldable "asyncly"
438423 wAsyncOps $ eliminationOps S.fromFoldable "wAsyncly"
439424 parallelOps $ eliminationOps S.fromFoldable "parallely"
440− zipAsyncOps $ eliminationOps S.fromFoldable "zipAsyncly"
441425
442426 aheadOps $ eliminationOps folded "aheadly folded"
443427 asyncOps $ eliminationOps folded "asyncly folded"
444428 wAsyncOps $ eliminationOps folded "wAsyncly folded"
445429 parallelOps $ eliminationOps folded "parallely folded"
446− zipAsyncOps $ eliminationOps folded "zipAsyncly folded"
447430
448431 aheadOps $ eliminationOpsWord8 S.fromFoldable "aheadly"
449432 asyncOps $ eliminationOpsWord8 S.fromFoldable "asyncly"
450433 wAsyncOps $ eliminationOpsWord8 S.fromFoldable "wAsyncly"
451434 parallelOps $ eliminationOpsWord8 S.fromFoldable "parallely"
452− zipAsyncOps $ eliminationOpsWord8 S.fromFoldable "zipAsyncly"
453435
454436 aheadOps $ eliminationOpsWord8 folded "aheadly folded"
455437 asyncOps $ eliminationOpsWord8 folded "asyncly folded"
456438 wAsyncOps $ eliminationOpsWord8 folded "wAsyncly folded"
457439 parallelOps $ eliminationOpsWord8 folded "parallely folded"
458− zipAsyncOps $ eliminationOpsWord8 folded "zipAsyncly folded"
459440
460441 -- XXX Add a test where we chain all transformation APIs and make sure that
461442 -- the state is being passed through all of them.
462443 describe "Stream serial elimination operations" $ do
463444 aheadOps $ eliminationOpsOrdered S.fromFoldable "aheadly"
464− zipAsyncOps $ eliminationOpsOrdered S.fromFoldable "zipAsyncly"
465−
466445 aheadOps $ eliminationOpsOrdered folded "aheadly folded"
467− zipAsyncOps $ eliminationOpsOrdered folded "zipAsyncly folded"
test/Streamly/Test/Prelude/ZipAsync.hsnew file+62
@@ -0,0 +1,62 @@
1+-- |
2+-- Module : Streamly.Test.Prelude.ZipAsync
3+-- Copyright : (c) 2020 Composewell Technologies
4+--
5+-- License : BSD-3-Clause
6+-- Maintainer : streamly@composewell.com
7+-- Stability : experimental
8+-- Portability : GHC
9+
10+module Streamly.Test.Prelude.ZipAsync where
11+
12+import Test.Hspec.QuickCheck
13+import Test.Hspec as H
14+
15+import Streamly
16+import qualified Streamly.Prelude as S
17+
18+import Streamly.Test.Prelude
19+
20+main :: IO ()
21+main = hspec
22+ $ H.parallel
23+#ifdef COVERAGE_BUILD
24+ $ modifyMaxSuccess (const 10)
25+#endif
26+ $ do
27+ -- Note, the "pure" of applicative Zip streams generates and infinite
28+ -- stream and therefore maxBuffer (-1) must not be used for that case.
29+ let zipAsyncOps :: IsStream t => ((ZipAsyncM IO a -> t IO a) -> Spec) -> Spec
30+ zipAsyncOps spec = mapOps spec $ makeOps zipAsyncly
31+
32+ describe "Functor operations" $ do
33+ zipAsyncOps $ functorOps S.fromFoldable "zipAsyncly" (==)
34+ zipAsyncOps $ functorOps folded "zipAsyncly folded" (==)
35+
36+ describe "Semigroup operations" $ do
37+ zipAsyncOps $ semigroupOps "zipAsyncly" (==)
38+
39+ -- XXX add tests for indexed/indexedR
40+ describe "Zip operations" $ do
41+ zipAsyncOps $
42+ prop "zipAsyncly applicative" . zipApplicative S.fromFoldable (==)
43+ zipAsyncOps $
44+ prop "zipAsyncly applicative folded" . zipApplicative folded (==)
45+
46+ describe "Stream transform and combine operations" $ do
47+ zipAsyncOps $ transformCombineOpsCommon S.fromFoldable "zipAsyncly" (==)
48+ zipAsyncOps $ transformCombineOpsCommon folded "zipAsyncly" (==)
49+ zipAsyncOps $ transformCombineOpsOrdered S.fromFoldable "zipAsyncly" (==)
50+ zipAsyncOps $ transformCombineOpsOrdered folded "zipAsyncly" (==)
51+
52+ describe "Stream elimination operations" $ do
53+ zipAsyncOps $ eliminationOps S.fromFoldable "zipAsyncly"
54+ zipAsyncOps $ eliminationOps folded "zipAsyncly folded"
55+ zipAsyncOps $ eliminationOpsWord8 S.fromFoldable "zipAsyncly"
56+ zipAsyncOps $ eliminationOpsWord8 folded "zipAsyncly folded"
57+
58+ -- XXX Add a test where we chain all transformation APIs and make sure that
59+ -- the state is being passed through all of them.
60+ describe "Stream serial elimination operations" $ do
61+ zipAsyncOps $ eliminationOpsOrdered S.fromFoldable "zipAsyncly"
62+ zipAsyncOps $ eliminationOpsOrdered folded "zipAsyncly folded"