[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_ unittest cleanup:

Yvo Schubbe cvs-admin at zope.org
Sun Apr 22 11:03:15 UTC 2012


Log message for revision 125227:
  unittest cleanup:
  - replaced deprecated assert method aliases
  - PEP 8

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Event.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py	2012-04-20 20:09:47 UTC (rev 125226)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Calendar.py	2012-04-22 11:03:11 UTC (rev 125227)
@@ -44,16 +44,16 @@
 
     def test_new(self):
         ctool = self._makeOne()
-        self.assertEqual( ctool.getId(), 'portal_calendar' )
+        self.assertEqual(ctool.getId(), 'portal_calendar')
 
     def test_types(self):
         ctool = self._makeOne()
         self.assertEqual(ctool.getCalendarTypes(), ('Event',))
 
-        ctool.edit_configuration(show_types=['Event','Party'],
+        ctool.edit_configuration(show_types=['Event', 'Party'],
                                  show_states=[],
                                  use_session="")
-        self.assertEqual( ctool.getCalendarTypes(), ('Event', 'Party') )
+        self.assertEqual(ctool.getCalendarTypes(), ('Event', 'Party'))
 
     def test_states(self):
         ctool = self._makeOne()
@@ -62,15 +62,15 @@
         ctool.edit_configuration(show_types=[],
                                  show_states=['pending', 'published'],
                                  use_session="")
-        self.assertEqual( ctool.getCalendarStates(), ('pending', 'published') )
+        self.assertEqual(ctool.getCalendarStates(), ('pending', 'published'))
 
     def test_days(self):
         ctool = self._makeOne()
         old_locale = locale.getlocale(locale.LC_ALL)[0]
         locale.setlocale(locale.LC_ALL, 'C')
         try:
-            self.assertEqual( ctool.getDays(),
-                              ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'] )
+            self.assertEqual(ctool.getDays(),
+                             ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'])
         finally:
             locale.setlocale(locale.LC_ALL, old_locale)
 
@@ -94,8 +94,8 @@
         old_locale = locale.getlocale(locale.LC_ALL)[0]
         locale.setlocale(locale.LC_ALL, 'C')
         try:
-            self.assertEqual( ctool.getDays(),
-                              ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa','Su'] )
+            self.assertEqual(ctool.getDays(),
+                             ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'])
         finally:
             locale.setlocale(locale.LC_ALL, old_locale)
 
@@ -119,7 +119,7 @@
     def _testURL(self, url, params=None):
         obj = self.app.site.restrictedTraverse(url)
         if params is None:
-            params=(obj, self.app.site.REQUEST)
+            params = (obj, self.app.site.REQUEST)
         obj(*params)
 
     def test_sessions_skinsview(self):
@@ -127,28 +127,28 @@
         caltool.edit_configuration(show_types=['Event'], use_session="True")
         self._testURL('/site/calendarBox', ())
 
-        self.failUnless(self.app.REQUEST.SESSION.get('calendar_year',None))
+        self.assertTrue(self.app.REQUEST.SESSION.get('calendar_year', None))
 
     def test_sessions_fiveview(self):
         caltool = self.app.site.portal_calendar
         caltool.edit_configuration(show_types=['Event'], use_session="True")
         self._testURL('/site/@@calendar_widget', ())
 
-        self.failUnless(self.app.REQUEST.SESSION.get('calendar_year',None))
+        self.assertTrue(self.app.REQUEST.SESSION.get('calendar_year', None))
 
     def test_noSessions_skinsview(self):
         caltool = self.app.site.portal_calendar
         caltool.edit_configuration(show_types=['Event'], use_session="")
         self._testURL('/site/calendarBox', ())
 
-        self.failIf(self.app.REQUEST.SESSION.get('calendar_year',None))
+        self.assertFalse(self.app.REQUEST.SESSION.get('calendar_year', None))
 
     def test_noSessions_fiveview(self):
         caltool = self.app.site.portal_calendar
         caltool.edit_configuration(show_types=['Event'], use_session="")
         self._testURL('/site/@@calendar_widget', ())
 
-        self.failIf(self.app.REQUEST.SESSION.get('calendar_year',None))
+        self.assertFalse(self.app.REQUEST.SESSION.get('calendar_year', None))
 
     def test_simpleCalendarRendering(self):
         caltool = self.app.site.portal_calendar
@@ -205,22 +205,21 @@
     def test_singleEventCalendarRendering(self):
         site = self.app.site
         caltool = self.app.site.portal_calendar
-        site.Members.invokeFactory(type_name="Event",id='Event1')
+        site.Members.invokeFactory(type_name="Event", id='Event1')
         event = self.app.restrictedTraverse('/site/Members/Event1')
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=1
-                    , effectiveMo=5
-                    , effectiveYear=2002
-                    , expirationDay=1
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=1,
+                   effectiveMo=5,
+                   effectiveYear=2002,
+                   expirationDay=1,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         site.portal_workflow.doActionFor(event, 'publish', comment='testing')
 
         data = [
@@ -278,40 +277,38 @@
     def test_eventCalendarRenderingIssue411(self):
         #  http://www.zope.org/Collectors/CMF/411
         site = self.app.site
-        site.Members.invokeFactory(type_name="Event",id='Event1')
+        site.Members.invokeFactory(type_name="Event", id='Event1')
         event = self.app.restrictedTraverse('/site/Members/Event1')
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=31
-                    , effectiveMo=3
-                    , effectiveYear=2006
-                    , expirationDay=1
-                    , expirationMo=4
-                    , expirationYear=2006
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="00:00"
-                    , stopAMPM="AM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=31,
+                   effectiveMo=3,
+                   effectiveYear=2006,
+                   expirationDay=1,
+                   expirationMo=4,
+                   expirationYear=2006,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="00:00",
+                   stopAMPM="AM")
         site.portal_workflow.doActionFor(event, 'publish', comment='testing')
 
-        site.Members.invokeFactory(type_name="Event",id='Event2')
+        site.Members.invokeFactory(type_name="Event", id='Event2')
         event = self.app.restrictedTraverse('/site/Members/Event2')
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=29
-                    , effectiveMo=3
-                    , effectiveYear=2006
-                    , expirationDay=30
-                    , expirationMo=3
-                    , expirationYear=2006
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="00:00"
-                    , stopAMPM="AM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=29,
+                   effectiveMo=3,
+                   effectiveYear=2006,
+                   expirationDay=30,
+                   expirationMo=3,
+                   expirationYear=2006,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="00:00",
+                   stopAMPM="AM")
         site.portal_workflow.doActionFor(event, 'publish', comment='testing')
 
         # With the bug unfixed, this raises a TypeError
@@ -320,22 +317,21 @@
     def test_spanningEventCalendarRendering(self):
         site = self.app.site
         caltool = self.app.site.portal_calendar
-        site.Members.invokeFactory(type_name="Event",id='Event1')
+        site.Members.invokeFactory(type_name="Event", id='Event1')
         event = self.app.restrictedTraverse('/site/Members/Event1')
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=1
-                    , effectiveMo=5
-                    , effectiveYear=2002
-                    , expirationDay=31
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=1,
+                   effectiveMo=5,
+                   effectiveYear=2002,
+                   expirationDay=31,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         site.portal_workflow.doActionFor(event, 'publish', comment='testing')
 
         data = [
@@ -453,132 +449,127 @@
     def test_getPreviousMonth(self):
         caltool = self.app.site.portal_calendar
 
-        self.assertEqual( caltool.getPreviousMonth(2,2002),
-                          DateTime('2002/1/1') )
-        self.assertEqual( caltool.getPreviousMonth(1,2002),
-                          DateTime('2001/12/1') )
+        self.assertEqual(caltool.getPreviousMonth(2, 2002),
+                         DateTime('2002/1/1'))
+        self.assertEqual(caltool.getPreviousMonth(1, 2002),
+                         DateTime('2001/12/1'))
 
     def test_getNextMonth(self):
         caltool = self.app.site.portal_calendar
 
-        self.assertEqual( caltool.getNextMonth(12,2001),
-                          DateTime('2002/1/1') )
-        self.assertEqual( caltool.getNextMonth(1,2002),
-                          DateTime('2002/2/1') )
+        self.assertEqual(caltool.getNextMonth(12, 2001),
+                         DateTime('2002/1/1'))
+        self.assertEqual(caltool.getNextMonth(1, 2002),
+                         DateTime('2002/2/1'))
 
     def test_getBeginAndEndTimes(self):
         caltool = self.app.site.portal_calendar
 
-        self.assertEqual( caltool.getBeginAndEndTimes(1,12,2001),
-                          ( DateTime('2001/12/1 12:00:00AM'),
-                            DateTime('2001/12/1 11:59:59PM') ) )
+        self.assertEqual(caltool.getBeginAndEndTimes(1, 12, 2001),
+                         (DateTime('2001/12/1 12:00:00AM'),
+                          DateTime('2001/12/1 11:59:59PM')))
 
     def test_singleDayRendering(self):
         site = self.app.site
         caltool = self.app.site.portal_calendar
         wftool = self.app.site.portal_workflow
 
-        site.Members.invokeFactory(type_name="Event",id='Event1')
+        site.Members.invokeFactory(type_name="Event", id='Event1')
         event = site.Members.Event1
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=1
-                    , effectiveMo=5
-                    , effectiveYear=2002
-                    , expirationDay=31
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=1,
+                   effectiveMo=5,
+                   effectiveYear=2002,
+                   expirationDay=31,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         wftool.doActionFor(event, 'publish', comment='testing')
         events = caltool.getEventsForThisDay(thisDay=DateTime('2002/5/1'))
-        self.assertEqual( len(events), 1 )
+        self.assertEqual(len(events), 1)
 
-        site.Members.invokeFactory(type_name="Event",id='Event2')
+        site.Members.invokeFactory(type_name="Event", id='Event2')
         event = site.Members.Event2
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=1
-                    , effectiveMo=5
-                    , effectiveYear=2002
-                    , expirationDay=1
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=1,
+                   effectiveMo=5,
+                   effectiveYear=2002,
+                   expirationDay=1,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         wftool.doActionFor(event, 'publish', comment='testing')
         events = caltool.getEventsForThisDay(thisDay=DateTime('2002/5/1'))
-        self.assertEqual( len(events), 2 )
+        self.assertEqual(len(events), 2)
 
-        site.Members.invokeFactory(type_name="Event",id='Event3')
+        site.Members.invokeFactory(type_name="Event", id='Event3')
         event = site.Members.Event3
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=12
-                    , effectiveMo=12
-                    , effectiveYear=2001
-                    , expirationDay=1
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=12,
+                   effectiveMo=12,
+                   effectiveYear=2001,
+                   expirationDay=1,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         wftool.doActionFor(event, 'publish', comment='testing')
         events = caltool.getEventsForThisDay(thisDay=DateTime('2002/5/1'))
-        self.assertEqual( len(events), 3 )
+        self.assertEqual(len(events), 3)
 
-        site.Members.invokeFactory(type_name="Event",id='Event4')
+        site.Members.invokeFactory(type_name="Event", id='Event4')
         event = site.Members.Event4
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=12
-                    , effectiveMo=12
-                    , effectiveYear=2001
-                    , expirationDay=31
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=12,
+                   effectiveMo=12,
+                   effectiveYear=2001,
+                   expirationDay=31,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         wftool.doActionFor(event, 'publish', comment='testing')
         events = caltool.getEventsForThisDay(thisDay=DateTime('2002/5/1'))
-        self.assertEqual( len(events), 4 )
+        self.assertEqual(len(events), 4)
 
-        site.Members.invokeFactory(type_name="Event",id='Event5')
+        site.Members.invokeFactory(type_name="Event", id='Event5')
         event = site.Members.Event5
-        event.edit( title='title'
-                    , description='description'
-                    , eventType=( 'eventType', )
-                    , effectiveDay=31
-                    , effectiveMo=5
-                    , effectiveYear=2002
-                    , expirationDay=31
-                    , expirationMo=5
-                    , expirationYear=2002
-                    , start_time="00:00"
-                    , startAMPM="AM"
-                    , stop_time="11:59"
-                    , stopAMPM="PM"
-                    )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=31,
+                   effectiveMo=5,
+                   effectiveYear=2002,
+                   expirationDay=31,
+                   expirationMo=5,
+                   expirationYear=2002,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
         wftool.doActionFor(event, 'publish', comment='testing')
         events = caltool.getEventsForThisDay(thisDay=DateTime('2002/5/1'))
-        self.assertEqual( len(events), 4 )
+        self.assertEqual(len(events), 4)
         events = caltool.getEventsForThisDay(thisDay=DateTime('2002/5/31'))
-        self.assertEqual( len(events), 3 )
+        self.assertEqual(len(events), 3)
 
     def test_veryLongEvent(self):
         # Proper handling of events that last more than 1 year
@@ -588,12 +579,12 @@
                            start_date='2007/10/12 00:00:00',
                            end_date='2008/10/12 00:00:00')
         site.portal_workflow.doActionFor(site.long, 'publish')
-        expected = {'eventslist': [{'start': None, 'end': None, 
-                                    'title': 'A long event'}], 
+        expected = {'eventslist': [{'start': None, 'end': None,
+                                    'title': 'A long event'}],
                                     'event': 1, 'day': 13}
         events = site.portal_calendar.catalog_getevents(2007, 10)
         self.assertEqual(events[13], expected)
-        
+
     def test_lastDayRenderingOfLongEvent(self):
         # Bug in catalog_getevents doesn't include events
         # that spawn over months in the last day of each month
@@ -603,13 +594,14 @@
                            end_date='2008/03/20 00:00:00')
 
         site.portal_workflow.doActionFor(site.long, 'publish')
-        expected = {'eventslist': [{'start': None, 'end': None, 
-                                    'title': 'A long event'}], 
+        expected = {'eventslist': [{'start': None, 'end': None,
+                                    'title': 'A long event'}],
                                     'event': 1}
-        # some dates to try: (day,month,year)
-        dates = ( (30,10,2007), (31,10,2007), (29,11,2007), (30,11,2007),
-                  (30,12,2007), (31,12,2007), (28,2,2008), (28,2,2008) )
-        for (day,month,year) in dates:
+        # some dates to try: (day, month, year)
+        dates = ((30, 10, 2007), (31, 10, 2007), (29, 11, 2007),
+                 (30, 11, 2007), (30, 12, 2007), (31, 12, 2007),
+                 (28, 2, 2008), (28, 2, 2008))
+        for (day, month, year) in dates:
             events = site.portal_calendar.catalog_getevents(year, month)
             expected['day'] = day
             self.assertEqual(events[day], expected)
@@ -760,19 +752,12 @@
 
         test_day = DateTime('2002/07/01')
 
-        self.app.site.invokeFactory( 'Event'
-                                   , id='party1'
-                                   , start_date=start_one
-                                   , end_date=stop_one
-                                   )
+        self.app.site.invokeFactory('Event', id='party1',
+                                    start_date=start_one, end_date=stop_one)
 
+        self.app.site.invokeFactory('Event', id='party2',
+                                    start_date=start_two, end_date=stop_two)
 
-        self.app.site.invokeFactory( 'Event'
-                                   , id='party2'
-                                   , start_date=start_two
-                                   , end_date=start_two
-                                   )
-
         wf_tool.doActionFor(self.app.site.party1, 'publish')
         wf_tool.doActionFor(self.app.site.party2, 'publish')
 
@@ -780,7 +765,7 @@
         self.assertEqual(cal.getNextEvent(stop_one).start, start_two)
 
         # Check to see that we don't have events after July 2002
-        self.failIf(cal.getNextEvent(test_day))
+        self.assertFalse(cal.getNextEvent(test_day))
 
 
 def test_suite():

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Event.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Event.py	2012-04-20 20:09:47 UTC (rev 125226)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/tests/test_Event.py	2012-04-22 11:03:11 UTC (rev 125227)
@@ -90,41 +90,39 @@
         # Year month and day were processed in the wrong order
         # Also see http://collector.zope.org/CMF/202
         event = self._makeOne('foo')
-        event.edit( title='title'
-                  , description='description'
-                  , eventType=( 'eventType', )
-                  , effectiveDay=1
-                  , effectiveMo=5
-                  , effectiveYear=1999
-                  , expirationDay=31
-                  , expirationMo=12
-                  , expirationYear=1999
-                  , start_time="00:00"
-                  , startAMPM="AM"
-                  , stop_time="11:59"
-                  , stopAMPM="PM"
-                  )
+        event.edit(title='title',
+                   description='description',
+                   eventType=('eventType',),
+                   effectiveDay=1,
+                   effectiveMo=5,
+                   effectiveYear=1999,
+                   expirationDay=31,
+                   expirationMo=12,
+                   expirationYear=1999,
+                   start_time="00:00",
+                   startAMPM="AM",
+                   stop_time="11:59",
+                   stopAMPM="PM")
 
-        self.assertEqual( event.Title(), 'title' )
-        self.assertEqual( event.Description(), 'description' )
-        self.assertEqual( event.Subject(), ( 'eventType', ), event.Subject() )
-        self.assertEqual( event.effective_date, None )
-        self.assertEqual( event.expiration_date, None )
-        self.assertEqual( event.end(), DateTime('1999/12/31 23:59') )
-        self.assertEqual( event.start(), DateTime('1999/05/01 00:00') )
-        self.failIf( event.contact_name )
+        self.assertEqual(event.Title(), 'title')
+        self.assertEqual(event.Description(), 'description')
+        self.assertEqual(event.Subject(), ('eventType',), event.Subject())
+        self.assertEqual(event.effective_date, None)
+        self.assertEqual(event.expiration_date, None)
+        self.assertEqual(event.end(), DateTime('1999/12/31 23:59'))
+        self.assertEqual(event.start(), DateTime('1999/05/01 00:00'))
+        self.assertFalse(event.contact_name)
 
     def test_puke(self):
         event = self._makeOne('shouldPuke')
 
-        self.assertRaises( DateError
-                         , event.edit
-                         , effectiveDay=31
-                         , effectiveMo=2
-                         , effectiveYear=1999
-                         , start_time="00:00"
-                         , startAMPM="AM"
-                         )
+        self.assertRaises(DateError,
+                          event.edit,
+                          effectiveDay=31,
+                          effectiveMo=2,
+                          effectiveYear=1999,
+                          start_time="00:00",
+                          startAMPM="AM")
 
 EVENT_TXT = """\
 Title: Test Event
@@ -146,6 +144,7 @@
 Fundraiser for disabled goldfish
 """
 
+
 class EventPUTTests(RequestTest):
 
     def _makeOne(self, id, *args, **kw):
@@ -159,20 +158,20 @@
         d = self._makeOne('foo')
         d.PUT(self.REQUEST, self.RESPONSE)
 
-        self.assertEqual( d.Title(), '' )
-        self.assertEqual( d.Format(), 'text/plain' )
-        self.assertEqual( d.Description(), '' )
-        self.assertEqual( d.Subject(), () )
-        self.assertEqual( d.Contributors(), () )
-        self.assertEqual( d.EffectiveDate('UTC'), 'None' )
-        self.assertEqual( d.ExpirationDate('UTC'), 'None' )
-        self.assertEqual( d.Language(), '' )
-        self.assertEqual( d.Rights(), '' )
-        self.assertEqual( d.location, '' )
-        self.assertEqual( d.contact_name, '' )
-        self.assertEqual( d.contact_email, '' )
-        self.assertEqual( d.contact_phone, '' )
-        self.assertEqual( d.event_url, '' )
+        self.assertEqual(d.Title(), '')
+        self.assertEqual(d.Format(), 'text/plain')
+        self.assertEqual(d.Description(), '')
+        self.assertEqual(d.Subject(), ())
+        self.assertEqual(d.Contributors(), ())
+        self.assertEqual(d.EffectiveDate('UTC'), 'None')
+        self.assertEqual(d.ExpirationDate('UTC'), 'None')
+        self.assertEqual(d.Language(), '')
+        self.assertEqual(d.Rights(), '')
+        self.assertEqual(d.location, '')
+        self.assertEqual(d.contact_name, '')
+        self.assertEqual(d.contact_email, '')
+        self.assertEqual(d.contact_phone, '')
+        self.assertEqual(d.event_url, '')
 
     def test_PutWithMetadata(self):
         self.REQUEST['BODY'] = EVENT_TXT
@@ -180,24 +179,23 @@
         d = self._makeOne('foo')
         d.PUT(self.REQUEST, self.RESPONSE)
 
-        self.assertEqual( d.Title(), 'Test Event' )
-        self.assertEqual( d.Format(), 'text/html' )
-        self.assertEqual( d.Description().strip()
-                        , 'Fundraiser for disabled goldfish'
-                        )
-        self.assertEqual( d.Subject(), ('Foosubject',) )
-        self.assertEqual( d.Contributors(), ('Jim',) )
-        self.assertEqual( d.EffectiveDate('UTC'), '2002-01-01 00:00:00' )
-        self.assertEqual( d.ExpirationDate('UTC'), '2009-12-31 00:00:00' )
-        self.assertEqual( d.Language(), 'French' )
-        self.assertEqual( d.Rights(), 'Anytown Gazetteer' )
-        self.assertEqual( d.location, 'Spuds and Suds, River Street, Anytown' )
-        self.assertEqual( d.contact_name, 'Jim' )
-        self.assertEqual( d.contact_email, 'jim at example.com' )
-        self.assertEqual( d.contact_phone, '(888) 555-1212' )
-        self.assertEqual( d.event_url, 'http://www.example.com' )
-        self.assertEqual( d.start(), DateTime('2006/02/23 18:00') )
-        self.assertEqual( d.end(), DateTime('2006/02/23 23:00') )
+        self.assertEqual(d.Title(), 'Test Event')
+        self.assertEqual(d.Format(), 'text/html')
+        self.assertEqual(d.Description().strip(),
+                         'Fundraiser for disabled goldfish')
+        self.assertEqual(d.Subject(), ('Foosubject',))
+        self.assertEqual(d.Contributors(), ('Jim',))
+        self.assertEqual(d.EffectiveDate('UTC'), '2002-01-01 00:00:00')
+        self.assertEqual(d.ExpirationDate('UTC'), '2009-12-31 00:00:00')
+        self.assertEqual(d.Language(), 'French')
+        self.assertEqual(d.Rights(), 'Anytown Gazetteer')
+        self.assertEqual(d.location, 'Spuds and Suds, River Street, Anytown')
+        self.assertEqual(d.contact_name, 'Jim')
+        self.assertEqual(d.contact_email, 'jim at example.com')
+        self.assertEqual(d.contact_phone, '(888) 555-1212')
+        self.assertEqual(d.event_url, 'http://www.example.com')
+        self.assertEqual(d.start(), DateTime('2006/02/23 18:00'))
+        self.assertEqual(d.end(), DateTime('2006/02/23 23:00'))
 
 
 def test_suite():



More information about the checkins mailing list