Tests.Helpers: export testGolden and use it in RTF reader.

This gives a diff output on failure.

1 files changed, 5 insertions, 12 deletions

diff --git a/test/Tests/Readers/RTF.hs b/test/Tests/Readers/RTF.hs
index da0ddfc93..1b335274b 100644
--- a/test/Tests/Readers/RTF.hs
+++ b/test/Tests/Readers/RTF.hs
@@ -13,25 +13,18 @@ module Tests.Readers.RTF (tests) where
 
 import Test.Tasty
 import Tests.Helpers
-import Test.Tasty.Golden (goldenVsString)
-import qualified Data.ByteString as BS
 import Text.Pandoc
-import Text.Pandoc.UTF8 (toText, fromStringLazy)
-import Data.Text (Text, unpack)
 import System.FilePath (replaceExtension, (</>), (<.>))
 
-rtfToNative :: Text -> Text
-rtfToNative =
-  purely (writeNative def{ writerTemplate = Just mempty }) .
-    purely (readRTF def)
-
 rtfTest :: TestName -> TestTree
-rtfTest name = goldenVsString name native
-  (fromStringLazy . filter (/='\r') . unpack . rtfToNative . toText
-    <$> BS.readFile path)
+rtfTest name = testGolden name native path
+   (\t -> runIOorExplode
+            (readRTF def t >>=
+              writeNative def{ writerTemplate = Just mempty }))
   where native = replaceExtension path ".native"
         path = "rtf" </> name <.> "rtf"
 
+
 tests :: [TestTree]
 tests = map rtfTest [ "footnote"
                     , "accent"