simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-12-29 13:22:27 +03:00
Code Issues Projects Releases Wiki Activity

lib: move assertParseEqual' (#812)

Browse Source
This commit is contained in:
Simon Michael 2018-08-04 16:34:42 +01:00
parent ebe2d52965
commit 321635274c
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/Hledger/Read/Common.hs
View File

@ -500,16 +500,6 @@ spaceandamountormissingp =
lift $ skipSome spacenonewline lift $ skipSome spacenonewline
Mixed . (:[]) <$> amountp Mixed . (:[]) <$> amountp
assertParseEqual' ::
(Show a, Eq a)
=> Identity (Either (ParseError Char CustomErr) a)
-> a
-> Assertion
assertParseEqual' parse expected = either (assertFailure.show) (`is'` expected) (runIdentity parse)
is' :: (Eq a, Show a) => a -> a -> Assertion
a `is'` e = assertEqual "values are equal" e a
test_spaceandamountormissingp = TestCase $ do test_spaceandamountormissingp = TestCase $ do
assertParseEqual' (parseWithState mempty spaceandamountormissingp " $47.18") (Mixed [usd 47.18]) assertParseEqual' (parseWithState mempty spaceandamountormissingp " $47.18") (Mixed [usd 47.18])
assertParseEqual' (parseWithState mempty spaceandamountormissingp "$47.18") missingmixedamt assertParseEqual' (parseWithState mempty spaceandamountormissingp "$47.18") missingmixedamt

8
hledger-lib/Hledger/Utils/Test.hs
View File

@ -1,5 +1,6 @@
module Hledger.Utils.Test where module Hledger.Utils.Test where
import Data.Functor.Identity
import Test.HUnit import Test.HUnit
import Text.Megaparsec import Text.Megaparsec
@ -22,7 +23,7 @@ filterTests _ t = t
-- | Simple way to assert something is some expected value, with no label. -- | Simple way to assert something is some expected value, with no label.
is :: (Eq a, Show a) => a -> a -> Assertion is :: (Eq a, Show a) => a -> a -> Assertion
a `is` e = assertEqual "" e a a `is` e = assertEqual "" e a -- XXX should it have a message ?
-- | Assert a parse result is successful, printing the parse error on failure. -- | Assert a parse result is successful, printing the parse error on failure.
assertParse :: (Show t, Show e) => (Either (ParseError t e) a) -> Assertion assertParse :: (Show t, Show e) => (Either (ParseError t e) a) -> Assertion
@ -37,6 +38,11 @@ assertParseFailure parse = either (const $ return ()) (const $ assertFailure "pa
assertParseEqual :: (Show a, Eq a, Show t, Show e) => (Either (ParseError t e) a) -> a -> Assertion assertParseEqual :: (Show a, Eq a, Show t, Show e) => (Either (ParseError t e) a) -> a -> Assertion
assertParseEqual parse expected = either (assertFailure.show) (`is` expected) parse assertParseEqual parse expected = either (assertFailure.show) (`is` expected) parse
-- | Assert that the parse result returned from an identity monad is some expected value,
-- printing the parse error on failure.
assertParseEqual' :: (Show a, Eq a, Show t, Show e) => Identity (Either (ParseError t e) a) -> a -> Assertion
assertParseEqual' parse expected = either (assertFailure.show) (`is` expected) (runIdentity parse)
printParseError :: (Show a) => a -> IO () printParseError :: (Show a) => a -> IO ()
printParseError e = do putStr "parse error at "; print e printParseError e = do putStr "parse error at "; print e