[Erp5-report] r24609 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov 17 16:12:57 2008
New Revision: 24609

URL: http://svn.erp5.org?rev=24609&view=rev
Log:
use RoleInformation methods getCategory and getBaseCategory instead of
accessing atributes directly.
add test for missing role information values


Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py
    erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=24609&r1=24608&r2=24609&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Mon Nov 17 16:12:57 2008
@@ -2323,11 +2323,8 @@
         if prop_value:
           type_role_dict['condition'] = prop_value.text
         # multi
-        for property in ('category', 'base_category'):
-          prop_value_list = []
-          for prop_value in getattr(role, property):
-            prop_value_list.append(prop_value)
-          type_role_dict[property] = prop_value_list
+        type_role_dict['category'] = role.getCategory()
+        type_role_dict['base_category'] = role.getBaseCategory()
         type_role_list.append(type_role_dict)
       self._objects[relative_url] = type_role_list
 

Modified: erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBusinessTemplate.py?rev=24609&r1=24608&r2=24609&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] Mon Nov 17 16:12:57 2008
@@ -4935,8 +4935,8 @@
                        name='Geek Role Definition',
                        condition='',
                        category='group/g1\nfunction/f1\n',
-                       base_category_script='',
-                       base_category='',)
+                       base_category_script='Base Category Script',
+                       base_category='group site',)
 
     sequence.edit(portal_type_role='geek_role_definition')
 
@@ -4968,6 +4968,8 @@
     self.assertEquals('Geek Role Definition', role.title)
     self.assertEquals('A definition with non ascii chars éàè', role.description)
     self.assertEquals(('group/g1','function/f1'), role.getCategory())
+    self.assertEquals(('group','site'), role.getBaseCategory())
+    self.assertEquals('Base Category Script', role.getBaseCategoryScript())
 
   def test_36_CheckPortalTypeRoles(self, quiet=quiet, run=run_all_test):
     if not run: return