Commit b8417f2c authored by Sebastien Robin's avatar Sebastien Robin

this is not required to check the size of the group category, it already done...

this is not required to check the size of the group category, it already done in createCategoryTree. also this make it compatible with customer test

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13424 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4f15f7a1
...@@ -253,7 +253,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -253,7 +253,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
self.workflow_tool = self.getWorkflowTool() self.workflow_tool = self.getWorkflowTool()
self.checkUserFolderType() self.checkUserFolderType()
def beforeTearDown(self): def beforeTearDown(self):
""" """
Delete all Objects in PL & M Module Delete all Objects in PL & M Module
...@@ -266,9 +266,8 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -266,9 +266,8 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
self.getPortal().portal_simulation.manage_delObjects(simulation_id_list) self.getPortal().portal_simulation.manage_delObjects(simulation_id_list)
item_id_list = [r for r in self.getItemModule().objectIds()] item_id_list = [r for r in self.getItemModule().objectIds()]
#LOG('item_id_list before',0,item_id_list)
self.getItemModule().manage_delObjects(item_id_list) self.getItemModule().manage_delObjects(item_id_list)
#LOG('item_id_list after',0,[r for r in self.getPortal().material_module.objectIds()]) #LOG('item_id_list after',0,[r for r in self.getPortal().material_module.objectIds()])
#item_catalog = [(r.uid,r.path) for r in self.getPortal().portal_catalog(portal_type = 'Material')] #item_catalog = [(r.uid,r.path) for r in self.getPortal().portal_catalog(portal_type = 'Material')]
#LOG('item_catalog after',0,item_catalog) #LOG('item_catalog after',0,item_catalog)
...@@ -288,34 +287,33 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -288,34 +287,33 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
""" """
# Create group categories # Create group categories
category_tool = self.getCategoryTool() category_tool = self.getCategoryTool()
if len(category_tool.group.contentValues())==0: self.createCategoryTree(category_tool.group,
self.createCategoryTree(category_tool.group, [
[ ("group A","GA",
("group A","GA", [
[ ("group Aa","GAa",
("group Aa","GAa", [
[ ("group Aa1","GAa1",[]),
("group Aa1","GAa1",[]), ("group Aa2","GAa2",[])
("group Aa2","GAa2",[]) ]
] ),
), ("group Ab","GAb",
("group Ab","GAb", [
[ ("group Ab1","GAb1",[]),
("group Ab1","GAb1",[]), ("group Ab2","GAb2",[])
("group Ab2","GAb2",[]) ]
] )
) ]
] ),
), ("group B","GB",
("group B","GB", [
[ ("group Ba","GBa", []),
("group Ba","GBa", []), ("group Bb","GBb", [])
("group Bb","GBb", []) ],
], ),
), ("group C","GC", []),
("group C","GC", []), ]
] )
)
def createCategoryTree(self, current_category, category_tree): def createCategoryTree(self, current_category, category_tree):
""" """
......
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