[Erp5-report] r37647 yo - /erp5/trunk/products/ERP5/tests/testSimulationPerformance.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Aug 9 10:03:15 CEST 2010
Author: yo
Date: Mon Aug 9 10:03:15 2010
New Revision: 37647
URL: http://svn.erp5.org?rev=37647&view=rev
Log:
Fix several trivial mistakes.
Modified:
erp5/trunk/products/ERP5/tests/testSimulationPerformance.py
Modified: erp5/trunk/products/ERP5/tests/testSimulationPerformance.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testSimulationPerformance.py?rev=37647&r1=37646&r2=37647&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testSimulationPerformance.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testSimulationPerformance.py [utf8] Mon Aug 9 10:03:15 2010
@@ -208,6 +208,7 @@ class TestSimulationPerformance(ERP5Type
AcceptDecisionOfSalePackingLists
MeasureAcceptanceOfDecisions
Tic
+ UseRecipient1AsDestinationAdministration
CheckConvergedSalePackingLists
ConfirmSaleOrders
Tic
@@ -319,12 +320,12 @@ class TestSimulationPerformance(ERP5Type
sequence.set('measure_target',
'Creation of New Applied Rules from Partially Simulated Deliveries')
- def stepCreationOfNewSaleInvoices(self, sequence=None,
+ def stepMeasureCreationOfNewSaleInvoices(self, sequence=None,
sequence_list=None, **kw):
sequence.set('measure_target', 'Creation Of New Sale Invoices')
- def stepAdditionOfNewInvoiceLinesIntoSaleInvoices(self, sequence=None,
- sequence_list=None, **kw):
+ def stepMeasureAdditionOfNewInvoiceLinesIntoSaleInvoices(self,
+ sequence=None, sequence_list=None, **kw):
sequence.set('measure_target', 'Addition of New Invoices Lines')
def stepUseClientAsDestinationDecision(self, sequence=None,
@@ -348,6 +349,11 @@ class TestSimulationPerformance(ERP5Type
sequence.set('destination_administration',
'organisation_module/recipient1')
+ def stepUseRecipient2AsDestinationAdministration(self, sequence=None,
+ sequence_list=None, **kw):
+ sequence.set('destination_administration',
+ 'organisation_module/recipient2')
+
def stepUseResourceAsCommodityProduct(self, sequence=None,
sequence_list=None, **kw):
sequence.set('resource', 'product_module/commodity')
@@ -415,7 +421,7 @@ class TestSimulationPerformance(ERP5Type
for order in module.contentValues(portal_type='Sale Order'):
self.assertEquals(order.getSimulationState(), 'ordered')
order.confirm()
- self.assertEquals(order.getSimulationState(), 'confirm')
+ self.assertEquals(order.getSimulationState(), 'confirmed')
def stepCheckSaleOrderSimulation(self, sequence=None, sequence_list=None,
**kw):
@@ -428,7 +434,7 @@ class TestSimulationPerformance(ERP5Type
resource = sequence.get('resource')
self.assertEquals(module.objectCount(), number_of_sale_orders)
for order in module.contentValues(portal_type='Sale Order'):
- causality_list = order.getCausalityRelatedValueList()
+ causality_list = order.getCausalityRelatedValueList(portal_type='Applied Rule')
self.assertEquals(len(causality_list), 1)
applied_rule = causality_list[0]
self.assertEquals(applied_rule.getPortalType(), 'Applied Rule')
@@ -512,14 +518,15 @@ class TestSimulationPerformance(ERP5Type
self.assertEquals(simulation_movement.getPortalType(),
'Simulation Movement')
self.assertEquals(simulation_movement.getCausality(),
- 'business_process_module/test_bp/shipping')
+ 'business_process_module/test_bp/invoice')
tax_invoice_line = invoice_line_list[1]
self.assertEquals(tax_invoice_line.getResource(),
'service_module/vat_low')
self.assertAlmostEquals(tax_invoice_line.getQuantity(),
- 1.0 * (number_of_sale_order_lines \
- + number_of_additional_sale_packing_list_lines) \
+ commodity_invoice_line.getPrice() \
+ * (number_of_sale_order_lines \
+ + number_of_additional_sale_packing_list_lines) \
* number_of_sale_orders)
simulation_movement_list \
= tax_invoice_line.getDeliveryRelatedValueList()
@@ -565,7 +572,7 @@ class TestSimulationPerformance(ERP5Type
self.assertEquals(simulation_movement.getPortalType(),
'Simulation Movement')
self.assertEquals(simulation_movement.getCausality(),
- 'business_process_module/test_bp/shipping')
+ 'business_process_module/test_bp/invoice')
luxury_invoice_line = invoice_line_list[1]
self.assertEquals(luxury_invoice_line.getResource(),
@@ -582,13 +589,14 @@ class TestSimulationPerformance(ERP5Type
self.assertEquals(simulation_movement.getPortalType(),
'Simulation Movement')
self.assertEquals(simulation_movement.getCausality(),
- 'business_process_module/test_bp/shipping')
+ 'business_process_module/test_bp/invoice')
high_tax_invoice_line = invoice_line_list[2]
self.assertEquals(high_tax_invoice_line.getResource(),
'service_module/vat_high')
self.assertAlmostEquals(high_tax_invoice_line.getQuantity(),
- 1.0 * number_of_additional_sale_packing_list_lines \
+ luxury_invoice_line.getPrice() \
+ * number_of_additional_sale_packing_list_lines \
* number_of_sale_orders)
simulation_movement_list \
= high_tax_invoice_line.getDeliveryRelatedValueList()
@@ -605,8 +613,9 @@ class TestSimulationPerformance(ERP5Type
self.assertEquals(low_tax_invoice_line.getResource(),
'service_module/vat_low')
self.assertAlmostEquals(low_tax_invoice_line.getQuantity(),
- 1.0 * (number_of_sale_order_lines \
- + number_of_additional_sale_packing_list_lines) \
+ commodity_invoice_line.getPrice() \
+ * (number_of_sale_order_lines \
+ + number_of_additional_sale_packing_list_lines) \
* number_of_sale_orders)
simulation_movement_list \
= low_tax_invoice_line.getDeliveryRelatedValueList()
@@ -625,14 +634,14 @@ class TestSimulationPerformance(ERP5Type
portal = self.getPortal()
module = portal.sale_packing_list_module
for packing_list in module.contentValues():
- self.assertEquals(module.getCausalityState(), 'solved')
+ self.assertEquals(packing_list.getCausalityState(), 'solved')
def stepCheckDivergedSalePackingLists(self, sequence=None,
sequence_list=None, **kw):
portal = self.getPortal()
module = portal.sale_packing_list_module
for packing_list in module.contentValues():
- self.assertEquals(module.getCausalityState(), 'diverged')
+ self.assertEquals(packing_list.getCausalityState(), 'diverged')
def stepCheckSalePackingListSimulation(self, sequence=None,
sequence_list=None, **kw):
@@ -644,7 +653,7 @@ class TestSimulationPerformance(ERP5Type
destination_administration = sequence.get('destination_administration')
for packing_list in module.contentValues(portal_type='Sale Packing List'):
self.assertEquals(packing_list.getCausalityState(), 'solved')
- causality_list = packing_list.getCausalityRelatedValueList()
+ causality_list = packing_list.getCausalityRelatedValueList(portal_type='Applied Rule')
self.assertEquals(len(causality_list), 1)
applied_rule = causality_list[0]
self.assertEquals(applied_rule.getPortalType(), 'Applied Rule')
@@ -727,7 +736,7 @@ class TestSimulationPerformance(ERP5Type
module = portal.sale_packing_list_module
for packing_list in module.contentValues(portal_type='Sale Packing List'):
self.assertEquals(packing_list.getSimulationState(), 'stopped')
- packing_list.stop()
+ packing_list.deliver()
self.assertEquals(packing_list.getSimulationState(), 'delivered')
def stepTestResult(self, sequence=None, sequence_list=None, **kw):
More information about the Erp5-report
mailing list