@@ -30,17 +30,15 @@ compareXMLBool (Elem myElem) (Elem goodElem)
3030 , (QName "modified" _ (Just "dcterms")) <- elName goodElem =
3131 True
3232compareXMLBool (Elem myElem) (Elem goodElem) =
33− and [ elName myElem == elName goodElem
34− , elAttribs myElem == elAttribs goodElem
35− , and $
36− map (uncurry compareXMLBool) $
37− zip (elContent myElem) (elContent goodElem)
38− ]
33+ elName myElem == elName goodElem &&
34+ elAttribs myElem == elAttribs goodElem &&
35+ and (zipWith compareXMLBool (elContent myElem) (elContent goodElem))
36+
3937compareXMLBool (Text myCData) (Text goodCData) =
40− and [ cdVerbatim myCData == cdVerbatim goodCData
41− , cdData myCData == cdData goodCData
42− , cdLine myCData == cdLine goodCData
43− ]
38+ cdVerbatim myCData == cdVerbatim goodCData &&
39+ cdData myCData == cdData goodCData &&
40+ cdLine myCData == cdLine goodCData
41+
4442compareXMLBool (CRef myStr) (CRef goodStr) =
4543 myStr == goodStr
4644compareXMLBool _ _ = False
@@ -102,10 +100,10 @@ compareXMLFile' fp goldenArch testArch = do
102100 Nothing -> Left $
103101 "Can't parse xml in " ++ fp ++ " from archive in stored pptx file"
104102
105− let testContent = Elem $ testXMLDoc
106− goldenContent = Elem $ goldenXMLDoc
103+ let testContent = Elem testXMLDoc
104+ goldenContent = Elem goldenXMLDoc
107105
108− if (compareXMLBool goldenContent testContent)
106+ if compareXMLBool goldenContent testContent
109107 then Right ()
110108 else Left $
111109 "Non-matching xml in " ++ fp ++ ":\n" ++ displayDiff testContent goldenContent
@@ -141,7 +139,7 @@ compareMediaFile' fp goldenArch testArch = do
141139 Nothing -> Left $
142140 "Can't extract " ++ fp ++ " from archive in stored pptx file"
143141
144− if (fromEntry testEntry == fromEntry goldenEntry)
142+ if fromEntry testEntry == fromEntry goldenEntry
145143 then Right ()
146144 else Left $
147145 "Non-matching binary file: " ++ fp