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

2007-11-24 Douglas S. Blank <dblank@cs.brynmawr.edu>

Browse Source 
* src/gen/lib/date.py: had to import calendar by path.name
	  (so that the import of date_test would work)
	* src/gen/lib/test: new test directory
	* src/gen/lib/test/date_test.py: unittests for date.py



svn: r9397
This commit is contained in:
Doug Blank
2007-11-24 16:35:57 +00:00
parent b3d12508ca
commit 3d2b06a66a
3 changed files with 134 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2007-11-24 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/gen/lib/date.py: had to import calendar by path.name
(so that the import of date_test would work)
* src/gen/lib/test: new test directory
* src/gen/lib/test/date_test.py: unittests for date.py
2007-11-24 Benny Malengier <benny.malengier@gramps-project.org> 2007-11-24 Benny Malengier <benny.malengier@gramps-project.org>
* src/Editors/_EditPerson.py: callback family update bug removed * src/Editors/_EditPerson.py: callback family update bug removed

112
src/gen/lib/date.py
View File

@@ -53,7 +53,7 @@ log = logging.getLogger(".Date")
# Gramps modules # Gramps modules
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from calendar import * from gen.lib.calendar import *
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@@ -803,113 +803,3 @@ class Date:
""" """
return Date._calendar_change[Date.CAL_GREGORIAN](self.sortval + value) return Date._calendar_change[Date.CAL_GREGORIAN](self.sortval + value)
# if __name__ == "__main__":
# # Test function. Call it as follows from the command line (so as to find
# # imported modules):
# # export PYTHONPATH=/path/to/gramps/src python src/gen/lib/date.py
# #
# from DateHandler import parser as df
# def test_date(d1, d2, expected1, expected2 = None):
# if expected2 == None:
# expected2 = expected1
# pos1 = 1
# if expected1 :
# pos1 = 0
# pos2 = 1
# if expected2 :
# pos2 = 0
# date1 = df.parse(d1)
# date2 = df.parse(d2)
# wrong = 0
# print "Testing '%s' and '%s'" % (d1, d2)
# val = date2.match(date1)
# try:
# assert(val == expected1)
# print [" correct: they match!"
# ," correct: they do not match!"][pos1]
# except:
# print " Wrong! got %s" % (not expected1)
# wrong += 1
# val = date1.match(date2)
# try:
# assert(val == expected2)
# print [" correct: they match!"
# ," correct: they do not match!"][pos2]
# except:
# print " Wrong! got %s" % (not expected2)
# wrong += 1
# return {"incorrect": wrong, "correct": 2 - wrong }
# stats = {'incorrect':0, 'correct':0}
# # create a bunch of tests:
# # most are symmetric: #date1, date2, does d1 match d2? does d2 match d1?
# tests = [("before 1960", "before 1961", True),
# ("before 1960", "before 1960", True),
# ("before 1961", "before 1961", True),
# ("jan 1, 1960", "jan 1, 1960", True),
# ("dec 31, 1959", "dec 31, 1959", True),
# ("before 1960", "jan 1, 1960", False),
# ("before 1960", "dec 31, 1959", True),
# ("abt 1960", "1960", True),
# ("abt 1960", "before 1960", True),
# ("1960", "1960", True),
# ("1960", "after 1960", False),
# ("1960", "before 1960", False),
# ("abt 1960", "abt 1960", True),
# ("before 1960", "after 1960", False),
# ("after jan 1, 1900", "jan 2, 1900", True),
# ("abt jan 1, 1900", "jan 1, 1900", True),
# ("from 1950 to 1955", "1950", True),
# ("from 1950 to 1955", "1951", True),
# ("from 1950 to 1955", "1952", True),
# ("from 1950 to 1955", "1953", True),
# ("from 1950 to 1955", "1954", True),
# ("from 1950 to 1955", "1955", True),
# ("from 1950 to 1955", "1956", False),
# ("from 1950 to 1955", "dec 31, 1955", True),
# ("from 1950 to 1955", "jan 1, 1955", True),
# ("from 1950 to 1955", "dec 31, 1949", False),
# ("from 1950 to 1955", "jan 1, 1956", False),
# ("after jul 4, 1980", "jul 4, 1980", False),
# ("after jul 4, 1980", "before jul 4, 1980", False),
# ("after jul 4, 1980", "about jul 4, 1980", True),
# ("after jul 4, 1980", "after jul 4, 1980", True),
# ("between 1750 and 1752", "1750", True),
# ("between 1750 and 1752", "about 1750", True),
# ("between 1750 and 1752", "between 1749 and 1750", True),
# ("between 1750 and 1752", "1749", False),
# ("invalid date", "invalid date", True),
# ("invalid date", "invalid", False, True),
# ("invalid date 1", "invalid date 2", False),
# ("abt jan 1, 2000", "dec 31, 1999", True),
# ("jan 1, 2000", "dec 31, 1999", False),
# ("aft jan 1, 2000", "dec 31, 1999", False),
# ("after jan 1, 2000", "after dec 31, 1999", True),
# ("after dec 31, 1999", "after jan 1, 2000", True),
# ("1 31, 2000", "jan 1, 2000", False),
# ("dec 31, 1999", "jan 1, 2000", False),
# ("jan 1, 2000", "before dec 31, 1999", False),
# ("aft jan 1, 2000", "before dec 31, 1999", False),
# ("before jan 1, 2000", "after dec 31, 1999", False),
# ("jan 1, 2000/1", "jan 1, 2000", False),
# ("jan 1, 2000/1", "jan 1, 2001", True),
# ("about 1984", "about 2005", False),
# ("about 1990", "about 2005", True),
# ("about 2007", "about 2006", True),
# ("about 1995", "after 2000", True),
# ("about 1995", "after 2005", False),
# ("about 2007", "about 2003", True),
# ("before 2007", "2000", True),
# # different calendar, same date
# ("Aug 3, 1982", "14 Thermidor 190 (French Republican)", True),
# ("after Aug 3, 1982",
# "before 14 Thermidor 190 (French Republican)", False),
# ("ab cd", "54 ab cd 2000", True, False),
# ]
# # test them:
# for testdata in tests:
# results = test_date(*testdata)
# for result in results:
# stats[result] += results[result]
# for result in stats:
# print result, stats[result]

127
src/gen/lib/test/date_test.py Normal file
View File

@@ -0,0 +1,127 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# $Id: $
""" Unittest for testing dates """
__author__ = "Douglas S. Blank <dblank@cs.brynmawr.edu>"
__revision__ = "$Revision: $"
import unittest
from test import test_util
test_util.path_append_parent()
import date
from DateHandler import parser as df
class Test_top(unittest.TestCase):
def helper_match(self, d1, d2, expected1, expected2 = None):
"""
Tests two GRAMPS dates to see if they match.
"""
if expected2 == None:
expected2 = expected1
pos1 = 1
if expected1 :
pos1 = 0
pos2 = 1
if expected2 :
pos2 = 0
date1 = df.parse(d1)
date2 = df.parse(d2)
val = date2.match(date1)
self.assertTrue(val == expected1, "'%s' and '%s' did not match" % (d1, d2))
val = date1.match(date2)
self.assertTrue(val == expected2, "'%s' and '%s' did not match" % (d2, d1))
def test_function_match(self):
# most are symmetric: #date1, date2, does d1 match d2? does d2 match d1?
tests = [("before 1960", "before 1961", True),
("before 1960", "before 1960", True),
("before 1961", "before 1961", True),
("jan 1, 1960", "jan 1, 1960", True),
("dec 31, 1959", "dec 31, 1959", True),
("before 1960", "jan 1, 1960", False),
("before 1960", "dec 31, 1959", True),
("abt 1960", "1960", True),
("abt 1960", "before 1960", True),
("1960", "1960", True),
("1960", "after 1960", False),
("1960", "before 1960", False),
("abt 1960", "abt 1960", True),
("before 1960", "after 1960", False),
("after jan 1, 1900", "jan 2, 1900", True),
("abt jan 1, 1900", "jan 1, 1900", True),
("from 1950 to 1955", "1950", True),
("from 1950 to 1955", "1951", True),
("from 1950 to 1955", "1952", True),
("from 1950 to 1955", "1953", True),
("from 1950 to 1955", "1954", True),
("from 1950 to 1955", "1955", True),
("from 1950 to 1955", "1956", False),
("from 1950 to 1955", "dec 31, 1955", True),
("from 1950 to 1955", "jan 1, 1955", True),
("from 1950 to 1955", "dec 31, 1949", False),
("from 1950 to 1955", "jan 1, 1956", False),
("after jul 4, 1980", "jul 4, 1980", False),
("after jul 4, 1980", "before jul 4, 1980", False),
("after jul 4, 1980", "about jul 4, 1980", True),
("after jul 4, 1980", "after jul 4, 1980", True),
("between 1750 and 1752", "1750", True),
("between 1750 and 1752", "about 1750", True),
("between 1750 and 1752", "between 1749 and 1750", True),
("between 1750 and 1752", "1749", False),
("invalid date", "invalid date", True),
("invalid date", "invalid", False, True),
("invalid date 1", "invalid date 2", False),
("abt jan 1, 2000", "dec 31, 1999", True),
("jan 1, 2000", "dec 31, 1999", False),
("aft jan 1, 2000", "dec 31, 1999", False),
("after jan 1, 2000", "after dec 31, 1999", True),
("after dec 31, 1999", "after jan 1, 2000", True),
("1 31, 2000", "jan 1, 2000", False),
("dec 31, 1999", "jan 1, 2000", False),
("jan 1, 2000", "before dec 31, 1999", False),
("aft jan 1, 2000", "before dec 31, 1999", False),
("before jan 1, 2000", "after dec 31, 1999", False),
("jan 1, 2000/1", "jan 1, 2000", False),
("jan 1, 2000/1", "jan 1, 2001", True),
("about 1984", "about 2005", False),
("about 1990", "about 2005", True),
("about 2007", "about 2006", True),
("about 1995", "after 2000", True),
("about 1995", "after 2005", False),
("about 2007", "about 2003", True),
("before 2007", "2000", True),
# different calendar, same date
("Aug 3, 1982", "14 Thermidor 190 (French Republican)", True),
("after Aug 3, 1982",
"before 14 Thermidor 190 (French Republican)", False),
("ab cd", "54 ab cd 2000", True, False),
]
for testdata in tests:
self.helper_match(*testdata)
if __name__ == "__main__":
unittest.main()