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

[nobody at svn.erp5.org]

Author: jm
Date: Thu Apr  8 10:44:20 2010
New Revision: 34357

URL: http://svn.erp5.org?rev=34357&view=rev
Log:
getEffectiveModel now raises if the catalog return nothin

Modified:
    erp5/trunk/products/ERP5/tests/testTradeCondition.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeCondition.py

Modified: erp5/trunk/products/ERP5/tests/testTradeCondition.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testTradeCondition.py?rev=34357&r1=34356&r2=34357&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testTradeCondition.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testTradeCondition.py [utf8] Thu Apr  8 10:44:20 2010
@@ -576,15 +576,15 @@
                     start_date=DateTime('2009/06/01'),
                     stop_date=DateTime('2009/06/01')))
 
-    # outside date range, nothing
-    self.assertEquals(None,
-        self.trade_condition.getEffectiveModel(
+    # outside date range: should it raise or return nothing ?
+    self.assertRaises(Exception,
+        self.trade_condition.getEffectiveModel,
                     start_date=DateTime('2008/06/01'),
-                    stop_date=DateTime('2008/06/01')))
-    self.assertEquals(None,
-        self.trade_condition.getEffectiveModel(
+                    stop_date=DateTime('2008/06/01'))
+    self.assertRaises(Exception,
+        self.trade_condition.getEffectiveModel,
                     start_date=DateTime('2010/06/01'),
-                    stop_date=DateTime('2010/06/01')))
+                    stop_date=DateTime('2010/06/01'))
 
   def test_getEffectiveModel_return_self(self):
     # getEffectiveModel returns the trade condition if it's effective

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeCondition.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeCondition.py?rev=34357&r1=34356&r2=34357&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeCondition.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeCondition.py [utf8] Thu Apr  8 10:44:20 2010
@@ -589,15 +589,15 @@
                     start_date=DateTime('2009/06/01'),
                     stop_date=DateTime('2009/06/01')))
 
-    # outside date range, nothing
-    self.assertEquals(None,
-        self.trade_condition.getEffectiveModel(
+    # outside date range: should it raise or return nothing ?
+    self.assertRaises(Exception,
+        self.trade_condition.getEffectiveModel,
                     start_date=DateTime('2008/06/01'),
-                    stop_date=DateTime('2008/06/01')))
-    self.assertEquals(None,
-        self.trade_condition.getEffectiveModel(
+                    stop_date=DateTime('2008/06/01'))
+    self.assertRaises(Exception,
+        self.trade_condition.getEffectiveModel,
                     start_date=DateTime('2010/06/01'),
-                    stop_date=DateTime('2010/06/01')))
+                    stop_date=DateTime('2010/06/01'))
 
   def test_getEffectiveModel_return_self(self):
     # getEffectiveModel returns the trade condition if it's effective