[CalendarServer-changes] [5190] CalendarServer/trunk/twext/python/test/test_datetime.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Feb 23 14:05:35 PST 2010
Revision: 5190
http://trac.macosforge.org/projects/calendarserver/changeset/5190
Author: wsanchez at apple.com
Date: 2010-02-23 14:05:34 -0800 (Tue, 23 Feb 2010)
Log Message:
-----------
Refactor test_compare_datetime so that we can test other date/datetime combinations.
Modified Paths:
--------------
CalendarServer/trunk/twext/python/test/test_datetime.py
Modified: CalendarServer/trunk/twext/python/test/test_datetime.py
===================================================================
--- CalendarServer/trunk/twext/python/test/test_datetime.py 2010-02-23 21:20:04 UTC (rev 5189)
+++ CalendarServer/trunk/twext/python/test/test_datetime.py 2010-02-23 22:05:34 UTC (rev 5190)
@@ -57,59 +57,69 @@
dodt = dateordatetime(dt, defaultTZ=utc)
self.assertEquals(dodt.datetime(), dt)
- def test_compare_datetime(self):
- now = datetime.now()
+ def test_compare_date_date(self):
+ return self._test_compare(date, date.today())
- first = dateordatetime(now + timedelta(seconds=8*0))
- second = dateordatetime(now + timedelta(seconds=8*1))
- third = dateordatetime(now + timedelta(seconds=8*2))
+ def test_compare_date_datetime(self):
+ return self._test_compare(date, datetime.now())
+ def test_compare_datetime_date(self):
+ return self._test_compare(datetime, date.today())
+
+ def test_compare_datetime_datetime(self):
+ return self._test_compare(datetime, datetime.now())
+
+ def _test_compare(self, baseclass, now):
+ first = dateordatetime(now + timedelta(days=0))
+ second = dateordatetime(now + timedelta(days=1))
+ third = dateordatetime(now + timedelta(days=2))
+
#
# date & datetime's comparators do not correctly return
# NotImplemented when they should, which breaks comparison
# operators if date/datetime is first. Boo. Seriously weak.
#
- self.assertTrue (first == first.datetime() )
- #self.assertTrue (first.datetime() == first ) # Bug in datetime
- self.assertTrue (first == first.datetime() )
- self.assertTrue (first != second.datetime())
- self.assertTrue (first.datetime() != second )
- self.assertTrue (first != second )
- self.assertTrue (first < second )
- self.assertTrue (second < third )
- self.assertTrue (first < second.datetime())
- #self.assertTrue (second.datetime() < third ) # Bug in datetime
- self.assertTrue (first < second )
- self.assertTrue (second < third )
- #self.assertTrue (first.datetime() < second )
- self.assertTrue (second < third.datetime() ) # Bug in datetime
- self.assertTrue (first <= second )
- self.assertTrue (second <= third )
- self.assertTrue (first <= second.datetime())
- #self.assertTrue (second.datetime() <= third ) # Bug in datetime
- self.assertTrue (first <= second.datetime())
- #self.assertTrue (second.datetime() <= third ) # Bug in datetime
- self.assertTrue (first <= second )
- self.assertTrue (second <= third )
- #self.assertTrue (first.datetime() <= second ) # Bug in datetime
- self.assertTrue (second <= third.datetime() )
- self.assertFalse(first > second )
- self.assertFalse(second > third )
- self.assertFalse(first > second.datetime())
- #self.assertFalse(second.datetime() > third ) # Bug in datetime
- self.assertFalse(first > second )
- self.assertFalse(second > third )
- #self.assertFalse(first.datetime() > second ) # Bug in datetime
- self.assertFalse(second > third.datetime() )
- self.assertFalse(first >= second )
- self.assertFalse(second >= third )
- self.assertFalse(first >= second.datetime())
- #self.assertFalse(second.datetime() >= third ) # Bug in datetime
- self.assertFalse(first >= second )
- self.assertFalse(second >= third )
- #self.assertFalse(first.datetime() >= second ) # Bug in datetime
- self.assertFalse(second >= third.datetime() )
+ self.assertTrue (first == first.dateOrDatetime() )
+ #self.assertTrue (first.dateOrDatetime() == first ) # Bug in datetime
+ self.assertTrue (first == first.dateOrDatetime() )
+ self.assertTrue (first != second.dateOrDatetime())
+ self.assertTrue (first.dateOrDatetime() != second )
+ self.assertTrue (first != second )
+ self.assertTrue (first < second )
+ self.assertTrue (second < third )
+ self.assertTrue (first < second.dateOrDatetime())
+ #self.assertTrue (second.dateOrDatetime() < third ) # Bug in datetime
+ self.assertTrue (first < second )
+ self.assertTrue (second < third )
+ #self.assertTrue (first.dateOrDatetime() < second )
+ self.assertTrue (second < third.dateOrDatetime() ) # Bug in datetime
+ self.assertTrue (first <= second )
+ self.assertTrue (second <= third )
+ self.assertTrue (first <= second.dateOrDatetime())
+ #self.assertTrue (second.dateOrDatetime() <= third ) # Bug in datetime
+ self.assertTrue (first <= second.dateOrDatetime())
+ #self.assertTrue (second.dateOrDatetime() <= third ) # Bug in datetime
+ self.assertTrue (first <= second )
+ self.assertTrue (second <= third )
+ #self.assertTrue (first.dateOrDatetime() <= second ) # Bug in datetime
+ self.assertTrue (second <= third.dateOrDatetime() )
+ self.assertFalse(first > second )
+ self.assertFalse(second > third )
+ self.assertFalse(first > second.dateOrDatetime())
+ #self.assertFalse(second.dateOrDatetime() > third ) # Bug in datetime
+ self.assertFalse(first > second )
+ self.assertFalse(second > third )
+ #self.assertFalse(first.dateOrDatetime() > second ) # Bug in datetime
+ self.assertFalse(second > third.dateOrDatetime() )
+ self.assertFalse(first >= second )
+ self.assertFalse(second >= third )
+ self.assertFalse(first >= second.dateOrDatetime())
+ #self.assertFalse(second.dateOrDatetime() >= third ) # Bug in datetime
+ self.assertFalse(first >= second )
+ self.assertFalse(second >= third )
+ #self.assertFalse(first.dateOrDatetime() >= second ) # Bug in datetime
+ self.assertFalse(second >= third.dateOrDatetime() )
def test_date_iCalendarString(self):
d = date(2010, 2, 22)
@@ -139,6 +149,7 @@
def test_asUTC(self):
raise NotImplementedError()
+
class TimerangeTests(TestCase):
def test_start(self):
start = datetime.now()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100223/5b6b005f/attachment.html>
More information about the calendarserver-changes
mailing list