From cfb3b2cc84c7ae3ef1e73a3bbefa25795f5bdaee Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 3 Jan 2015 10:27:39 -0500 Subject: [PATCH] Renamed test methods for proper automatic detection --- gramps/gen/utils/test/keyword_test.py | 12 +- .../plugins/export/test/exportvcard_test.py | 48 ++++---- .../plugins/importer/test/importvcard_test.py | 104 +++++++++--------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/gramps/gen/utils/test/keyword_test.py b/gramps/gen/utils/test/keyword_test.py index 5ca4ba303..fde60f381 100644 --- a/gramps/gen/utils/test/keyword_test.py +++ b/gramps/gen/utils/test/keyword_test.py @@ -27,29 +27,29 @@ from ..keyword import (KEYWORDS, get_translation_from_keyword, class TestCase(unittest.TestCase): - def keyword_test(self, item1, item2): + def keyword_case(self, item1, item2): result = get_translation_from_keyword(item1) self.assertEqual(result, item2) - def translation_test(self, item1, item2): + def translation_case(self, item1, item2): result = get_keyword_from_translation(item1) self.assertEqual(result, item2) def test_from_keyword(self): for keyword, code, standard, upper in KEYWORDS: - self.keyword_test(keyword, standard) + self.keyword_case(keyword, standard) def test_from_translation(self): for keyword, code, standard, upper in KEYWORDS: - self.translation_test(standard, keyword) + self.translation_case(standard, keyword) def test_from_lower(self): for keyword, code, standard, upper in KEYWORDS: - self.translation_test(standard.lower(), keyword) + self.translation_case(standard.lower(), keyword) def test_from_upper(self): for keyword, code, standard, upper in KEYWORDS: - self.translation_test(upper, keyword.upper()) + self.translation_case(upper, keyword.upper()) if __name__ == "__main__": diff --git a/gramps/plugins/export/test/exportvcard_test.py b/gramps/plugins/export/test/exportvcard_test.py index b83c0d264..82a274591 100644 --- a/gramps/plugins/export/test/exportvcard_test.py +++ b/gramps/plugins/export/test/exportvcard_test.py @@ -68,7 +68,7 @@ class VCardCheck(unittest.TestCase): self.name = self.person[0] self.lastname = self.name[0] - def do_test(self, input_doc, expect_str, debug=False): + def do_case(self, input_doc, expect_str, debug=False): if debug: print(ET.tostring(input_doc)) @@ -92,7 +92,7 @@ class VCardCheck(unittest.TestCase): self.assertEqual(result_str, expect_str.encode('utf-8')) def test_base(self): - self.do_test(self.database, + self.do_case(self.database, self.expect) def test_esc_string_none(self): @@ -118,7 +118,7 @@ class VCardCheck(unittest.TestCase): ET.SubElement(self.name, "title").text = 'Sir.' self.expect[3] = "FN:Sir. Lastname" self.expect[4] = "N:Lastname;;;Sir.;" - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_multiple_surname(self): self.lastname.text = "Oranje" @@ -127,7 +127,7 @@ class VCardCheck(unittest.TestCase): self.expect[3] = "FN:van Oranje Nassau" self.expect[4] = "N:van Oranje,Nassau;;;;" self.expect[5] = "SORT-STRING:" + "Oranje".ljust(55) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_callname(self): # callname not in first names! @@ -136,7 +136,7 @@ class VCardCheck(unittest.TestCase): self.expect[3] = "FN:B C Lastname" self.expect[4] = "N:Lastname;A;B,C;;" self.expect[5] = "SORT-STRING:" + "Lastname".ljust(25) + "B C".ljust(30) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_callname_in_addnames(self): ET.SubElement(self.name, "first").text = "A B C" @@ -144,35 +144,35 @@ class VCardCheck(unittest.TestCase): self.expect[3] = "FN:A B C Lastname" self.expect[4] = "N:Lastname;B;A,C;;" self.expect[5] = "SORT-STRING:" + "Lastname".ljust(25) + "A B C".ljust(30) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_no_callname(self): ET.SubElement(self.name, "first").text = "A B C" self.expect[3] = "FN:A B C Lastname" self.expect[4] = "N:Lastname;A;B,C;;" self.expect[5] = "SORT-STRING:" + "Lastname".ljust(25) + "A B C".ljust(30) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_no_additional_names(self): ET.SubElement(self.name, "first").text = "A" self.expect[3] = "FN:A Lastname" self.expect[4] = "N:Lastname;A;;;" self.expect[5] = "SORT-STRING:" + "Lastname".ljust(25) + "A".ljust(30) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_honprefix(self): ET.SubElement(self.name, "title").text = "Sir" self.expect[3] = "FN:Sir Lastname" self.expect[4] = "N:Lastname;;;Sir;" self.expect[5] = "SORT-STRING:" + "Lastname".ljust(55) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_name_honsuffix(self): ET.SubElement(self.name, "suffix").text = "Jr." self.expect[3] = "FN:Lastname\, Jr." self.expect[4] = "N:Lastname;;;;Jr." self.expect[5] = "SORT-STRING:" + "Lastname".ljust(55)+ "Jr." - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_nicknames_regular(self): @@ -182,7 +182,7 @@ class VCardCheck(unittest.TestCase): name = ET.SubElement(self.person, "name", attrib=attribs) ET.SubElement(name, 'nick').text = 'N.' self.expect.insert(6, "NICKNAME:Nick,N.") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_nicknames_primary_nick(self): ET.SubElement(self.name, 'nick').text = 'Nick' @@ -190,7 +190,7 @@ class VCardCheck(unittest.TestCase): name = ET.SubElement(self.person, "name", attrib=attribs) ET.SubElement(name, 'nick').text = 'N.' self.expect.insert(6, "NICKNAME:Nick,N.") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_birthdate_regular(self): events = ET.Element('events') @@ -202,7 +202,7 @@ class VCardCheck(unittest.TestCase): attribs = {'hlink': '_e0000', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) self.expect.insert(6, "BDAY:2001-02-28") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_birthdate_empty(self): events = ET.Element('events') @@ -212,7 +212,7 @@ class VCardCheck(unittest.TestCase): ET.SubElement(event, 'type').text = 'Birth' attribs = {'hlink': '_e0000', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_birhtdate_textonly(self): events = ET.Element('events') @@ -223,7 +223,7 @@ class VCardCheck(unittest.TestCase): ET.SubElement(event, 'dateval', val='Christmas 2001') attribs = {'hlink': '_e0000', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_birthdate_span(self): events = ET.Element('events') @@ -235,7 +235,7 @@ class VCardCheck(unittest.TestCase): ET.SubElement(event, 'datespan', attrib=attribs) attribs = {'hlink': '_e0000', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_birthdate_range(self): events = ET.Element('events') @@ -247,7 +247,7 @@ class VCardCheck(unittest.TestCase): ET.SubElement(event, 'daterange', attrib=attribs) attribs = {'hlink': '_e0000', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_addresses_regular(self): address = ET.SubElement(self.person, 'address') @@ -257,31 +257,31 @@ class VCardCheck(unittest.TestCase): ET.SubElement(address, 'state').text = 'province' ET.SubElement(address, 'postal').text = 'zip' self.expect.insert(6, "ADR:;;pobox bis street;place;province;zip;country") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_addresses_phone(self): address = ET.SubElement(self.person, 'address') ET.SubElement(address, 'phone').text = '01234-56789' self.expect.insert(6, "TEL:01234-56789") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_urls_email(self): attribs = {'type': 'E-mail', 'href': 'me@example.com'} ET.SubElement(self.person, 'url', attrib=attribs) self.expect.insert(6, "EMAIL:me@example.com") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_urls_emial_mailto(self): attribs = {'type': 'E-mail', 'href': 'mailto:me@example.com'} ET.SubElement(self.person, 'url', attrib=attribs) self.expect.insert(6, "EMAIL:me@example.com") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_urls_url(self): attribs = {'type': 'Web Home', 'href': 'http://www.example.org'} ET.SubElement(self.person, 'url', attrib=attribs) self.expect.insert(6, "URL:http://www.example.org") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_occupation_regular(self): events = ET.Element('events') @@ -293,7 +293,7 @@ class VCardCheck(unittest.TestCase): attribs = {'hlink': '_e0000', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) self.expect.insert(6, "ROLE:carpenter") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) def test_write_occupation_lastdate(self): events = ET.Element('events') @@ -313,7 +313,7 @@ class VCardCheck(unittest.TestCase): attribs = {'hlink': '_e0001', 'role': 'Primary'} ET.SubElement(self.person, 'eventref', attrib=attribs) self.expect.insert(6, "ROLE:foreman") - self.do_test(self.database, self.expect) + self.do_case(self.database, self.expect) if __name__ == "__main__": unittest.main() diff --git a/gramps/plugins/importer/test/importvcard_test.py b/gramps/plugins/importer/test/importvcard_test.py index 0c07aec82..e42f03187 100644 --- a/gramps/plugins/importer/test/importvcard_test.py +++ b/gramps/plugins/importer/test/importvcard_test.py @@ -22,7 +22,7 @@ Unittest of import of VCard """ -# in case of a failing test, add True as last parameter to do_test to see the output. +# in case of a failing test, add True as last parameter to do_case to see the output. from __future__ import print_function @@ -74,7 +74,7 @@ class VCardCheck(unittest.TestCase): return ET.tostring(doc, encoding='utf-8') - def do_test(self, input_str, expect_doc, debug=False): + def do_case(self, input_str, expect_doc, debug=False): if debug: print(input_str) @@ -97,7 +97,7 @@ class VCardCheck(unittest.TestCase): self.canonicalize(expect_doc)) def test_base(self): - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_splitof_nameprefix_noprefix(self): self.assertEqual(splitof_nameprefix("Noprefix"), ('',"Noprefix")) @@ -123,18 +123,18 @@ class VCardCheck(unittest.TestCase): def test_name_value_split_begin_colon(self): self.vcard.insert(4, ":email@example.com") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_name_value_split_quoted_colon(self): self.vcard.insert(4, 'TEL;TYPE="FANCY:TYPE":01234-56789') address = ET.SubElement(self.person, "address") ET.SubElement(address, 'phone').text = '01234-56789' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_name_value_split_grouped(self): self.vcard[1] = "group." + self.vcard[1] self.vcard[3] = "group." + self.vcard[3] - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_unesc_string(self): self.assertEqual(VCardParser.unesc("TEL:012\\\\345\\,67\\;89"), @@ -176,38 +176,38 @@ class VCardCheck(unittest.TestCase): self.vcard.insert(4, "TEL:01234-\r\n 56789") address = ET.SubElement(self.person, "address") ET.SubElement(address, 'phone').text = '01234-56789' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_get_next_line_cr(self): self.vcard.insert(4, "TEL:01234-56789\r") address = ET.SubElement(self.person, "address") ET.SubElement(address, 'phone').text = '01234-56789' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_get_next_line_strip(self): self.vcard.insert(4, "TEL:01234-56789 ") address = ET.SubElement(self.person, "address") ET.SubElement(address, 'phone').text = '01234-56789' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_get_next_line_none(self): self.vcard.insert(4, "") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_parse_vCard_file_no_colon(self): self.vcard.insert(4, "TEL;01234-56789") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_parse_vCard_file_lowercase(self): self.vcard.insert(4, "tel:01234-56789") address = ET.SubElement(self.person, "address") ET.SubElement(address, 'phone').text = '01234-56789' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_parse_vCard_unknown_property(self): self.vcard.insert(4, "TELEPHONE:01234-56789") self.gramps = self.gramps - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_next_person_no_end(self): self.vcard[4] = "BEGIN:VCARD" @@ -217,12 +217,12 @@ class VCardCheck(unittest.TestCase): ET.SubElement(person, 'gender').text = 'U' name = ET.SubElement(person, 'name', {'type': 'Birth Name'}) ET.SubElement(name, 'surname').text = 'Another' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_check_version(self): self.vcard.extend(["BEGIN:VCARD", "VERSION:3.7", "FN:Another", "N:Another;;;;", "END:VCARD"]) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_formatted_name_twice(self): self.vcard[2] = "FN:Lastname B A" @@ -235,11 +235,11 @@ class VCardCheck(unittest.TestCase): call = ET.Element("call") call.text = "A" name.insert(1, call) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_parts_twice(self): self.vcard.insert(4, "N:Another;;;;") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_regular(self): self.vcard[2] = "FN:Mr. Firstname Middlename Lastname Jr." @@ -249,13 +249,13 @@ class VCardCheck(unittest.TestCase): self.name.insert(0, first) ET.SubElement(self.name, 'suffix').text = 'Jr.' ET.SubElement(self.name, 'title').text = 'Mr.' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_multisurname(self): self.vcard[2] = "FN:Lastname Lastname2" self.vcard[3] = "N:Lastname,Lastname2;;;;" ET.SubElement(self.name, 'surname').text = 'Lastname2' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_prefixsurname(self): self.vcard[2] = "FN:van d'Alembert" @@ -263,11 +263,11 @@ class VCardCheck(unittest.TestCase): surname = self.name[0] surname.text = 'Alembert' surname.set('prefix', "van d'") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_only_surname(self): self.vcard[3] = "N:Lastname" - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_upto_firstname(self): self.vcard[2] = "FN:Firstname Lastname" @@ -275,13 +275,13 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'Firstname' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_name_empty(self): self.vcard[2] = "FN:Lastname" self.vcard[3] = "N: " self.gramps.remove(self.gramps[1]) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_regular(self): self.vcard[2] = "FN:A B Lastname" @@ -289,7 +289,7 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'A B' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_callname(self): self.vcard[2] = "FN:A B Lastname" @@ -300,7 +300,7 @@ class VCardCheck(unittest.TestCase): call = ET.Element('call') call.text = 'B' self.name.insert(1, call) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_incomplete_fn(self): self.vcard[2] = "FN:A Lastname" @@ -308,7 +308,7 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'A B' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_middle(self): self.vcard[2] = "FN:A B C Lastname" @@ -319,7 +319,7 @@ class VCardCheck(unittest.TestCase): call = ET.Element('call') call.text = 'B' self.name.insert(1, call) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_fn_not_given(self): self.vcard[2] = "FN:B Lastname" @@ -327,7 +327,7 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'A B' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_no_addnames(self): self.vcard[2] = "FN:A Lastname" @@ -335,7 +335,7 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'A' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_no_givenname(self): self.vcard[2] = "FN:A Lastname" @@ -343,7 +343,7 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'A' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_firstname_no_fn(self): self.vcard[2] = "FN:" @@ -351,18 +351,18 @@ class VCardCheck(unittest.TestCase): first = ET.Element('first') first.text = 'A' self.name.insert(0, first) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_nicknames_single(self): self.vcard.insert(4, "NICKNAME:Ton") attribs = {"alt": "1", "type": "Birth Name"} name = ET.SubElement(self.person, 'name', attribs) ET.SubElement(name, 'nick').text = "Ton" - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_nicknames_empty(self): self.vcard.insert(4, "NICKNAME:") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_nicknames_multiple(self): self.vcard.insert(4, "NICKNAME:A,B\,C") @@ -372,7 +372,7 @@ class VCardCheck(unittest.TestCase): attribs = {"alt": "1", "type": "Birth Name"} name = ET.SubElement(self.person, 'name', attribs) ET.SubElement(name, 'nick').text = "B,C" - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_address_all(self): self.vcard.insert(4, "ADR:box 1;bis;Broadway 11; New York; New York; NY1234; USA") @@ -382,7 +382,7 @@ class VCardCheck(unittest.TestCase): ET.SubElement(address, 'state').text = 'New York' ET.SubElement(address, 'country').text = 'USA' ET.SubElement(address, 'postal').text = 'NY1234' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_address_too_many(self): self.vcard.insert(4, "ADR:;;Broadway 11; New\,York; ;; USA; Earth") @@ -390,28 +390,28 @@ class VCardCheck(unittest.TestCase): ET.SubElement(address, 'street').text = 'Broadway 11' ET.SubElement(address, 'city').text = 'New,York' ET.SubElement(address, 'country').text = 'USA' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_address_too_few(self): self.vcard.insert(4, "ADR:;;Broadway 11; New York") address = ET.SubElement(self.person, 'address') ET.SubElement(address, 'street').text = 'Broadway 11' ET.SubElement(address, 'city').text = 'New York' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_address_empty(self): self.vcard.insert(4, "ADR: ") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_phone_regular(self): self.vcard.insert(4, "TEL:01234-56789") address = ET.SubElement(self.person, 'address') ET.SubElement(address, 'phone').text = '01234-56789' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_phone_empty(self): self.vcard.insert(4, "TEL: ") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_birthday_regular(self): self.vcard.insert(4, 'BDAY:2001-09-28') @@ -423,7 +423,7 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Birth' ET.SubElement(event, 'dateval', {'val': '2001-09-28'}) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_birthday_datetime(self): self.vcard.insert(4, 'BDAY:2001-09-28T09:23:47Z') @@ -435,7 +435,7 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Birth' ET.SubElement(event, 'dateval', {'val': '2001-09-28'}) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_birthday_no_dash(self): self.vcard.insert(4, 'BDAY:20010928') @@ -447,7 +447,7 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Birth' ET.SubElement(event, 'dateval', {'val': '2001-09-28'}) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_birthday_long_Feb_converted_to_datestr(self): self.vcard.insert(4, 'BDAY:20010229') @@ -459,7 +459,7 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Birth' ET.SubElement(event, 'datestr', {'val': '20010229'}) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_birthday_invalid_format_converted_to_datestr(self): self.vcard.insert(4, 'BDAY:unforgettable') @@ -471,7 +471,7 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Birth' ET.SubElement(event, 'datestr', {'val': 'unforgettable'}) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_birthday_one_dash(self): self.vcard.insert(4, 'BDAY:2001-0928') @@ -483,11 +483,11 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Birth' ET.SubElement(event, 'dateval', {'val': '2001-09-28'}) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_birthday_empty(self): self.vcard.insert(4, "BDAY: ") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_occupation_regular(self): self.vcard.insert(4, "ROLE:scarecrow") @@ -499,27 +499,27 @@ class VCardCheck(unittest.TestCase): event = ET.SubElement(events, 'event', attribs) ET.SubElement(event, 'type').text = 'Occupation' ET.SubElement(event, 'description').text = 'scarecrow' - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_occupation_empty(self): self.vcard.insert(4, "ROLE: ") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_url_regular(self): self.vcard.insert(4, "URL:http://www.example.com") attribs = {'href': 'http://www.example.com', 'type': 'Unknown'} ET.SubElement(self.person, 'url', attribs) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_url_empty(self): self.vcard.insert(4, "URL: ") - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) def test_add_email(self): self.vcard.insert(4, "EMAIL:me@example.org") attribs = {'href': 'me@example.org', 'type': 'E-mail'} ET.SubElement(self.person, 'url', attribs) - self.do_test("\r\n".join(self.vcard), self.gramps) + self.do_case("\r\n".join(self.vcard), self.gramps) if __name__ == "__main__":