[Erp5-report] r19368 - /erp5/trunk/products/ERP5/tests/testCRM.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Feb 19 09:27:52 2008
New Revision: 19368

URL: http://svn.erp5.org?rev=19368&view=rev
Log:
this test should not hardcode portal ID

Modified:
    erp5/trunk/products/ERP5/tests/testCRM.py

Modified: erp5/trunk/products/ERP5/tests/testCRM.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testCRM.py?rev=19368&r1=19367&r2=19368&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testCRM.py (original)
+++ erp5/trunk/products/ERP5/tests/testCRM.py Tue Feb 19 09:27:52 2008
@@ -46,16 +46,17 @@
 
   def test_Event_CreateRelatedEvent(self):
     # test action to create a related event from an event
+    event_module = self.portal.event_module
+    event_module_url = event_module.absolute_url()
     for ptype in self.portal.getPortalEventTypeList():
-      event = self.portal.event_module.newContent(
-                        portal_type=ptype)
+      event = event_module.newContent(portal_type=ptype)
       redirect = event.Event_createRelatedEvent(
                                      portal_type=ptype,
                                      title='New Title',
                                      description='New Desc')
-      self.assert_(redirect.startswith('http://nohost/erp5/event_module/'))
-      new_id = redirect[
-                  len('http://nohost/erp5/event_module/'):].split('/', 1)[0]
+      self.assert_(redirect.startswith(event_module_url), redirect)
+      # event_module_url does not contain trailing slash, so add +1 to its len
+      new_id = redirect[len(event_module_url)+1:].split('/', 1)[0]
       new_event = self.portal.event_module._getOb(new_id)
       self.assertEquals(event, new_event.getCausalityValue())
  
@@ -71,6 +72,7 @@
     
   def test_Ticket_CreateRelatedEvent(self):
     # test action to create a related event from a ticket
+    event_module_url = self.portal.event_module.absolute_url()
     ticket = self.portal.meeting_module.newContent(portal_type='Meeting')
     for ptype in self.portal.getPortalEventTypeList():
       # incoming
@@ -78,9 +80,8 @@
                                         portal_type=ptype,
                                         title='New Title',
                                         description='New Desc')
-      self.assert_(redirect.startswith('http://nohost/erp5/event_module/'))
-      new_id = redirect[
-                  len('http://nohost/erp5/event_module/'):].split('/', 1)[0]
+      self.assert_(redirect.startswith(event_module_url), redirect)
+      new_id = redirect[len(event_module_url)+1:].split('/', 1)[0]
       new_event = self.portal.event_module._getOb(new_id)
       self.assertEquals(ticket, new_event.getFollowUpValue())
       self.assertEquals('new', new_event.getSimulationState())
@@ -90,9 +91,8 @@
                                         portal_type=ptype,
                                         title='New Title',
                                         description='New Desc')
-      self.assert_(redirect.startswith('http://nohost/erp5/event_module/'))
-      new_id = redirect[
-                  len('http://nohost/erp5/event_module/'):].split('/', 1)[0]
+      self.assert_(redirect.startswith(event_module_url), redirect)
+      new_id = redirect[len(event_module_url)+1:].split('/', 1)[0]
       new_event = self.portal.event_module._getOb(new_id)
       self.assertEquals(ticket, new_event.getFollowUpValue())
       self.assertEquals('planned', new_event.getSimulationState())