Commit cfa3d6e5 authored by Jérome Perrin's avatar Jérome Perrin

fix the problem noted in r28801, those test fails when running after TestItem,

because TestItem was changing global site preference.
Instead of modifying the site preference that will affect individual variation
of all products, set individual base category list on the product in createVariatedResource


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28829 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4e2cf48c
...@@ -30,7 +30,6 @@ import unittest ...@@ -30,7 +30,6 @@ import unittest
import transaction import transaction
from DateTime import DateTime from DateTime import DateTime
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import reindex from Products.ERP5Type.tests.utils import reindex
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
...@@ -79,20 +78,13 @@ class TestItemMixin(TestSaleInvoiceMixin): ...@@ -79,20 +78,13 @@ class TestItemMixin(TestSaleInvoiceMixin):
return resource return resource
def createVariatedResource(self,title=None): def createVariatedResource(self,title=None):
preference = self.portal.portal_preferences
portal_workflow = self.portal.portal_workflow
pref = preference.newContent(portal_type='System Preference')
pref.setPreferredProductIndividualVariationBaseCategoryList(['size'])
portal_workflow.doActionFor(pref, 'enable_action')
transaction.commit()
self.tic()
resource_portal_type = 'Product' resource_portal_type = 'Product'
resource_module = self.portal.getDefaultModule(resource_portal_type) resource_module = self.portal.getDefaultModule(resource_portal_type)
resource = resource_module.newContent(portal_type=resource_portal_type) resource = resource_module.newContent(portal_type=resource_portal_type)
resource.edit( resource.edit(
title = "VariatedResource%s" % resource.getId(), title = "VariatedResource%s" % resource.getId(),
) )
resource.setIndividualVariationBaseCategoryList(('size',))
resource.setQuantityUnit('unit/piece') resource.setQuantityUnit('unit/piece')
resource.setAggregatedPortalTypeList('Item') resource.setAggregatedPortalTypeList('Item')
resource.setRequiredAggregatedPortalTypeList('Item') resource.setRequiredAggregatedPortalTypeList('Item')
...@@ -754,8 +746,6 @@ class TestItemScripts(ERP5TypeTestCase): ...@@ -754,8 +746,6 @@ class TestItemScripts(ERP5TypeTestCase):
return cell return cell
def test_Item_getVariationCategoryList(self): def test_Item_getVariationCategoryList(self):
ZopeTestCase._print("\nWARNING test_Item_getVariationCategoryList"
" fails when it is executed after TestItem, and with the same portal_id")
self.assertEquals([], self.item.Item_getVariationCategoryList()) self.assertEquals([], self.item.Item_getVariationCategoryList())
self._makeSalePackingListCellWithVariation() self._makeSalePackingListCellWithVariation()
self.assertEquals(['size/small'], self.item.Item_getVariationCategoryList()) self.assertEquals(['size/small'], self.item.Item_getVariationCategoryList())
...@@ -763,8 +753,6 @@ class TestItemScripts(ERP5TypeTestCase): ...@@ -763,8 +753,6 @@ class TestItemScripts(ERP5TypeTestCase):
self.item.Item_getVariationCategoryList(at_date=DateTime() - 2)) self.item.Item_getVariationCategoryList(at_date=DateTime() - 2))
def test_Item_getVariationRangeCategoryItemList(self): def test_Item_getVariationRangeCategoryItemList(self):
ZopeTestCase._print("\nWARNING test_Item_getVariationRangeCategoryItemList"
" fails when it is executed after TestItem, and with the same portal_id")
self.assertEquals([], self.item.Item_getVariationRangeCategoryItemList()) self.assertEquals([], self.item.Item_getVariationRangeCategoryItemList())
self._makeSalePackingListCellWithVariation() self._makeSalePackingListCellWithVariation()
self.assertEquals([['Big', 'size/big'], self.assertEquals([['Big', 'size/big'],
......
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