Commit 9818e3a1 authored by Vincent Pelletier's avatar Vincent Pelletier

dict.__contains__ works on keys, no need to make this explicit.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41572 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a146ab90
...@@ -108,10 +108,10 @@ class TestICal(ERP5TypeTestCase): ...@@ -108,10 +108,10 @@ class TestICal(ERP5TypeTestCase):
self.tic() self.tic()
feed_dict = self.getICalFeed(module) feed_dict = self.getICalFeed(module)
self.assertTrue('BEGIN:VCALENDAR' in feed_dict.keys()) self.assertTrue('BEGIN:VCALENDAR' in feed_dict)
self.assertTrue('END:VCALENDAR' in feed_dict.keys()) self.assertTrue('END:VCALENDAR' in feed_dict)
self.assertTrue('BEGIN:VEVENT' in feed_dict.keys()) self.assertTrue('BEGIN:VEVENT' in feed_dict)
self.assertTrue('END:VEVENT' in feed_dict.keys()) self.assertTrue('END:VEVENT' in feed_dict)
self.assertEquals(feed_dict['SUMMARY'], 'Event One') self.assertEquals(feed_dict['SUMMARY'], 'Event One')
# if not set start date, it must be same as creation date # if not set start date, it must be same as creation date
# if not set end date, it must be same as start date # if not set end date, it must be same as start date
...@@ -122,7 +122,7 @@ class TestICal(ERP5TypeTestCase): ...@@ -122,7 +122,7 @@ class TestICal(ERP5TypeTestCase):
self.assertEquals(feed_dict['URL'], event.absolute_url()) self.assertEquals(feed_dict['URL'], event.absolute_url())
self.assertEquals(feed_dict['UID'], 'uuid%s' % event.getUid()) self.assertEquals(feed_dict['UID'], 'uuid%s' % event.getUid())
# there is no description # there is no description
self.assertFalse('DESCRIPTION' in feed_dict.keys()) self.assertFalse('DESCRIPTION' in feed_dict)
# current workflow state - draft # current workflow state - draft
self.assertEquals(feed_dict['STATUS'], 'TENTATIVE') self.assertEquals(feed_dict['STATUS'], 'TENTATIVE')
...@@ -183,10 +183,10 @@ class TestICal(ERP5TypeTestCase): ...@@ -183,10 +183,10 @@ class TestICal(ERP5TypeTestCase):
# current workflow state - draft # current workflow state - draft
feed_dict = self.getICalFeed(module) feed_dict = self.getICalFeed(module)
self.assertTrue('BEGIN:VCALENDAR' in feed_dict.keys()) self.assertTrue('BEGIN:VCALENDAR' in feed_dict)
self.assertTrue('END:VCALENDAR' in feed_dict.keys()) self.assertTrue('END:VCALENDAR' in feed_dict)
self.assertTrue('BEGIN:VTODO' in feed_dict.keys()) self.assertTrue('BEGIN:VTODO' in feed_dict)
self.assertTrue('END:VTODO' in feed_dict.keys()) self.assertTrue('END:VTODO' in feed_dict)
self.assertEquals(feed_dict['SUMMARY'], 'Task One') self.assertEquals(feed_dict['SUMMARY'], 'Task One')
self.assertEquals(feed_dict['STATUS'], 'NEEDS-ACTION') self.assertEquals(feed_dict['STATUS'], 'NEEDS-ACTION')
self.assertEquals(feed_dict.get('PERCENT-COMPLETE', '0'), '0') # when it is zero it doesn't have to be there self.assertEquals(feed_dict.get('PERCENT-COMPLETE', '0'), '0') # when it is zero it doesn't have to be there
...@@ -261,10 +261,10 @@ class TestICal(ERP5TypeTestCase): ...@@ -261,10 +261,10 @@ class TestICal(ERP5TypeTestCase):
feed_string = self.portal.person_module.Test_view() feed_string = self.portal.person_module.Test_view()
feed_dict = self.parseICalFeed(feed_string) feed_dict = self.parseICalFeed(feed_string)
self.assertTrue('BEGIN:VCALENDAR' in feed_dict.keys()) self.assertTrue('BEGIN:VCALENDAR' in feed_dict)
self.assertTrue('END:VCALENDAR' in feed_dict.keys()) self.assertTrue('END:VCALENDAR' in feed_dict)
self.assertTrue('BEGIN:VJOURNAL' in feed_dict.keys()) self.assertTrue('BEGIN:VJOURNAL' in feed_dict)
self.assertTrue('END:VJOURNAL' in feed_dict.keys()) self.assertTrue('END:VJOURNAL' in feed_dict)
self.assertEquals(feed_dict['SUMMARY'], 'One') self.assertEquals(feed_dict['SUMMARY'], 'One')
self.assertEquals(feed_dict['DESCRIPTION'], 'Person One') self.assertEquals(feed_dict['DESCRIPTION'], 'Person One')
self.assertEquals(feed_dict['CREATED'], one.getCreationDate().HTML4().replace('-','').replace(':','')) self.assertEquals(feed_dict['CREATED'], one.getCreationDate().HTML4().replace('-','').replace(':',''))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment