Commit 4e6af963 authored by Vincent Desmares's avatar Vincent Desmares

Fix all tests who was dependent each others.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26433 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9fc1b7af
...@@ -32,6 +32,7 @@ from Testing import ZopeTestCase ...@@ -32,6 +32,7 @@ from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from zLOG import LOG from zLOG import LOG
import transaction
SESSION_ID = "12345678" SESSION_ID = "12345678"
...@@ -63,6 +64,18 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -63,6 +64,18 @@ class TestCommerce(ERP5TypeTestCase):
shipping.setSupplyLinePriceCurrency(currency.getRelativeUrl()) shipping.setSupplyLinePriceCurrency(currency.getRelativeUrl())
shipping.setBasePrice(10.0) shipping.setBasePrice(10.0)
shipping.setProductLine('shipping') shipping.setProductLine('shipping')
transaction.commit()
self.tic()
def clearModule(self, module):
module.manage_delObjects(list(module.objectIds()))
transaction.commit()
self.tic()
def beforeTearDown(self):
self.clearModule(self.portal.product_module)
self.clearModule(self.portal.sale_order_module)
self.clearModule(self.portal.currency_module)
def login(self, quiet=0, run=run_all_test): def login(self, quiet=0, run=run_all_test):
uf = self.getPortal().acl_users uf = self.getPortal().acl_users
...@@ -124,9 +137,10 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -124,9 +137,10 @@ class TestCommerce(ERP5TypeTestCase):
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
request.set('session_id', SESSION_ID) request.set('session_id', SESSION_ID)
# add in two speps same product and check that we do not create # add in two steps same product and check that we do not create
# new Sale Order Line but just increase quantity on existing one # new Sale Order Line but just increase quantity on existing one
portal.Resource_addToShoppingCart(default_product, 1) portal.Resource_addToShoppingCart(default_product, 1)
portal.Resource_addToShoppingCart(default_product, 1)
shoppping_cart_items = portal.SaleOrder_getShoppingCartItemList() shoppping_cart_items = portal.SaleOrder_getShoppingCartItemList()
self.assertEquals(1, len(shoppping_cart_items)) self.assertEquals(1, len(shoppping_cart_items))
self.assertEquals(2, shoppping_cart_items[0].getQuantity()) self.assertEquals(2, shoppping_cart_items[0].getQuantity())
...@@ -150,6 +164,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -150,6 +164,8 @@ class TestCommerce(ERP5TypeTestCase):
request.set('session_id', SESSION_ID) request.set('session_id', SESSION_ID)
# add second diff product and check that we create new Sale Order Line # add second diff product and check that we create new Sale Order Line
portal.Resource_addToShoppingCart(default_product, 1)
portal.Resource_addToShoppingCart(default_product, 1)
portal.Resource_addToShoppingCart(another_product, 1) portal.Resource_addToShoppingCart(another_product, 1)
shoppping_cart_items = portal.SaleOrder_getShoppingCartItemList() shoppping_cart_items = portal.SaleOrder_getShoppingCartItemList()
self.assertEquals(2, len(shoppping_cart_items)) self.assertEquals(2, len(shoppping_cart_items))
...@@ -176,6 +192,9 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -176,6 +192,9 @@ class TestCommerce(ERP5TypeTestCase):
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
another_product = self.getDefaultProduct(id = '2') another_product = self.getDefaultProduct(id = '2')
request.set('session_id', SESSION_ID) request.set('session_id', SESSION_ID)
portal.Resource_addToShoppingCart(default_product, 1)
portal.Resource_addToShoppingCart(default_product, 1)
portal.Resource_addToShoppingCart(another_product, 1)
shopping_cart = portal.SaleOrder_getShoppingCart() shopping_cart = portal.SaleOrder_getShoppingCart()
self.assertEquals(40.0, \ self.assertEquals(40.0, \
......
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