New tests for range searching by specifying just a month.

Currently some of them fail.

_add_granularity is broken - needs tests and complete fix.

Author: Richard Jones

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: date.py,v 1.92 2007-03-14 15:07:24 schlatterbeck Exp $
+# $Id: date.py,v 1.93 2007-12-21 11:21:08 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -33,13 +33,18 @@
 
 from roundup import i18n
 
-def _add_granularity(src, order, value = 1):
+def _add_granularity(src, order, value=1):
     '''Increment first non-None value in src dictionary ordered by 'order'
     parameter
     '''
     for gran in order:
         if src[gran]:
             src[gran] = int(src[gran]) + value
+            # XXX test and handle other cases
+            if gran == 'm' and src['m'] > 12:
+                y, m = divmod(src['m'], 12)
+                src['m'] = m
+                src['y'] = int(src['y']) + y
             break
 
 # no, I don't know why we must anchor the date RE when we only ever use it

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.93 2007-12-20 01:01:49 richard Exp $
+# $Id: db_test_base.py,v 1.94 2007-12-21 11:21:08 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets, base64, os.path
 
@@ -1184,6 +1184,7 @@ def testFilteringRangeTwoSyntaxes(self):
         ae(filt(None, {'deadline': '2003-02-16;'}), ['1', '3', '4'])
 
     def testFilteringRangeYearMonthDay(self):
+        ae, filt = self.filteringSetup()
         ae(filt(None, {'deadline': '2002'}), [])
         ae(filt(None, {'deadline': '2003'}), ['1', '2', '3'])
         ae(filt(None, {'deadline': '2004'}), ['4'])

test/test_dates.py

@@ -15,16 +15,29 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: test_dates.py,v 1.42 2007-12-20 01:01:49 richard Exp $
+# $Id: test_dates.py,v 1.43 2007-12-21 11:21:09 richard Exp $
 from __future__ import nested_scopes
 
 import unittest
 import time
 import datetime
+import calendar
+
+from roundup.date import Date, Interval, Range, fixTimeOverflow, \
+    get_timezone, _add_granularity
 
-from roundup.date import Date, Interval, Range, fixTimeOverflow, get_timezone
 
 class DateTestCase(unittest.TestCase):
+    def testAddGranularity(self):
+        def d(m=None, d=None, H=None, M=None, S=None, value=1):
+            d = dict(y='2006', m=m, d=d, H=H, M=M, S=S)
+            _add_granularity(d, 'SMHdmy', value)
+            return d
+        ae = self.assertEqual
+        ae(d(), dict(y=2007, m=None, d=None, H=None, M=None, S=None))
+        ae(d(m='1'), dict(y='2006', m=2, d=None, H=None, M=None, S=None))
+        ae(d(m='12'), dict(y=2007, m=1, d=None, H=None, M=None, S=None))
+
     def testDateInterval(self):
         ae = self.assertEqual
         date = Date("2000-06-26.00:34:02 + 2d")
@@ -472,13 +485,11 @@ def testRange(self):
         r = Range('2006', Date)
         ae(str(r.from_value), '2006-01-01.00:00:00')
         ae(str(r.to_value), '2006-12-31.23:59:59')
-        # XXX this is probably in the calendar module
-        days = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
         for i in range(1, 13):
-            print i
             r = Range('2006-%02d'%i, Date)
             ae(str(r.from_value), '2006-%02d-01.00:00:00'%i)
-            ae(str(r.to_value), '2006-%02d-%02d.23:59:59'%(i, days[i-1]))
+            ae(str(r.to_value), '2006-%02d-%02d.23:59:59'%(i,
+                calendar.mdays[i]))
 
 
 def test_suite():