Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unit tests after XML format change

Browse Source
This commit is contained in:
Nick Hall 2014-05-15 01:17:42 +01:00
parent afd154a19e
commit 98aaf8feab
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gramps/gen/merge/test/merge_ref_test.py
View File

@ -260,13 +260,11 @@ class PersonCheck(BaseMergeCheck):
</source> </source>
</sources> </sources>
<places> <places>
<placeobj handle="_p0000" id="P0000"> <placeobj handle="_p0000" id="P0000" name="Place 0" type="Country">
<ptitle>Place 0</ptitle> <ptitle>Place 0</ptitle>
<type>Country</type>
</placeobj> </placeobj>
<placeobj handle="_p0001" id="P0001"> <placeobj handle="_p0001" id="P0001" name="Place 1" type="Country">
<ptitle>Place 1</ptitle> <ptitle>Place 1</ptitle>
<type>Country</type>
</placeobj> </placeobj>
</places> </places>
<objects> <objects>
@ -311,6 +309,8 @@ class PersonCheck(BaseMergeCheck):
placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0001']")[0] placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0001']")[0]
placeobj.unlinkNode() placeobj.unlinkNode()
placeobj.freeNode() placeobj.freeNode()
placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0000']")[0]
placeobj.newChild(None, 'alt_name', 'Place 1')
self.do_test('P0000', 'P0001', self.basedoc, expect) self.do_test('P0000', 'P0001', self.basedoc, expect)
def test_citation_merge(self): def test_citation_merge(self):
@ -413,13 +413,11 @@ class FamilyCheck(BaseMergeCheck):
</source> </source>
</sources> </sources>
<places> <places>
<placeobj handle="_p0000" id="P0000"> <placeobj handle="_p0000" id="P0000" name="Place 0" type="Country">
<ptitle>Place 0</ptitle> <ptitle>Place 0</ptitle>
<type>Country</type>
</placeobj> </placeobj>
<placeobj handle="_p0001" id="P0001"> <placeobj handle="_p0001" id="P0001" name="Place 1" type="Country">
<ptitle>Place 1</ptitle> <ptitle>Place 1</ptitle>
<type>Country</type>
</placeobj> </placeobj>
</places> </places>
<objects> <objects>
@ -464,6 +462,8 @@ class FamilyCheck(BaseMergeCheck):
placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0001']")[0] placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0001']")[0]
placeobj.unlinkNode() placeobj.unlinkNode()
placeobj.freeNode() placeobj.freeNode()
placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0000']")[0]
placeobj.newChild(None, 'alt_name', 'Place 1')
self.do_test('P0000', 'P0001', self.basedoc, expect) self.do_test('P0000', 'P0001', self.basedoc, expect)
def test_citation_merge(self): def test_citation_merge(self):
@ -552,13 +552,11 @@ class EventCheck(BaseMergeCheck):
</source> </source>
</sources> </sources>
<places> <places>
<placeobj handle="_p0000" id="P0000"> <placeobj handle="_p0000" id="P0000" name="Place 0" type = "Country">
<ptitle>Place 0</ptitle> <ptitle>Place 0</ptitle>
<type>Country</type>
</placeobj> </placeobj>
<placeobj handle="_p0001" id="P0001"> <placeobj handle="_p0001" id="P0001" name="Place 1" type = "Country">
<ptitle>Place 1</ptitle> <ptitle>Place 1</ptitle>
<type>Country</type>
</placeobj> </placeobj>
</places> </places>
<objects> <objects>
@ -591,6 +589,8 @@ class EventCheck(BaseMergeCheck):
placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0001']")[0] placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0001']")[0]
placeobj.unlinkNode() placeobj.unlinkNode()
placeobj.freeNode() placeobj.freeNode()
placeobj = ctxt.xpathEval("//g:placeobj[@handle='_p0000']")[0]
placeobj.newChild(None, 'alt_name', 'Place 1')
self.do_test('P0000', 'P0001', self.basedoc, expect) self.do_test('P0000', 'P0001', self.basedoc, expect)
def test_citation_merge(self): def test_citation_merge(self):
@ -661,16 +661,14 @@ class PlaceCheck(BaseMergeCheck):
</source> </source>
</sources> </sources>
<places> <places>
<placeobj handle="_p0000" id="P0000"> <placeobj handle="_p0000" id="P0000" name="Place 0" type = "Country">
<ptitle>Place 0</ptitle> <ptitle>Place 0</ptitle>
<type>Country</type>
<objref hlink="_o0000"/> <objref hlink="_o0000"/>
<noteref hlink="_n0000"/> <noteref hlink="_n0000"/>
<citationref hlink="_c0000"/> <citationref hlink="_c0000"/>
</placeobj> </placeobj>
<placeobj handle="_p0001" id="P0001"> <placeobj handle="_p0001" id="P0001" name="Place 1" type = "Country">
<ptitle>Place 1</ptitle> <ptitle>Place 1</ptitle>
<type>Country</type>
<objref hlink="_o0001"/> <objref hlink="_o0001"/>
<noteref hlink="_n0001"/> <noteref hlink="_n0001"/>
<citationref hlink="_c0001"/> <citationref hlink="_c0001"/>