Add error support in HTML5.

[doclang.git] / test / Golden.hs

diff --git a/test/Golden.hs b/test/Golden.hs
index 35444b39d47f9c6b8ef8c2ab1ce8e7df8dc74fcc..3af4faffac7753d4b8da83cb496e9f68006c754f 100644 (file)
--- a/test/Golden.hs
+++ b/test/Golden.hs
@@ -69,12 +69,9 @@ goldensIO = do
 
 -- * 'TCT' tests
 readTCT :: FilePath -> IO (Either String TCT.Roots)
-readTCT inputFile = do
-       txt <- BSL.readFile inputFile
-       return $
-               left show $
-               TCT.readTCT inputFile $
-               TL.decodeUtf8 txt
+readTCT inputFile =
+       left show <$>
+       TCT.readTCT inputFile
 
 goldensTCT :: [FilePath] -> TestTree
 goldensTCT inputFiles =
@@ -90,7 +87,7 @@ goldensTCT inputFiles =
                 | inputFile <- inputFiles
                 ]
         , testGroup "Plain"
-                [ testGolden inputFile "" $
+                [ testGolden inputFile ".plain" $
                        readTCT inputFile >>= \ast ->
                                return $
                                        TL.encodeUtf8
@@ -152,7 +149,7 @@ goldensDTC inputFiles =
                 [ testGolden inputFile (".dtc"<>"."<>lang<>".xml") $
                        readDTC inputFile >>= \dtc ->
                                return $
-                                       Blaze.prettyMarkup Blaze.DTC.indentTag
+                                       Blaze.prettyMarkup Blaze.DTC.isInlinedElement
                                         . DTC.Write.XML.document locale
                                         <$> dtc
                 | inputFile <- inputFiles
@@ -161,7 +158,7 @@ goldensDTC inputFiles =
                 [ testGolden inputFile (".dtc"<>"."<>lang<>".html5") $
                        readDTC inputFile >>= \dtc ->
                                return $
-                                       Blaze.prettyMarkup Blaze.DTC.indentTag
+                                       Blaze.prettyMarkup Blaze.DTC.isInlinedElement
                                         . DTC.Write.HTML5.document locale
                                         <$> dtc
                 | inputFile <- inputFiles