Added dataProvider decorator

oscar/apps/shipping/tests.py

@@ -7,6 +7,7 @@ from oscar.apps.shipping.methods import FreeShipping, FixedPriceShipping
 from oscar.apps.shipping.models import OrderAndItemLevelChargeMethod
 from oscar.apps.basket.models import Basket
 from oscar.test.helpers import create_product
+from oscar.test.decorators import dataProvider
 
 class FreeShippingTest(unittest.TestCase):
     
@@ -17,6 +18,7 @@ class FreeShippingTest(unittest.TestCase):
         self.assertEquals(D('0.00'), method.basket_charge_incl_tax())
         self.assertEquals(D('0.00'), method.basket_charge_excl_tax())
         
+        
 class FixedPriceShippingTest(unittest.TestCase):        
     
     def test_fixed_price_shipping_charges_for_empty_basket(self):
@@ -32,6 +34,19 @@ class FixedPriceShippingTest(unittest.TestCase):
         method.set_basket(basket)
         self.assertEquals(D('10.00'), method.basket_charge_excl_tax())
         
+    shipping_values = lambda: [('1.00',), 
+                               ('5.00',), 
+                               ('10.00',), 
+                               ('12.00',)]    
+        
+    @dataProvider(shipping_values)    
+    def test_different_values(self, value):
+        method = FixedPriceShipping(D(value))
+        basket = Basket()
+        method.set_basket(basket)
+        self.assertEquals(D(value), method.basket_charge_excl_tax())
+        
+        
 class OrderAndItemLevelChargeMethodTest(unittest.TestCase):
     
     def setUp(self):
@@ -52,6 +67,7 @@ class OrderAndItemLevelChargeMethodTest(unittest.TestCase):
         self.basket.add_product(p, 7)
         self.assertEquals(D('5.00') + 7*D('1.00'), self.method.basket_charge_incl_tax())
 
+
 class ZeroFreeShippingThresholdTest(unittest.TestCase):
     
     def setUp(self):
@@ -67,6 +83,7 @@ class ZeroFreeShippingThresholdTest(unittest.TestCase):
         self.basket.add_product(p)
         self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())
 
+
 class NonZeroFreeShippingThresholdTest(unittest.TestCase):
     
     def setUp(self):

oscar/test/decorators.py

@@ -0,0 +1,21 @@
+def dataProvider(fn_data_provider):
+    """
+    Data provider decorator, allows another callable to provide the data for the test.  
+    This is a nice feature from PHPUnit which is very useful.
+    
+    Implementation basd on http://melp.nl/2011/02/phpunit-style-dataprovider-in-python-unit-test/#more-525
+    """
+    def test_decorator(test_method):
+        def execute_test_method_with_each_data_set(self):
+            for data in fn_data_provider():
+                if len(data) == 2 and isinstance(data[0], tuple) and isinstance(data[1], dict):
+                    # Both args and kwargs being provided
+                    args, kwargs = data[:]
+                else:
+                    args, kwargs = data, {}
+                try:
+                    test_method(self, *args, **kwargs)
+                except AssertionError, e:
+                    self.fail("%s (Provided data: %s, %s)" % (e, args, kwargs))
+        return execute_test_method_with_each_data_set
+    return test_decorator