git.iko.soy/typeable/pandoc
on master help sign in
Powerpoint writer tests: hlint cleanups.
f0671bfJesse Rosenthal
test/Tests/Writers/Powerpoint.hs+12−14
compare with master
unifiedsplit
@@ -30,17 +30,15 @@ compareXMLBool (Elem myElem) (Elem goodElem)
30 , (QName "modified" _ (Just "dcterms")) <- elName goodElem =
30 , (QName "modified" _ (Just "dcterms")) <- elName goodElem =
31 True
31 True
32compareXMLBool (Elem myElem) (Elem goodElem) =
32compareXMLBool (Elem myElem) (Elem goodElem) =
33− and [ elName myElem == elName goodElem
33+ elName myElem == elName goodElem &&
34− , elAttribs myElem == elAttribs goodElem
34+ elAttribs myElem == elAttribs goodElem &&
35− , and $
36− map (uncurry compareXMLBool) $
37− zip (elContent myElem) (elContent goodElem)
35+ and (zipWith compareXMLBool (elContent myElem) (elContent goodElem))
38− ]
36+
39compareXMLBool (Text myCData) (Text goodCData) =
37compareXMLBool (Text myCData) (Text goodCData) =
40− and [ cdVerbatim myCData == cdVerbatim goodCData
38+ cdVerbatim myCData == cdVerbatim goodCData &&
41− , cdData myCData == cdData goodCData
39+ cdData myCData == cdData goodCData &&
42− , cdLine myCData == cdLine goodCData
40+ cdLine myCData == cdLine goodCData
43− ]
41+
44compareXMLBool (CRef myStr) (CRef goodStr) =
42compareXMLBool (CRef myStr) (CRef goodStr) =
45 myStr == goodStr
43 myStr == goodStr
46compareXMLBool _ _ = False
44compareXMLBool _ _ = False
@@ -102,10 +100,10 @@ compareXMLFile' fp goldenArch testArch = do
102 Nothing -> Left $
100 Nothing -> Left $
103 "Can't parse xml in " ++ fp ++ " from archive in stored pptx file"
101 "Can't parse xml in " ++ fp ++ " from archive in stored pptx file"
104
102
105− let testContent = Elem $ testXMLDoc
103+ let testContent = Elem testXMLDoc
106− goldenContent = Elem $ goldenXMLDoc
104+ goldenContent = Elem goldenXMLDoc
107
105
108− if (compareXMLBool goldenContent testContent)
106+ if compareXMLBool goldenContent testContent
109 then Right ()
107 then Right ()
110 else Left $
108 else Left $
111 "Non-matching xml in " ++ fp ++ ":\n" ++ displayDiff testContent goldenContent
109 "Non-matching xml in " ++ fp ++ ":\n" ++ displayDiff testContent goldenContent
@@ -141,7 +139,7 @@ compareMediaFile' fp goldenArch testArch = do
141 Nothing -> Left $
139 Nothing -> Left $
142 "Can't extract " ++ fp ++ " from archive in stored pptx file"
140 "Can't extract " ++ fp ++ " from archive in stored pptx file"
143
141
144− if (fromEntry testEntry == fromEntry goldenEntry)
142+ if fromEntry testEntry == fromEntry goldenEntry
145 then Right ()
143 then Right ()
146 else Left $
144 else Left $
147 "Non-matching binary file: " ++ fp
145 "Non-matching binary file: " ++ fp