From ceb742b1246f975437d7a0083139d248c94036b5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenthal Date: Thu, 19 Jun 2014 12:05:16 -0400 Subject: Add ReaderOptions to the docx tests This will allow for testing different media embedding (in addition to any other applicable options.) --- tests/Tests/Readers/Docx.hs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'tests/Tests/Readers/Docx.hs') diff --git a/tests/Tests/Readers/Docx.hs b/tests/Tests/Readers/Docx.hs index 0a963ddc6..273f03f4d 100644 --- a/tests/Tests/Readers/Docx.hs +++ b/tests/Tests/Readers/Docx.hs @@ -8,20 +8,23 @@ import Test.Framework import qualified Data.ByteString.Lazy as B import Text.Pandoc.Readers.Docx -compareOutput :: FilePath -> FilePath -> IO (Pandoc, Pandoc) -compareOutput docxFile nativeFile = do +compareOutput :: ReaderOptions -> FilePath -> FilePath -> IO (Pandoc, Pandoc) +compareOutput opts docxFile nativeFile = do df <- B.readFile docxFile nf <- Prelude.readFile nativeFile - return $ (readDocx def df, readNative nf) + return $ (readDocx opts df, readNative nf) -testCompare' :: String -> FilePath -> FilePath -> IO Test -testCompare' name docxFile nativeFile = do - (dp, np) <- compareOutput docxFile nativeFile +testCompareWithOptsIO :: ReaderOptions -> String -> FilePath -> FilePath -> IO Test +testCompareWithOptsIO opts name docxFile nativeFile = do + (dp, np) <- compareOutput opts docxFile nativeFile return $ test id name (dp, np) +testCompareWithOpts :: ReaderOptions -> String -> FilePath -> FilePath -> Test +testCompareWithOpts opts name docxFile nativeFile = + buildTest $ testCompareWithOptsIO opts name docxFile nativeFile + testCompare :: String -> FilePath -> FilePath -> Test -testCompare name docxFile nativeFile = - buildTest $ testCompare' name docxFile nativeFile +testCompare = testCompareWithOpts def tests :: [Test] -- cgit v1.2.3