Skip to content

erp5
erp5
Commit 7dbdbac4 authored by Lucas Carvalho's avatar Lucas Carvalho
Browse files
Options

Improved the code style, fixed some bugs and implemented some missing tests. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28315 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2eb59c1b
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 48 deletions
product/ERP5/tests/testERP5Commerce.py
View file @ 7dbdbac4
...@@ -114,23 +114,33 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -114,23 +114,33 @@ class TestCommerce(ERP5TypeTestCase):
self.login() self.login()
portal = self.getPortal() portal = self.getPortal()
# create default currency (EUR) # create default currency (EUR)
currency = portal.currency_module.newContent(portal_type = 'Currency', id = '1') currency = portal.currency_module.newContent(portal_type='Currency',
id='EUR')
currency.setTitle('EUR') currency.setTitle('EUR')
currency.setReference('EUR') currency.setReference('EUR')
currency.setBaseUnitQuantity(0.01) currency.setBaseUnitQuantity(0.01)
# create product, set price & currency # create product, set price & currency
product = portal.product_module.newContent(portal_type = 'Product', id = '1') product = portal.product_module.newContent(portal_type='Product', id='1')
product.setSupplyLinePriceCurrency(currency.getRelativeUrl()) product.setSupplyLinePriceCurrency(currency.getRelativeUrl())
product.setBasePrice(10.0) product.setBasePrice(10.0)
# create second product, set price & currency # create second product, set price & currency
product = portal.product_module.newContent(portal_type = 'Product', id = '2') product = portal.product_module.newContent(portal_type='Product', id='2')
product.setSupplyLinePriceCurrency(currency.getRelativeUrl()) product.setSupplyLinePriceCurrency(currency.getRelativeUrl())
product.setBasePrice(20.0) product.setBasePrice(20.0)
# create shipping which is actually a product # create shipping which is actually a product
shipping = portal.product_module.newContent(portal_type = 'Product', id = '3') shipping = portal.product_module.newContent(portal_type='Product',
id='3')
shipping.setSupplyLinePriceCurrency(currency.getRelativeUrl()) shipping.setSupplyLinePriceCurrency(currency.getRelativeUrl())
shipping.setBasePrice(10.0) shipping.setBasePrice(10.0)
shipping.setProductLine('shipping') shipping.setProductLine('shipping')
# validate default order rule
default_order_rule = portal.portal_rules.default_order_rule
if default_order_rule.getValidationState() != 'validated':
portal.portal_rules.default_order_rule.validate()
transaction.commit() transaction.commit()
self.tic() self.tic()
...@@ -164,11 +174,6 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -164,11 +174,6 @@ class TestCommerce(ERP5TypeTestCase):
""" """
Create a user with the given parameters Create a user with the given parameters
""" """
# Do not create an already existing user - XXX why is this needed after all ? (JPS)
if self.portal.portal_catalog.getResultValue(portal_type='Person',
reference=reference) is not None:
return
self.person_module = self.getPersonModule() self.person_module = self.getPersonModule()
person = self.person_module.newContent( person = self.person_module.newContent(
first_name=first_name, first_name=first_name,
...@@ -185,10 +190,12 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -185,10 +190,12 @@ class TestCommerce(ERP5TypeTestCase):
start_date='1972-01-01', stop_date='2999-12-31', start_date='1972-01-01', stop_date='2999-12-31',
group=group, destination_project=destination_project) group=group, destination_project=destination_project)
assignment.open() assignment.open()
transaction.commit()
get_transaction().commit()
self.tic() self.tic()
#XXX: Security hack (lucas)
self.portal.acl_users.zodb_roles.assignRoleToPrincipal('Manager', reference)
def changeUser(self, name): def changeUser(self, name):
user_folder = self.getPortal().acl_users user_folder = self.getPortal().acl_users
user = user_folder.getUserById(name).__of__(user_folder) user = user_folder.getUserById(name).__of__(user_folder)
...@@ -209,7 +216,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -209,7 +216,7 @@ class TestCommerce(ERP5TypeTestCase):
return ('erp5_base', 'erp5_web', return ('erp5_base', 'erp5_web',
'erp5_trade', 'erp5_pdm', 'erp5_commerce',) 'erp5_trade', 'erp5_pdm', 'erp5_commerce',)
def getDefaultProduct(self, id = '1'): def getDefaultProduct(self, id='1'):
""" """
Get default product. Get default product.
""" """
...@@ -224,41 +231,62 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -224,41 +231,62 @@ class TestCommerce(ERP5TypeTestCase):
euro.validate() euro.validate()
category_list = [] category_list = []
ldlc = portal.portal_categories.product_line.newContent(portal_type='Category', id='ldlc', title='LDLC') portal_categories = portal.portal_categories
laptop = ldlc.newContent(portal_type='Category', id='laptop', title='Laptop') ldlc = portal_categories.product_line.newContent(portal_type='Category',
id='ldlc',
title='LDLC')
laptop = ldlc.newContent(portal_type='Category',
id='laptop',
title='Laptop')
netbook = laptop.newContent(portal_type='Category',
id='netbook',
title='Netbook')
lcd = ldlc.newContent(portal_type='Category',
id='lcd',
title='Lcd Screen')
mp3_player = ldlc.newContent(portal_type='Category',
id='mp3',
title='Mp3 Player')
category_list.append(laptop) category_list.append(laptop)
netbook = laptop.newContent(portal_type='Category', id='netbook', title='Netbook')
category_list.append(netbook) category_list.append(netbook)
category_list.append(ldlc.newContent(portal_type='Category', id='lcd', title='Lcd Screen')) category_list.append(lcd)
category_list.append(ldlc.newContent(portal_type='Category', id='mp3', title='Mp3 Player')) category_list.append(mp3_player)
product_list = [] product_list = []
for category in category_list: for category in category_list:
for i in range(3): for i in range(3):
product = portal.product_module.newContent(portal_type="Product", title='%s %s' % (category.getTitle(),i), reference='%s_%s' % (category.getId(),i)) title = '%s %s' % (category.getTitle(), i)
product.setProductLine(category.getRelativeUrl().replace('product_line/', '')) reference = '%s_%s' % (category.getId(), i)
product = portal.product_module.newContent(portal_type="Product",
title=title,
reference=reference)
product_line = category.getRelativeUrl().replace('product_line/', '')
product.setProductLine(product_line)
product.setQuantityUnit('unit/piece') product.setQuantityUnit('unit/piece')
supply_line = product.newContent(id='default_supply_line',portal_type='Supply Line') supply_line = product.newContent(id='default_supply_line',
portal_type='Supply Line')
supply_line.setBasePrice(10 * (i + 1)) supply_line.setBasePrice(10 * (i + 1))
supply_line.setPricedQuantity(1) supply_line.setPricedQuantity(1)
supply_line.setDefaultResourceValue(product) supply_line.setDefaultResourceValue(product)
supply_line.setPriceCurrency('currency_module/1') supply_line.setPriceCurrency('currency_module/EUR')
product_list.append(product) product_list.append(product)
for product in product_list: for product in product_list:
product.validate() product.validate()
ups = portal.product_module.newContent(portal_type='Product', ups = portal.product_module.newContent(portal_type='Product',
title='UPS Shipping : 24h', title='UPS Shipping : 24h')
)
ups.validate() ups.validate()
ups.setQuantityUnit('unit/piece') ups.setQuantityUnit('unit/piece')
supply_line = ups.setProductLine('shipping/UPS24h') supply_line = ups.setProductLine('shipping/UPS24h')
supply_line = ups.newContent(id='default_supply_line',portal_type='Supply Line') supply_line = ups.newContent(id='default_supply_line',
portal_type='Supply Line')
supply_line.setBasePrice(10) supply_line.setBasePrice(10)
supply_line.setPricedQuantity(1) supply_line.setPricedQuantity(1)
supply_line.setDefaultResourceValue(product) supply_line.setDefaultResourceValue(product)
supply_line.setPriceCurrency('currency_module/1') supply_line.setPriceCurrency('currency_module/EUR')
def createUser(self, name, role_list): def createUser(self, name, role_list):
user_folder = self.getPortal().acl_users user_folder = self.getPortal().acl_users
...@@ -279,7 +307,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -279,7 +307,7 @@ class TestCommerce(ERP5TypeTestCase):
# add supported languages for Localizer # add supported languages for Localizer
localizer = portal.Localizer localizer = portal.Localizer
for language in LANGUAGE_LIST: for language in LANGUAGE_LIST:
localizer.manage_addLanguage(language = language) localizer.manage_addLanguage(language=language)
# create website # create website
if hasattr(portal.web_site_module, 'web_site'): if hasattr(portal.web_site_module, 'web_site'):
...@@ -301,7 +329,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -301,7 +329,7 @@ class TestCommerce(ERP5TypeTestCase):
last_name='master', last_name='master',
reference='webmaster', reference='webmaster',
group=None) group=None)
#XXX INSERT security here
return web_site return web_site
def test_01_AddResourceToShoppingCart(self, quiet=0, run=run_all_test): def test_01_AddResourceToShoppingCart(self, quiet=0, run=run_all_test):
...@@ -615,7 +643,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -615,7 +643,7 @@ class TestCommerce(ERP5TypeTestCase):
request.RESPONSE.getHeader('location')) request.RESPONSE.getHeader('location'))
self.assertEquals(0, len(portal.SaleOrder_getShoppingCartItemList())) self.assertEquals(0, len(portal.SaleOrder_getShoppingCartItemList()))
def test_12_externalPaymentHandlet(self, quiet=0, run=run_all_test): def test_12_externalPaymentHandler(self, quiet=0, run=run_all_test):
""" """
Test the SaleOrder_externalPaymentHandler script Test the SaleOrder_externalPaymentHandler script
""" """
...@@ -642,18 +670,36 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -642,18 +670,36 @@ class TestCommerce(ERP5TypeTestCase):
message = '\nTest the finalisation of the shopping procedure' message = '\nTest the finalisation of the shopping procedure'
ZopeTestCase._print(message) ZopeTestCase._print(message)
LOG('Testing... ', 0, message) LOG('Testing... ', 0, message)
self.createTestUser(first_name="Lucas",
last_name='Carvalho',
reference='lucas',
group=None)
self.changeUser('lucas')
portal = self.getPortal() portal = self.getPortal()
request = self.app.REQUEST request = self.app.REQUEST
default_product = self.getDefaultProduct()
request.set('session_id', SESSION_ID) request.set('session_id', SESSION_ID)
portal.Resource_addToShoppingCart(default_product, quantity=1)
self.tic() portal.Resource_addToShoppingCart(self.getDefaultProduct(), quantity=1)
portal.Resource_addToShoppingCart(self.getDefaultProduct('2'), quantity=1)
transaction.commit() transaction.commit()
self.assertEquals(1, len(portal.SaleOrder_getShoppingCartItemList())) self.tic()
self.assertEquals(2, len(portal.SaleOrder_getShoppingCartItemList()))
self.assertEquals(0, len(portal.sale_order_module.contentValues())) self.assertEquals(0, len(portal.sale_order_module.contentValues()))
# XXX : to finish portal.SaleOrder_finalizeShopping()
transaction.commit()
self.tic()
sale_order_object_list = portal.sale_order_module.contentValues()
self.assertEquals(1, len(sale_order_object_list))
self.assertEquals(2, len(sale_order_object_list[0].contentValues()))
self.assertEquals(0, len(portal.SaleOrder_getShoppingCartItemList()))
self.changeUser('ivan')
def test_14_getAvailableShippingResourceList(self, quiet=0, run=run_all_test): def test_14_getAvailableShippingResourceList(self, quiet=0, run=run_all_test):
""" """
...@@ -665,12 +711,22 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -665,12 +711,22 @@ class TestCommerce(ERP5TypeTestCase):
message = '\nTest to get the available shipping resource list' message = '\nTest to get the available shipping resource list'
ZopeTestCase._print(message) ZopeTestCase._print(message)
LOG('Testing... ', 0, message) LOG('Testing... ', 0, message)
portal = self.getPortal() portal = self.getPortal()
request = self.app.REQUEST request = self.app.REQUEST
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
request.set('session_id', SESSION_ID) request.set('session_id', SESSION_ID)
# XXX : to finish shipping = portal.portal_categories.product_line.shipping.getRelativeUrl()
portal.product_module.newContent(portal_type='Product',
title='shipping',
product_line=shipping)
transaction.commit()
self.tic()
self.assertEquals(2,
len(portal.SaleOrder_getAvailableShippingResourceList()))
def test_15_getFormatedData(self, quiet=0, run=run_all_test): def test_15_getFormatedData(self, quiet=0, run=run_all_test):
""" """
...@@ -712,10 +768,14 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -712,10 +768,14 @@ class TestCommerce(ERP5TypeTestCase):
portal.Resource_addToShoppingCart(default_product, 1) portal.Resource_addToShoppingCart(default_product, 1)
shopping_cart = portal.SaleOrder_getShoppingCart() shopping_cart = portal.SaleOrder_getShoppingCart()
shipping_resource_list = portal.SaleOrder_getAvailableShippingResourceList() shipping_resource_list = portal.SaleOrder_getAvailableShippingResourceList()
# how to set shopping_cart.shipping_method ?
#self.assertEquals(shipping_resource_list[0], order_line = getattr(shopping_cart, 'shipping_method', None)
# portal.SaleOrder_getSelectedShippingResource()) if order_line is None:
order_line = shopping_cart.newContent(id='shipping_method', portal_type='Sale Order Line')
order_line.setResource(shipping_resource_list[0].getRelativeUrl())
order_line.setQuantity(1)
self.assertEquals(shipping_resource_list[0].getRelativeUrl(),
portal.SaleOrder_getSelectedShippingResource())
def test_17_getShoppingCartDefaultCurrency(self, quiet=0, run=run_all_test): def test_17_getShoppingCartDefaultCurrency(self, quiet=0, run=run_all_test):
""" """
...@@ -729,7 +789,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -729,7 +789,7 @@ class TestCommerce(ERP5TypeTestCase):
LOG('Testing... ', 0, message) LOG('Testing... ', 0, message)
portal = self.getPortal() portal = self.getPortal()
currency = portal.restrictedTraverse('currency_module/1') currency = portal.restrictedTraverse('currency_module/EUR')
self.assertEquals(currency, portal.SaleOrder_getShoppingCartDefaultCurrency()) self.assertEquals(currency, portal.SaleOrder_getShoppingCartDefaultCurrency())
...@@ -756,6 +816,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -756,6 +816,7 @@ class TestCommerce(ERP5TypeTestCase):
message = '\nTest to simulate paypal payment.' message = '\nTest to simulate paypal payment.'
ZopeTestCase._print(message) ZopeTestCase._print(message)
LOG('Testing... ', 0, message) LOG('Testing... ', 0, message)
portal = self.getPortal() portal = self.getPortal()
# create new python script to replace the external method # create new python script to replace the external method
...@@ -776,19 +837,27 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -776,19 +837,27 @@ class TestCommerce(ERP5TypeTestCase):
web_site.setProperty('ecommerce_paypal_signature', 'signature') web_site.setProperty('ecommerce_paypal_signature', 'signature')
#2 login and activate a cart #2 login and activate a cart
#self.changeUser('webmaster') self.changeUser('webmaster')
request = self.app.REQUEST request = self.app.REQUEST
request.set('session_id', SESSION_ID) request.set('session_id', SESSION_ID)
#3 add a product in the cart #3 add a product in the cart
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
portal.Resource_addToShoppingCart(default_product, 1) portal.Resource_addToShoppingCart(resource=default_product, quantity=1)
get_transaction().commit() transaction.commit()
self.tic() self.tic()
#4 chose a shipping for the cart #4 chose a shipping for the cart
shopping_cart = portal.SaleOrder_getShoppingCart()
shipping_resource_list = portal.SaleOrder_getAvailableShippingResourceList() shipping_resource_list = portal.SaleOrder_getAvailableShippingResourceList()
#XXX apply it to the cart order_line = getattr(shopping_cart, 'shipping_method', None)
if order_line is None:
order_line = shopping_cart.newContent(id='shipping_method',
portal_type='Sale Order Line')
order_line.setResource(shipping_resource_list[0].getRelativeUrl())
order_line.setQuantity(1)
self.assertEquals(shipping_resource_list[0].getRelativeUrl(),
portal.SaleOrder_getSelectedShippingResource())
#5 : paypal step 1 : get a new token #5 : paypal step 1 : get a new token
token = web_site.WebSite_getNewPaypalToken() token = web_site.WebSite_getNewPaypalToken()
...@@ -806,13 +875,14 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -806,13 +875,14 @@ class TestCommerce(ERP5TypeTestCase):
#8 : paypal step 4 : validate the payment #8 : paypal step 4 : validate the payment
self.assertEquals(1, len(portal.SaleOrder_getShoppingCartItemList())) self.assertEquals(1, len(portal.SaleOrder_getShoppingCartItemList()))
self.assertEquals(0, len(portal.sale_order_module.contentValues())) self.assertEquals(0, len(portal.sale_order_module.contentValues()))
#web_site.WebSection_doPaypalPayment(token=token)
#get_transaction().commit() web_site.WebSection_doPaypalPayment(token=token)
#self.tic() transaction.commit()
self.tic()
#9 check if sale order created #9 check if sale order created
#self.assertEquals(0, len(portal.SaleOrder_getShoppingCartItemList())) self.assertEquals(0, len(portal.SaleOrder_getShoppingCartItemList()))
#self.assertEquals(1, len(portal.sale_order_module.contentValues())) self.assertEquals(1, len(portal.sale_order_module.contentValues()))
custom_skin.manage_delObjects([method_id]) custom_skin.manage_delObjects([method_id])
self.changeUser('ivan') self.changeUser('ivan')
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7