From 18e85f8dfbf9323945969cdf831c9a16f90299a0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 27 Nov 2016 16:38:46 +0100 Subject: Changed readNative to use PandocMonad. --- tests/Tests/Readers/Docx.hs | 4 +++- tests/Tests/Readers/Odt.hs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/Tests/Readers') diff --git a/tests/Tests/Readers/Docx.hs b/tests/Tests/Readers/Docx.hs index 3e630dd49..59147b664 100644 --- a/tests/Tests/Readers/Docx.hs +++ b/tests/Tests/Readers/Docx.hs @@ -14,6 +14,7 @@ import qualified Data.Map as M import Text.Pandoc.MediaBag (MediaBag, lookupMedia, mediaDirectory) import Codec.Archive.Zip import Text.Pandoc.Error +import Text.Pandoc.Class (runIOorExplode) -- We define a wrapper around pandoc that doesn't normalize in the -- tests. Since we do our own normalization, we want to make sure @@ -43,7 +44,8 @@ compareOutput opts docxFile nativeFile = do df <- B.readFile docxFile nf <- Prelude.readFile nativeFile let (p, _) = handleError $ readDocx opts df - return $ (noNorm p, noNorm (handleError $ readNative nf)) + df' <- runIOorExplode $ readNative nf + return $ (noNorm p, noNorm $ handleError df') testCompareWithOptsIO :: ReaderOptions -> String -> FilePath -> FilePath -> IO Test testCompareWithOptsIO opts name docxFile nativeFile = do diff --git a/tests/Tests/Readers/Odt.hs b/tests/Tests/Readers/Odt.hs index dff62c54b..0ff527130 100644 --- a/tests/Tests/Readers/Odt.hs +++ b/tests/Tests/Readers/Odt.hs @@ -5,6 +5,7 @@ import Text.Pandoc.Options import Text.Pandoc.Readers.Native import Text.Pandoc.Readers.Markdown import Text.Pandoc.Definition +import Text.Pandoc.Class (runIOorExplode) import Tests.Helpers import Test.Framework import qualified Data.ByteString.Lazy as B @@ -62,7 +63,8 @@ compareOdtToNative :: TestCreator compareOdtToNative opts odtPath nativePath = do nativeFile <- Prelude.readFile nativePath odtFile <- B.readFile odtPath - let native = getNoNormVia id "native" $ readNative nativeFile + native <- getNoNormVia id "native" <$> + runIOorExplode (readNative nativeFile) let odt = getNoNormVia fst "odt" $ readOdt opts odtFile return (odt,native) -- cgit v1.2.3