Commit 857fdf94 authored by Łukasz Nowak's avatar Łukasz Nowak

- create testTradeModelLine file with mixing and classes to test only Trade...

 - create testTradeModelLine file with mixing and classes to test only Trade Model Lines, move there specific things from testBPMCore
 - update testPayroll and testMRP to follow this change
  - create base of TestTradeModelLineMixin and use it in testPayroll
 - update copyrights in files, do smaller cleanups to avoid code repetition
 - clean up imports


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28067 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 88bf8fb0
This diff is collapsed.
...@@ -30,10 +30,8 @@ import unittest ...@@ -30,10 +30,8 @@ import unittest
import transaction import transaction
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager
from DateTime import DateTime from DateTime import DateTime
from Products.ERP5Type.tests.Sequence import SequenceList
from Products.CMFCore.utils import getToolByName from Products.CMFCore.utils import getToolByName
from Products.ERP5Type.tests.utils import reindex from Products.ERP5Type.tests.utils import reindex
...@@ -48,8 +46,7 @@ class TestMRPMixin(TestBPMMixin): ...@@ -48,8 +46,7 @@ class TestMRPMixin(TestBPMMixin):
order_line_portal_type = 'Production Order Line' order_line_portal_type = 'Production Order Line'
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting', return TestBPMMixin.getBusinessTemplateList(self) + ('erp5_mrp', )
'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_mrp')
def invalidateRules(self): def invalidateRules(self):
""" """
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# #
############################################################################## ##############################################################################
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5ReportTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5ReportTestCase
from Products.ERP5.tests.testBPMCore import TestBPMMixin from Products.ERP5.tests.testTradeModelLine import TestTradeModelLineMixin
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from Products.ERP5Type.tests.Sequence import SequenceList from Products.ERP5Type.tests.Sequence import SequenceList
from Products.ERP5Type.tests.utils import reindex from Products.ERP5Type.tests.utils import reindex
...@@ -34,7 +34,7 @@ from Products.CMFCore.utils import getToolByName ...@@ -34,7 +34,7 @@ from Products.CMFCore.utils import getToolByName
from DateTime import DateTime from DateTime import DateTime
import transaction import transaction
class TestPayrollMixin(ERP5ReportTestCase, TestBPMMixin): class TestPayrollMixin(ERP5ReportTestCase, TestTradeModelLineMixin):
normal_resource_use_category_list = ['payroll/base_salary'] normal_resource_use_category_list = ['payroll/base_salary']
invoicing_resource_use_category_list = ['payroll/tax'] invoicing_resource_use_category_list = ['payroll/tax']
...@@ -174,10 +174,7 @@ class TestPayrollMixin(ERP5ReportTestCase, TestBPMMixin): ...@@ -174,10 +174,7 @@ class TestPayrollMixin(ERP5ReportTestCase, TestBPMMixin):
) )
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
""" """ return TestTradeModelLineMixin.getBusinessTemplateList(self) + ('erp5_payroll', )
return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_mrp',
'erp5_payroll')
def createService(self): def createService(self):
module = self.portal.getDefaultModule(portal_type='Service') module = self.portal.getDefaultModule(portal_type='Service')
......
This diff is collapsed.
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