lib: more informative failure output for amount tests (#812)

hledger-lib/Hledger/Read/Common.hs

@@ -593,12 +593,10 @@ amountwithoutpricep = do
 test_amountp = TestCase $ do
     assertParseEqual' (parseWithState mempty amountp "$47.18") (usd 47.18)
     assertParseEqual' (parseWithState mempty amountp "$1.") (usd 1 `withPrecision` 0)
-  -- ,"amount with unit price" ~: do
+    assertParseEqual'' "amount with unit price"
-    assertParseEqual'
+      (parseWithState mempty amountp "$10 @ €0.5")
-     (parseWithState mempty amountp "$10 @ €0.5")
+      (usd 10 `withPrecision` 0 `at` (eur 0.5 `withPrecision` 1))
-     (usd 10 `withPrecision` 0 `at` (eur 0.5 `withPrecision` 1))
+    assertParseEqual'' "amount with total price"
-  -- ,"amount with total price" ~: do
-    assertParseEqual'
      (parseWithState mempty amountp "$10 @@ €5")
      (usd 10 `withPrecision` 0 @@ (eur 5 `withPrecision` 0))
 

hledger-lib/Hledger/Read/JournalReader.hs

@@ -675,7 +675,8 @@ test_postingp = TestCase $ do
                          same "date" pdate
                          same "status" pstatus
                          same "account" paccount
-                         same "amount" pamount
+                         -- same "amount" pamount
+                         assertEqual "Posting amount differs!" (showMixedAmountDebug $ pamount ep) (showMixedAmountDebug $ pamount ap)
                          same "comment" pcomment
                          same "type" ptype
                          same "tags" ptags

hledger-lib/Hledger/Utils/Test.hs

@@ -3,6 +3,7 @@ module Hledger.Utils.Test where
 import Data.Functor.Identity
 import Test.HUnit
 import Text.Megaparsec
+import Hledger.Utils.Debug (pshow)
 
 -- | Get a Test's label, or the empty string.
 testName :: Test -> String
@@ -38,10 +39,21 @@ 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 parse expected = either (assertFailure.show) (`is` expected) parse
 
--- | Assert that the parse result returned from an identity monad is some expected value, 
+-- | Assert that the parse result returned from an identity monad is some expected value,
--- printing the parse error on failure.
+-- on failure printing the parse error or differing values.
 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)
+assertParseEqual' parse expected = 
+  either 
+    (assertFailure . ("parse error: "++) . pshow) 
+    (\actual -> assertEqual (unlines ["expected: " ++ show expected, " but got: " ++ show actual]) expected actual) 
+    $ runIdentity parse
+
+assertParseEqual'' :: (Show a, Eq a, Show t, Show e) => String -> Identity (Either (ParseError t e) a) -> a -> Assertion
+assertParseEqual'' label parse expected = 
+  either 
+    (assertFailure . ("parse error: "++) . pshow) 
+    (\actual -> assertEqual (unlines [label, "expected: " ++ show expected, " but got: " ++ show actual]) expected actual) 
+    $ runIdentity parse
 
 printParseError :: (Show a) => a -> IO ()
 printParseError e = do putStr "parse error at "; print e