Reviewers: ,
Please review this at http://codereview.tryton.org/570002/
Affected files:
M service.py
M tests/test_project_revenue.py
Index: service.py
===================================================================
--- a/service.py
+++ b/service.py
@@ -56,6 +56,7 @@
for edate, ecost in employee_costs:
if date >= edate:
cost = ecost
+ else:
break
return cost
Index: tests/test_project_revenue.py
===================================================================
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.py
@@ -10,8 +10,13 @@
sys.path.insert(0, os.path.dirname(DIR))
import unittest
+import datetime
+from decimal import Decimal
+
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT,
test_view,\
+ test_depends
+from trytond.transaction import Transaction
class ProjectRevenueTestCase(unittest.TestCase):
@@ -21,6 +26,9 @@
def setUp(self):
trytond.tests.test_tryton.install_module('project_revenue')
+ self.employee = POOL.get('company.employee')
+ self.employee_cost_price = POOL.get('company.employee_cost_price')
+ self.company = POOL.get('company.company')
def test0005views(self):
'''
@@ -34,9 +42,44 @@
'''
test_depends()
+ def test0010compute_cost_price(self):
+ '''
+ Test compute_cost_price
+ '''
+ cost_prices = [
+ (datetime.date(2011, 1, 1), Decimal(10)),
+ (datetime.date(2012, 1, 1), Decimal(15)),
+ (datetime.date(2013, 1, 1), Decimal(20)),
+ ]
+ test_prices = [
+ (datetime.date(2010, 1, 1), 0),
+ (datetime.date(2011, 1, 1), Decimal(10)),
+ (datetime.date(2011, 6, 1), Decimal(10)),
+ (datetime.date(2012, 1, 1), Decimal(15)),
+ (datetime.date(2012, 6, 1), Decimal(15)),
+ (datetime.date(2013, 1, 1), Decimal(20)),
+ (datetime.date(2013, 6, 1), Decimal(20)),
+ ]
+ with Transaction().start(DB_NAME, USER, context=CONTEXT):
+ company, = self.company.search([('name', '=', 'B2CK')])
+ employee = self.employee(name='Pam Beesly',
+ company=company)
+ employee.save()
+ for date, cost_price in cost_prices:
+ self.employee_cost_price(
+ employee=employee,
+ date=date,
+ cost_price=cost_price).save()
+ for date, cost_price in test_prices:
+ self.assertEqual(employee.compute_cost_price(date),
cost_price)
+
def suite():
suite = trytond.tests.test_tryton.suite()
+ from trytond.modules.company.tests import test_company
+ for test in test_company.suite():
+ if test not in suite:
+ suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
ProjectRevenueTestCase))
return suite
--
[email protected] mailing list
