From f56ba71228e103e963516854a070dcf159acff32 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Thu, 8 Apr 2010 08:44:20 +0000
Subject: [PATCH] getEffectiveModel now raises if the catalog return nothin

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34357 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5/tests/testTradeCondition.py           | 14 +++++++-------
 .../ERP5Legacy/tests/testLegacyTradeCondition.py   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/product/ERP5/tests/testTradeCondition.py b/product/ERP5/tests/testTradeCondition.py
index 22b22127ae..8ce34925cb 100644
--- a/product/ERP5/tests/testTradeCondition.py
+++ b/product/ERP5/tests/testTradeCondition.py
@@ -576,15 +576,15 @@ class TestEffectiveTradeCondition(TradeConditionTestCase):
                     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
diff --git a/product/ERP5Legacy/tests/testLegacyTradeCondition.py b/product/ERP5Legacy/tests/testLegacyTradeCondition.py
index 9a11317ba8..904b8ee10f 100644
--- a/product/ERP5Legacy/tests/testLegacyTradeCondition.py
+++ b/product/ERP5Legacy/tests/testLegacyTradeCondition.py
@@ -589,15 +589,15 @@ class TestEffectiveTradeCondition(TradeConditionTestCase):
                     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
-- 
2.30.9