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

Fix compareXML helper in Tests.Writers.OOXML.

Browse source 
Given how it is used, we were getting "mine" and "good"
flipped in the test results.
This commit is contained in:
John MacFarlane 2021-10-02 06:51:21 -07:00
parent fb0d6c7cb6
commit 6ff04ac52d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/Tests/Writers/OOXML.hs
View file

@ -23,15 +23,15 @@ compareXML :: Content -> Content -> Maybe XMLDifference
-- We make a special exception for times at the moment, and just pass
-- them because we can't control the utctime when running IO. Besides,
-- so long as we have two times, we're okay.
compareXML (Elem myElem) (Elem goodElem)
compareXML (Elem goodElem) (Elem myElem)
| (QName "created" _ (Just "dcterms")) <- elName myElem
, (QName "created" _ (Just "dcterms")) <- elName goodElem =
Nothing
compareXML (Elem myElem) (Elem goodElem)
compareXML (Elem goodElem) (Elem myElem)
| (QName "modified" _ (Just "dcterms")) <- elName myElem
, (QName "modified" _ (Just "dcterms")) <- elName goodElem =
Nothing
compareXML (Elem myElem) (Elem goodElem) =
compareXML (Elem goodElem) (Elem myElem) =
(if elName myElem == elName goodElem
then Nothing
else Just
@ -46,16 +46,16 @@ compareXML (Elem myElem) (Elem goodElem) =
, good = sort (elAttribs goodElem)
})))
<|> asum (zipWith compareXML (elContent myElem) (elContent goodElem))
compareXML (Text myCData) (Text goodCData) =
compareXML (Text goodCData) (Text myCData) =
(if cdVerbatim myCData == cdVerbatim goodCData
&& cdData myCData == cdData goodCData
then Nothing
else Just (CDatasDiffer (Comparison { mine = myCData, good = goodCData })))
compareXML (CRef myStr) (CRef goodStr) =
compareXML (CRef goodStr) (CRef myStr) =
if myStr == goodStr
then Nothing
else Just (CRefsDiffer (Comparison { mine = myStr, good = goodStr }))
compareXML m g = Just (OtherContentsDiffer (Comparison {mine = m, good = g}))
compareXML g m = Just (OtherContentsDiffer (Comparison {mine = m, good = g}))
data XMLDifference
= ElemNamesDiffer (Comparison QName)