5aa8e44 · streamly · git.iko.soy

git.iko.soy/streamly

Add tests to lastN

commit5aa8e44d24c84e77bb35d68e0864377d273b783f authoradithyaov <adi.obilisetty@gmail.com> dateMon 9 Dec 2019, 12:07 (7 years ago) parent46643d1

3 files changed+35−17

compare with master

unifiedsplit

src/Streamly/Internal/Data/Stream/StreamD.hs+3−3 src/Streamly/Internal/Memory/Array/Types.hs+1−1 test/Streamly/Test/Array.hs+31−13

src/Streamly/Internal/Data/Stream/StreamD.hs+3−3

@@ -4028,11 +4028,11 @@ lastN n = Fold step initial done

40284028 step (Tuple3' rb rh i) a = do

40294029 rh1 <- liftIO $ RB.unsafeInsert rb rh a

40304030 return $ Tuple3' rb rh1 (i + 1)

4031− initial = fmap (\(a, b) -> Tuple3' a b 0) $ liftIO $ RB.new n

4031+ initial = fmap (\(a, b) -> Tuple3' a b 0) $ liftIO $ RB.new n

40324032 done (Tuple3' rb rh i) = do

40334033 arr <- liftIO $ A.newArray n

40344034 foldFunc i rh snoc' arr rb

40354035 snoc' b a = liftIO $ A.unsafeSnoc b a

40364036 foldFunc i

4037− | i < n = RB.unsafeFoldRingM

4038− | otherwise = RB.unsafeFoldRingFullM

4037+ | i < n = RB.unsafeFoldRingM

4038+ | otherwise = RB.unsafeFoldRingFullM

src/Streamly/Internal/Memory/Array/Types.hs+1−1

@@ -286,7 +286,7 @@ withNewArray count f = do

286286--

287287-- Internal routine for when the array is being created. Appends one item at

288288-- the end of the array. Useful when sequentially writing a stream to the

289−-- array. DOES NOT CHECK THE ARRAY BOUNDS.

289+-- array.

290290{-# INLINE unsafeSnoc #-}

291291unsafeSnoc :: forall a. Storable a => Array a -> a -> IO (Array a)

292292unsafeSnoc arr@Array{..} x = do

test/Streamly/Test/Array.hs+31−13

@@ -132,26 +132,44 @@ testArraysOf =

132132 $ IP.arraysOf 240

133133 $ S.fromList list

134134 assert (xs == list)

135+

136+lastN :: Int -> [a] -> [a]

137+lastN n l = drop (length l - n) l

138+

139+testLastN :: Property

140+testLastN =

141+ forAll (choose (0, maxArrLen)) $ \len ->

142+ forAll (choose (0, len)) $ \n ->

143+ forAll (vectorOf len (arbitrary :: Gen Int)) $ \list ->

144+ monadicIO $ do

145+ xs <- fmap A.toList

146+ $ S.fold (A.lastN n)

147+ $ S.fromList list

148+ assert (xs == lastN n list)

135149#endif

136150

137151main :: IO ()

138152main =

139153 hspec $

140154 H.parallel $

141− modifyMaxSuccess (const maxTestCount) $

142− describe "Construction" $ do

143− prop "length . writeN n === n" testLength

144− prop "length . fromStreamN n === n" testLengthFromStreamN

145− prop "read . writeN === id " testFoldNUnfold

146− prop "toStream . writeN === id" testFoldNToStream

147− prop "toStreamRev . writeN === reverse" testFoldNToStreamRev

148− prop "read . fromStreamN === id" testFromStreamNUnfold

149− prop "toStream . fromStreamN === id" testFromStreamNToStream

155+ modifyMaxSuccess (const maxTestCount) $ do

156+ describe "Construction" $ do

157+ prop "length . writeN n === n" testLength

158+ prop "length . fromStreamN n === n" testLengthFromStreamN

159+ prop "read . writeN === id " testFoldNUnfold

160+ prop "toStream . writeN === id" testFoldNToStream

161+ prop "toStreamRev . writeN === reverse" testFoldNToStreamRev

162+ prop "read . fromStreamN === id" testFromStreamNUnfold

163+ prop "toStream . fromStreamN === id" testFromStreamNToStream

150164#ifndef TEST_SMALL_ARRAY

151− prop "length . fromStream === n" testLengthFromStream

152− prop "toStream . fromStream === id" testFromStreamToStream

153− prop "read . write === id" testFoldUnfold

165+ prop "length . fromStream === n" testLengthFromStream

166+ prop "toStream . fromStream === id" testFromStreamToStream

167+ prop "read . write === id" testFoldUnfold

168+#endif

169+#ifdef TEST_ARRAY

170+ prop "arraysOf concats to original" testArraysOf

154171#endif

155172#ifdef TEST_ARRAY

156− prop "arraysOf concats to original" testArraysOf

173+ describe "Fold" $ do

174+ prop "lastN" $ testLastN

157175#endif