Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Powerpoint writer tests: hlint cleanups.

Browse source
This commit is contained in:
Jesse Rosenthal 2018-01-23 13:25:20 -05:00
parent be929bcc80
commit f0671bf4c7
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
test/Tests/Writers/Powerpoint.hs
View file

@ -30,17 +30,15 @@ compareXMLBool (Elem myElem) (Elem goodElem)
, (QName "modified" _ (Just "dcterms")) <- elName goodElem =
True
compareXMLBool (Elem myElem) (Elem goodElem) =
and [ elName myElem == elName goodElem
, elAttribs myElem == elAttribs goodElem
, and $
map (uncurry compareXMLBool) $
zip (elContent myElem) (elContent goodElem)
]
elName myElem == elName goodElem &&
elAttribs myElem == elAttribs goodElem &&
and (zipWith compareXMLBool (elContent myElem) (elContent goodElem))
compareXMLBool (Text myCData) (Text goodCData) =
and [ cdVerbatim myCData == cdVerbatim goodCData
, cdData myCData == cdData goodCData
, cdLine myCData == cdLine goodCData
]
cdVerbatim myCData == cdVerbatim goodCData &&
cdData myCData == cdData goodCData &&
cdLine myCData == cdLine goodCData
compareXMLBool (CRef myStr) (CRef goodStr) =
myStr == goodStr
compareXMLBool _ _ = False
@ -102,10 +100,10 @@ compareXMLFile' fp goldenArch testArch = do
Nothing -> Left $
"Can't parse xml in " ++ fp ++ " from archive in stored pptx file"
let testContent = Elem $ testXMLDoc
goldenContent = Elem $ goldenXMLDoc
let testContent = Elem testXMLDoc
goldenContent = Elem goldenXMLDoc
if (compareXMLBool goldenContent testContent)
if compareXMLBool goldenContent testContent
then Right ()
else Left $
"Non-matching xml in " ++ fp ++ ":\n" ++ displayDiff testContent goldenContent
@ -141,7 +139,7 @@ compareMediaFile' fp goldenArch testArch = do
Nothing -> Left $
"Can't extract " ++ fp ++ " from archive in stored pptx file"
if (fromEntry testEntry == fromEntry goldenEntry)
if fromEntry testEntry == fromEntry goldenEntry
then Right ()
else Left $
"Non-matching binary file: " ++ fp