[Erp5-report] r42133 jm - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Fri Jan  7 19:23:58 2011
New Revision: 42133

URL: http://svn.erp5.org?rev=42133&view=rev
Log:
Fix testLegacyTradeModelLine WRT r42117

Modified:
    erp5/trunk/products/ERP5/tests/testTradeModelLine.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py

Modified: erp5/trunk/products/ERP5/tests/testTradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testTradeModelLine.py?rev=42133&r1=42132&r2=42133&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testTradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testTradeModelLine.py [utf8] Fri Jan  7 19:23:58 2011
@@ -180,9 +180,13 @@ class TestTradeModelLineMixin(TestBPMMix
       order.newContent(portal_type=self.order_line_portal_type, **line_kw)
     return order
 
+  def getAggregatedAmountList(self, amount_generator, *args, **kw):
+    return amount_generator.getAggregatedAmountList(*args, **kw)
+
   def getAggregatedAmountDict(self, amount_generator, partial_check=False,
+                              ignore_empty_amounts=False,
                               **expected_amount_dict):
-    amount_list = amount_generator.getAggregatedAmountList()
+    amount_list = self.getAggregatedAmountList(amount_generator)
     amount_dict = {}
     for amount in amount_list:
       reference = amount.getReference()
@@ -789,7 +793,7 @@ return lambda *args, **kw: 1""")
     order = self.createOrder(trade_condition, (
       dict(),
       ))
-    self.assertEqual([], order.getAggregatedAmountList())
+    self.assertEqual([], self.getAggregatedAmountList(order))
     for line in trade_condition.objectValues():
       line.setBaseApplication(fixed_quantity)
     amount_list = order.getAggregatedAmountList()

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py?rev=42133&r1=42132&r2=42133&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py [utf8] Fri Jan  7 19:23:58 2011
@@ -41,6 +41,11 @@ def test_suite():
   suite.addTest(unittest.makeSuite(TestComplexTradeModelLineUseCasePurchase))
   return suite
 
+def getAggregatedAmountList(self, amount_generator, *args, **kw):
+  kw.setdefault('generate_empty_amounts', False)
+  return amount_generator.getAggregatedAmountList(*args, **kw)
+TestTradeModelLineMixin.getAggregatedAmountList = getAggregatedAmountList
+
 ###
 ##  TestTradeModelLine
 ##
@@ -143,6 +148,8 @@ def checkTradeModelRuleSimulationExpand(
                           ['base_amount/' + use])
         self.assertEqual(sm.getBaseContributionList(),
                           dict(discount=['base_amount/tax'], tax=[])[use])
-    self.assertEqual({}, result_dict)
+    # Ignore SM that were created from empty amounts
+    self.assertEqual({}, dict(x for x in result_dict.iteritems()
+                                if x[1].getQuantity()))
 TestTradeModelLine.checkTradeModelRuleSimulationExpand = \
   checkTradeModelRuleSimulationExpand