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

7158: "today" parsing fails with other calendars

Browse Source 
Committed a test that uncovers this problem, before we add
localization to the "today" string

svn: r23393
This commit is contained in:
Vassilii Khachaturov 2013-10-25 08:39:19 +00:00
parent eb725cc5aa
commit 4e2e51ff31
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gramps/gen/lib/test/date_test.py
View File

@ -350,6 +350,7 @@ class MatchDateTest(BaseDateTest):
("1234-01-04", "1234-01-04 (Mar25)", True), ("1234-01-04", "1234-01-04 (Mar25)", True),
# See bug# 7158 # See bug# 7158
("today", Today(), True), ("today", Today(), True),
("today (Hebrew)", Today(), True),
] ]
def convert_to_date(self, d): def convert_to_date(self, d):
@ -361,16 +362,20 @@ class MatchDateTest(BaseDateTest):
""" """
if expected2 is None: if expected2 is None:
expected2 = expected1 expected2 = expected1
self.assertMatch(d1, d2, expected1)
self.assertMatch(d2, d1, expected2)
def assertMatch(self, d1, d2, expected):
date1 = self.convert_to_date(d1) date1 = self.convert_to_date(d1)
date2 = self.convert_to_date(d2) date2 = self.convert_to_date(d2)
result = date2.match(date1) result = date2.match(date1)
self.assertEqual(result, expected1, self.assertEqual(result, expected,
"'%s' did not match '%s'" % (d1, d2)) "'{}' {} '{}'\n({} vs {})".format(
d1,
result = date1.match(date2) ("did not match" if expected else "matched"),
self.assertEqual(result, expected2, d2,
"'%s' did not match '%s'" % (d2, d1)) date1.to_struct(), date2.to_struct()))
def test_match(self): def test_match(self):
for testdata in self.tests: for testdata in self.tests: