Tests: improve location reporting of failing tests

23 files changed, 53 insertions, 31 deletions

diff --git a/test/Tests/Readers/Creole.hs b/test/Tests/Readers/Creole.hs
index 7c04933fd..8611a735e 100644
--- a/test/Tests/Readers/Creole.hs
+++ b/test/Tests/Readers/Creole.hs
@@ -16,6 +16,7 @@ module Tests.Readers.Creole (tests) where
 import Data.Text (Text)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -25,7 +26,7 @@ creole :: Text -> Pandoc
 creole = purely $ readCreole def{ readerStandalone = True }
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test creole
 
diff --git a/test/Tests/Readers/DokuWiki.hs b/test/Tests/Readers/DokuWiki.hs
index b4a7ba72f..d08e72c01 100644
--- a/test/Tests/Readers/DokuWiki.hs
+++ b/test/Tests/Readers/DokuWiki.hs
@@ -17,6 +17,7 @@ module Tests.Readers.DokuWiki (tests) where
 import Data.Text (Text)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -26,7 +27,7 @@ dokuwiki :: Text -> Pandoc
 dokuwiki = purely $ readDokuWiki def{ readerStandalone = True }
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test dokuwiki
 
@@ -305,13 +306,13 @@ tests = [ testGroup "inlines"
           T.unlines [ "^ 0  ^  1  ^  2 ^ 3 ^"
                     , "| a  | b   | c  |d  |"
                     ] =?>
-          table emptyCaption 
-                (map (, ColWidthDefault) [AlignLeft, AlignCenter, AlignRight, AlignDefault])  
-                (TableHead nullAttr 
+          table emptyCaption
+                (map (, ColWidthDefault) [AlignLeft, AlignCenter, AlignRight, AlignDefault])
+                (TableHead nullAttr
                           [Row nullAttr . map (simpleCell . plain) $ ["0", "1", "2", "3"]])
                 [TableBody nullAttr 0 []
                           [Row nullAttr . map (simpleCell . plain) $ ["a", "b", "c", "d"]]]
-                (TableFoot nullAttr []) 
+                (TableFoot nullAttr [])
         , "Table with colspan" =:
           T.unlines [ "^ 0,0 ^ 0,1 ^ 0,2 ^"
                     , "| 1,0 | 1,1 ||"
diff --git a/test/Tests/Readers/Jira.hs b/test/Tests/Readers/Jira.hs
index 5331d5295..bce0d9087 100644
--- a/test/Tests/Readers/Jira.hs
+++ b/test/Tests/Readers/Jira.hs
@@ -16,6 +16,7 @@ module Tests.Readers.Jira (tests) where
 import Prelude hiding (unlines)
 import Data.Text (Text, unlines)
 import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers (ToString, purely, test, (=?>))
 import Text.Pandoc (def)
 import Text.Pandoc.Readers.Jira (readJira)
@@ -25,7 +26,7 @@ jira :: Text -> Pandoc
 jira = purely $ readJira def
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test jira
 
diff --git a/test/Tests/Readers/LaTeX.hs b/test/Tests/Readers/LaTeX.hs
index 14022ee01..80f42f657 100644
--- a/test/Tests/Readers/LaTeX.hs
+++ b/test/Tests/Readers/LaTeX.hs
@@ -15,6 +15,7 @@ module Tests.Readers.LaTeX (tests) where
 import Data.Text (Text)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -25,7 +26,7 @@ latex = purely $ readLaTeX def{
                    readerExtensions = getDefaultExtensions "latex" }
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test latex
 
@@ -166,7 +167,7 @@ tests = [ testGroup "basic"
                                   , simpleCell (plain "Two")
                                   ]
                    , Row nullAttr [ simpleCell (plain "Three") ]
-                   , Row nullAttr [ simpleCell (plain "Four") 
+                   , Row nullAttr [ simpleCell (plain "Four")
                                   , simpleCell (plain "Five")
                                   , simpleCell (plain "Six")
                                   , simpleCell (plain "Seven")
@@ -174,8 +175,8 @@ tests = [ testGroup "basic"
                    ]
           , "Table with multicolumn header" =:
             T.unlines [ "\\begin{tabular}{ |l|l| }"
-                      , "\\hline\\multicolumn{2}{|c|}{Header}\\\\" 
-                      , "\\hline key & val\\\\" 
+                      , "\\hline\\multicolumn{2}{|c|}{Header}\\\\"
+                      , "\\hline key & val\\\\"
                       , "\\hline\\end{tabular}"
                       ] =?>
             table emptyCaption
diff --git a/test/Tests/Readers/Man.hs b/test/Tests/Readers/Man.hs
index 723134675..9d8d924b5 100644
--- a/test/Tests/Readers/Man.hs
+++ b/test/Tests/Readers/Man.hs
@@ -15,6 +15,7 @@ module Tests.Readers.Man (tests) where
 
 import Data.Text (Text)
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -25,7 +26,7 @@ man :: Text -> Pandoc
 man = purely $ readMan def
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test man
 
diff --git a/test/Tests/Readers/Markdown.hs b/test/Tests/Readers/Markdown.hs
index b1c417b36..468121aaa 100644
--- a/test/Tests/Readers/Markdown.hs
+++ b/test/Tests/Readers/Markdown.hs
@@ -15,6 +15,7 @@ module Tests.Readers.Markdown (tests) where
 import Data.Text (Text, unpack)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -40,7 +41,7 @@ markdownMMD :: Text -> Pandoc
 markdownMMD = purely $ readMarkdown def {
                  readerExtensions = multimarkdownExtensions }
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test markdown
 
diff --git a/test/Tests/Readers/Muse.hs b/test/Tests/Readers/Muse.hs
index 68bdc87b4..2cebaedf5 100644
--- a/test/Tests/Readers/Muse.hs
+++ b/test/Tests/Readers/Muse.hs
@@ -17,6 +17,7 @@ import Data.Monoid (Any (..))
 import Data.Text (Text)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Test.Tasty.QuickCheck
 import Test.Tasty.Options (IsOption(defaultValue))
 import Tests.Helpers
@@ -33,7 +34,7 @@ emacsMuse :: Text -> Pandoc
 emacsMuse = purely $ readMuse def { readerExtensions = emptyExtensions }
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test amuse
 
diff --git a/test/Tests/Readers/Org/Shared.hs b/test/Tests/Readers/Org/Shared.hs
index 2a30af126..7ecc34925 100644
--- a/test/Tests/Readers/Org/Shared.hs
+++ b/test/Tests/Readers/Org/Shared.hs
@@ -21,6 +21,7 @@ import Data.List (intersperse)
 import Data.Text (Text)
 import Tests.Helpers (ToString, purely, test)
 import Test.Tasty (TestTree)
+import Test.Tasty.HUnit (HasCallStack)
 import Text.Pandoc (Pandoc, ReaderOptions (readerExtensions),
                     def, getDefaultExtensions, readOrg)
 import Text.Pandoc.Builder (Inlines, smallcaps, space, spanWith, str)
@@ -29,7 +30,7 @@ org :: Text -> Pandoc
 org = purely $ readOrg def{ readerExtensions = getDefaultExtensions "org" }
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test org
 
diff --git a/test/Tests/Readers/RST.hs b/test/Tests/Readers/RST.hs
index 3aa9870a6..df0b3af19 100644
--- a/test/Tests/Readers/RST.hs
+++ b/test/Tests/Readers/RST.hs
@@ -16,6 +16,7 @@ module Tests.Readers.RST (tests) where
 import Data.Text (Text)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -25,7 +26,7 @@ rst :: Text -> Pandoc
 rst = purely $ readRST def{ readerStandalone = True }
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test rst
 
diff --git a/test/Tests/Readers/Txt2Tags.hs b/test/Tests/Readers/Txt2Tags.hs
index 0c214abe3..3419d32cd 100644
--- a/test/Tests/Readers/Txt2Tags.hs
+++ b/test/Tests/Readers/Txt2Tags.hs
@@ -17,6 +17,7 @@ import Data.List (intersperse)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -30,7 +31,7 @@ t2t = purely $ \s -> do
   readTxt2Tags def s
 
 infix 4 =:
-(=:) :: ToString c
+(=:) :: (ToString c, HasCallStack)
      => String -> (Text, c) -> TestTree
 (=:) = test t2t
 
diff --git a/test/Tests/Writers/ConTeXt.hs b/test/Tests/Writers/ConTeXt.hs
index fbbf9b948..254a5fad6 100644
--- a/test/Tests/Writers/ConTeXt.hs
+++ b/test/Tests/Writers/ConTeXt.hs
@@ -3,6 +3,7 @@ module Tests.Writers.ConTeXt (tests) where
 
 import Data.Text (unpack, pack)
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Test.Tasty.QuickCheck
 import Tests.Helpers
 import Text.Pandoc
@@ -34,7 +35,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test context
 
diff --git a/test/Tests/Writers/FB2.hs b/test/Tests/Writers/FB2.hs
index 2e10636fa..75d489ee1 100644
--- a/test/Tests/Writers/FB2.hs
+++ b/test/Tests/Writers/FB2.hs
@@ -2,6 +2,7 @@
 module Tests.Writers.FB2 (tests) where
 
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -12,7 +13,7 @@ fb2 x = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" ++
         "<FictionBook xmlns=\"http://www.gribuser.ru/xml/fictionbook/2.0\" xmlns:l=\"http://www.w3.org/1999/xlink\"><description><title-info><genre>unrecognised</genre></title-info><document-info><program-used>pandoc</program-used></document-info></description><body><title><p /></title><section>" ++ x ++ "</section></body></FictionBook>"
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test (purely (writeFB2 def) . toPandoc)
 
diff --git a/test/Tests/Writers/HTML.hs b/test/Tests/Writers/HTML.hs
index a81badae8..5176af1f0 100644
--- a/test/Tests/Writers/HTML.hs
+++ b/test/Tests/Writers/HTML.hs
@@ -4,6 +4,7 @@ module Tests.Writers.HTML (tests) where
 import Data.Text (unpack)
 import qualified Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -33,7 +34,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test html
 
diff --git a/test/Tests/Writers/JATS.hs b/test/Tests/Writers/JATS.hs
index e605f55e1..8abf33fe2 100644
--- a/test/Tests/Writers/JATS.hs
+++ b/test/Tests/Writers/JATS.hs
@@ -3,6 +3,7 @@ module Tests.Writers.JATS (tests) where
 
 import Data.Text (Text)
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -31,7 +32,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, Text) -> TestTree
 (=:) = test jats
 
diff --git a/test/Tests/Writers/LaTeX.hs b/test/Tests/Writers/LaTeX.hs
index ae5879099..3496fccbc 100644
--- a/test/Tests/Writers/LaTeX.hs
+++ b/test/Tests/Writers/LaTeX.hs
@@ -3,6 +3,7 @@ module Tests.Writers.LaTeX (tests) where
 
 import Data.Text (unpack)
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -33,7 +34,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test latex
 
diff --git a/test/Tests/Writers/Markdown.hs b/test/Tests/Writers/Markdown.hs
index d4f927ebe..7c6f7edfb 100644
--- a/test/Tests/Writers/Markdown.hs
+++ b/test/Tests/Writers/Markdown.hs
@@ -4,6 +4,7 @@ module Tests.Writers.Markdown (tests) where
 
 import Data.Text (unpack)
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -33,7 +34,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test markdown
 
@@ -182,7 +183,7 @@ noteTests = testGroup "note and reference location"
 shortcutLinkRefsTests :: TestTree
 shortcutLinkRefsTests =
   let infix 4 =:
-      (=:) :: (ToString a, ToPandoc a)
+      (=:) :: (ToString a, ToPandoc a, HasCallStack)
 
         => String -> (a, String) -> TestTree
       (=:) = test (purely (writeMarkdown defopts{writerReferenceLinks = True}) . toPandoc)
diff --git a/test/Tests/Writers/Markua.hs b/test/Tests/Writers/Markua.hs
index 62239f3da..52fe93711 100644
--- a/test/Tests/Writers/Markua.hs
+++ b/test/Tests/Writers/Markua.hs
@@ -2,6 +2,7 @@
 module Tests.Writers.Markua (tests) where
 
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -20,7 +21,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test (purely (writeMarkua def) . toPandoc)
 
diff --git a/test/Tests/Writers/Ms.hs b/test/Tests/Writers/Ms.hs
index ad6849633..ad4244cc9 100644
--- a/test/Tests/Writers/Ms.hs
+++ b/test/Tests/Writers/Ms.hs
@@ -2,12 +2,13 @@
 module Tests.Writers.Ms (tests) where
 
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Builder
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test (purely (writeMs def . toPandoc))
 
diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs
index 5bddca3af..952b44f9c 100644
--- a/test/Tests/Writers/Muse.hs
+++ b/test/Tests/Writers/Muse.hs
@@ -4,6 +4,7 @@ module Tests.Writers.Muse (tests) where
 import Prelude hiding (unlines)
 import Data.Text (Text, unlines)
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -21,7 +22,7 @@ museWithOpts :: (ToPandoc a) => WriterOptions -> a -> Text
 museWithOpts opts = purely (writeMuse opts) . toPandoc
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, Text) -> TestTree
 (=:) = test muse
 
diff --git a/test/Tests/Writers/Org.hs b/test/Tests/Writers/Org.hs
index 240bb27e8..4c79995d4 100644
--- a/test/Tests/Writers/Org.hs
+++ b/test/Tests/Writers/Org.hs
@@ -3,13 +3,14 @@ module Tests.Writers.Org (tests) where
 
 import Data.Text as T
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
 import Text.Pandoc.Builder
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, Text) -> TestTree
 (=:) = test org
 
diff --git a/test/Tests/Writers/Plain.hs b/test/Tests/Writers/Plain.hs
index 17edc9dbd..98edf7a2e 100644
--- a/test/Tests/Writers/Plain.hs
+++ b/test/Tests/Writers/Plain.hs
@@ -2,6 +2,7 @@
 module Tests.Writers.Plain (tests) where
 
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -9,7 +10,7 @@ import Text.Pandoc.Builder
 
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test (purely (writePlain def{ writerExtensions =
                           enableExtension Ext_gutenberg plainExtensions }) .
diff --git a/test/Tests/Writers/RST.hs b/test/Tests/Writers/RST.hs
index 94745e9a2..28b04e55f 100644
--- a/test/Tests/Writers/RST.hs
+++ b/test/Tests/Writers/RST.hs
@@ -12,7 +12,7 @@ import Text.Pandoc.Writers.RST
 import qualified Data.Text as T
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test (purely (writeRST def . toPandoc))
 
diff --git a/test/Tests/Writers/TEI.hs b/test/Tests/Writers/TEI.hs
index fa372909f..a5a890a04 100644
--- a/test/Tests/Writers/TEI.hs
+++ b/test/Tests/Writers/TEI.hs
@@ -2,6 +2,7 @@
 module Tests.Writers.TEI (tests) where
 
 import Test.Tasty
+import Test.Tasty.HUnit (HasCallStack)
 import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
@@ -20,7 +21,7 @@ which is in turn shorthand for
 -}
 
 infix 4 =:
-(=:) :: (ToString a, ToPandoc a)
+(=:) :: (ToString a, ToPandoc a, HasCallStack)
      => String -> (a, String) -> TestTree
 (=:) = test (purely (writeTEI def) . toPandoc)