Rename test file to match module tested.

As in `test_model.py` -> `test_models.py`

tests/integration/basket/test_model.py

@@ -1,176 +0,0 @@
-from decimal import Decimal as D
-
-from django.test import TestCase
-
-from oscar.apps.basket.models import Basket
-from oscar.apps.partner import strategy, availability, prices
-from oscar.test import factories
-from oscar.apps.catalogue.models import Option
-
-
-class TestAddingAProductToABasket(TestCase):
-
-    def setUp(self):
-        self.basket = Basket()
-        self.basket.strategy = strategy.Default()
-        self.product = factories.create_product()
-        self.record = factories.create_stockrecord(
-            currency='GBP',
-            product=self.product, price_excl_tax=D('10.00'))
-        self.purchase_info = factories.create_purchase_info(self.record)
-        self.basket.add(self.product)
-
-    def test_creates_a_line(self):
-        self.assertEqual(1, self.basket.num_lines)
-
-    def test_sets_line_prices(self):
-        line = self.basket.lines.all()[0]
-        self.assertEqual(line.price_incl_tax, self.purchase_info.price.incl_tax)
-        self.assertEqual(line.price_excl_tax, self.purchase_info.price.excl_tax)
-
-    def test_adding_negative_quantity(self):
-        self.assertEqual(1, self.basket.num_lines)
-        self.basket.add(self.product, quantity=4)
-        self.assertEqual(5, self.basket.line_quantity(self.product, self.record))
-        self.basket.add(self.product, quantity=-10)
-        self.assertEqual(0, self.basket.line_quantity(self.product, self.record))
-
-    def test_means_another_currency_product_cannot_be_added(self):
-        product = factories.create_product()
-        factories.create_stockrecord(
-            currency='USD', product=product, price_excl_tax=D('20.00'))
-        with self.assertRaises(ValueError):
-            self.basket.add(product)
-
-
-class TestANonEmptyBasket(TestCase):
-
-    def setUp(self):
-        self.basket = Basket()
-        self.basket.strategy = strategy.Default()
-        self.product = factories.create_product()
-        self.record = factories.create_stockrecord(
-            self.product, price_excl_tax=D('10.00'))
-        self.purchase_info = factories.create_purchase_info(self.record)
-        self.basket.add(self.product, 10)
-
-    def test_can_be_flushed(self):
-        self.basket.flush()
-        self.assertEqual(self.basket.num_items, 0)
-
-    def test_returns_correct_product_quantity(self):
-        self.assertEqual(10, self.basket.product_quantity(
-            self.product))
-
-    def test_returns_correct_line_quantity_for_existing_product_and_stockrecord(self):
-        self.assertEqual(10, self.basket.line_quantity(
-            self.product, self.record))
-
-    def test_returns_zero_line_quantity_for_alternative_stockrecord(self):
-        record = factories.create_stockrecord(
-            self.product, price_excl_tax=D('5.00'))
-        self.assertEqual(0, self.basket.line_quantity(
-            self.product, record))
-
-    def test_returns_zero_line_quantity_for_missing_product_and_stockrecord(self):
-        product = factories.create_product()
-        record = factories.create_stockrecord(
-            product, price_excl_tax=D('5.00'))
-        self.assertEqual(0, self.basket.line_quantity(
-            product, record))
-
-    def test_returns_correct_quantity_for_existing_product_and_stockrecord_and_options(self):
-        product = factories.create_product()
-        record = factories.create_stockrecord(
-            product, price_excl_tax=D('5.00'))
-        option = Option.objects.create(name="Message")
-        options = [{"option": option, "value": "2"}]
-
-        self.basket.add(product, options=options)
-        self.assertEqual(0, self.basket.line_quantity(
-            product, record))
-        self.assertEqual(1, self.basket.line_quantity(
-            product, record, options))
-
-    def test_total_sums_product_totals(self):
-        product = factories.create_product()
-        factories.create_stockrecord(
-            product, price_excl_tax=D('5.00'))
-        self.basket.add(product, 1)
-        self.assertEqual(self.basket.total_excl_tax, 105)
-
-    def test_total_excludes_unavailable_products_with_unknown_price(self):
-        new_product = factories.create_product()
-        factories.create_stockrecord(
-            new_product, price_excl_tax=D('5.00'))
-        self.basket.add(new_product, 1)
-
-        class UnavailableProductStrategy(strategy.Default):
-            """ A test strategy that makes a specific product unavailable """
-
-            def availability_policy(self, product, stockrecord):
-                if product == new_product:
-                    return availability.Unavailable()
-                return super(UnavailableProductStrategy, self).availability_policy(product, stockrecord)
-
-            def pricing_policy(self, product, stockrecord):
-                if product == new_product:
-                    return prices.Unavailable()
-                return super(UnavailableProductStrategy, self).pricing_policy(product, stockrecord)
-
-        try:
-            self.basket.strategy = UnavailableProductStrategy()
-            self.assertEqual(self.basket.all_lines()[1].get_warning(), u"'D\xf9\uff4d\u03fb\u03d2 title' is no longer available")
-            self.assertEqual(self.basket.total_excl_tax, 100)
-        finally:
-            self.basket.strategy = strategy.Default()
-
-
-class TestMergingTwoBaskets(TestCase):
-
-    def setUp(self):
-        self.product = factories.create_product()
-        self.record = factories.create_stockrecord(
-            self.product, price_excl_tax=D('10.00'))
-        self.purchase_info = factories.create_purchase_info(self.record)
-
-        self.main_basket = Basket()
-        self.main_basket.strategy = strategy.Default()
-        self.main_basket.add(self.product, quantity=2)
-
-        self.merge_basket = Basket()
-        self.merge_basket.strategy = strategy.Default()
-        self.merge_basket.add(self.product, quantity=1)
-
-        self.main_basket.merge(self.merge_basket)
-
-    def test_doesnt_sum_quantities(self):
-        self.assertEqual(1, self.main_basket.num_lines)
-
-    def test_changes_status_of_merge_basket(self):
-        self.assertEqual(Basket.MERGED, self.merge_basket.status)
-
-
-class TestASubmittedBasket(TestCase):
-
-    def setUp(self):
-        self.basket = Basket()
-        self.basket.strategy = strategy.Default()
-        self.basket.submit()
-
-    def test_has_correct_status(self):
-        self.assertTrue(self.basket.is_submitted)
-
-    def test_can_be_edited(self):
-        self.assertFalse(self.basket.can_be_edited)
-
-
-class TestMergingAVoucherBasket(TestCase):
-
-    def test_transfers_vouchers_to_new_basket(self):
-        baskets = [factories.BasketFactory(), factories.BasketFactory()]
-        voucher = factories.VoucherFactory()
-        baskets[0].vouchers.add(voucher)
-        baskets[1].merge(baskets[0])
-
-        self.assertEqual(1, baskets[1].vouchers.all().count())

tests/integration/basket/test_models.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
+from decimal import Decimal as D
+
 from django.test import TestCase
 
 from oscar.apps.basket.models import Basket
-from oscar.apps.partner import strategy
+from oscar.apps.catalogue.models import Option
+from oscar.apps.partner import availability, prices, strategy
+from oscar.test import factories
 from oscar.test.factories import (
     BasketFactory, BasketLineAttributeFactory, OptionFactory, ProductFactory)
 
@@ -73,3 +77,171 @@ class TestBasketLine(TestCase):
         basket.add_product(another_product)
         queryset = basket.all_lines()
         self.assertTrue(queryset.ordered)
+
+
+class TestAddingAProductToABasket(TestCase):
+
+    def setUp(self):
+        self.basket = Basket()
+        self.basket.strategy = strategy.Default()
+        self.product = factories.create_product()
+        self.record = factories.create_stockrecord(
+            currency='GBP',
+            product=self.product, price_excl_tax=D('10.00'))
+        self.purchase_info = factories.create_purchase_info(self.record)
+        self.basket.add(self.product)
+
+    def test_creates_a_line(self):
+        self.assertEqual(1, self.basket.num_lines)
+
+    def test_sets_line_prices(self):
+        line = self.basket.lines.all()[0]
+        self.assertEqual(line.price_incl_tax, self.purchase_info.price.incl_tax)
+        self.assertEqual(line.price_excl_tax, self.purchase_info.price.excl_tax)
+
+    def test_adding_negative_quantity(self):
+        self.assertEqual(1, self.basket.num_lines)
+        self.basket.add(self.product, quantity=4)
+        self.assertEqual(5, self.basket.line_quantity(self.product, self.record))
+        self.basket.add(self.product, quantity=-10)
+        self.assertEqual(0, self.basket.line_quantity(self.product, self.record))
+
+    def test_means_another_currency_product_cannot_be_added(self):
+        product = factories.create_product()
+        factories.create_stockrecord(
+            currency='USD', product=product, price_excl_tax=D('20.00'))
+        with self.assertRaises(ValueError):
+            self.basket.add(product)
+
+
+class TestANonEmptyBasket(TestCase):
+
+    def setUp(self):
+        self.basket = Basket()
+        self.basket.strategy = strategy.Default()
+        self.product = factories.create_product()
+        self.record = factories.create_stockrecord(
+            self.product, price_excl_tax=D('10.00'))
+        self.purchase_info = factories.create_purchase_info(self.record)
+        self.basket.add(self.product, 10)
+
+    def test_can_be_flushed(self):
+        self.basket.flush()
+        self.assertEqual(self.basket.num_items, 0)
+
+    def test_returns_correct_product_quantity(self):
+        self.assertEqual(10, self.basket.product_quantity(
+            self.product))
+
+    def test_returns_correct_line_quantity_for_existing_product_and_stockrecord(self):
+        self.assertEqual(10, self.basket.line_quantity(
+            self.product, self.record))
+
+    def test_returns_zero_line_quantity_for_alternative_stockrecord(self):
+        record = factories.create_stockrecord(
+            self.product, price_excl_tax=D('5.00'))
+        self.assertEqual(0, self.basket.line_quantity(
+            self.product, record))
+
+    def test_returns_zero_line_quantity_for_missing_product_and_stockrecord(self):
+        product = factories.create_product()
+        record = factories.create_stockrecord(
+            product, price_excl_tax=D('5.00'))
+        self.assertEqual(0, self.basket.line_quantity(
+            product, record))
+
+    def test_returns_correct_quantity_for_existing_product_and_stockrecord_and_options(self):
+        product = factories.create_product()
+        record = factories.create_stockrecord(
+            product, price_excl_tax=D('5.00'))
+        option = Option.objects.create(name="Message")
+        options = [{"option": option, "value": "2"}]
+
+        self.basket.add(product, options=options)
+        self.assertEqual(0, self.basket.line_quantity(
+            product, record))
+        self.assertEqual(1, self.basket.line_quantity(
+            product, record, options))
+
+    def test_total_sums_product_totals(self):
+        product = factories.create_product()
+        factories.create_stockrecord(
+            product, price_excl_tax=D('5.00'))
+        self.basket.add(product, 1)
+        self.assertEqual(self.basket.total_excl_tax, 105)
+
+    def test_total_excludes_unavailable_products_with_unknown_price(self):
+        new_product = factories.create_product()
+        factories.create_stockrecord(
+            new_product, price_excl_tax=D('5.00'))
+        self.basket.add(new_product, 1)
+
+        class UnavailableProductStrategy(strategy.Default):
+            """ A test strategy that makes a specific product unavailable """
+
+            def availability_policy(self, product, stockrecord):
+                if product == new_product:
+                    return availability.Unavailable()
+                return super(UnavailableProductStrategy, self).availability_policy(product, stockrecord)
+
+            def pricing_policy(self, product, stockrecord):
+                if product == new_product:
+                    return prices.Unavailable()
+                return super(UnavailableProductStrategy, self).pricing_policy(product, stockrecord)
+
+        try:
+            self.basket.strategy = UnavailableProductStrategy()
+            self.assertEqual(self.basket.all_lines()[1].get_warning(), u"'D\xf9\uff4d\u03fb\u03d2 title' is no longer available")
+            self.assertEqual(self.basket.total_excl_tax, 100)
+        finally:
+            self.basket.strategy = strategy.Default()
+
+
+class TestMergingTwoBaskets(TestCase):
+
+    def setUp(self):
+        self.product = factories.create_product()
+        self.record = factories.create_stockrecord(
+            self.product, price_excl_tax=D('10.00'))
+        self.purchase_info = factories.create_purchase_info(self.record)
+
+        self.main_basket = Basket()
+        self.main_basket.strategy = strategy.Default()
+        self.main_basket.add(self.product, quantity=2)
+
+        self.merge_basket = Basket()
+        self.merge_basket.strategy = strategy.Default()
+        self.merge_basket.add(self.product, quantity=1)
+
+        self.main_basket.merge(self.merge_basket)
+
+    def test_doesnt_sum_quantities(self):
+        self.assertEqual(1, self.main_basket.num_lines)
+
+    def test_changes_status_of_merge_basket(self):
+        self.assertEqual(Basket.MERGED, self.merge_basket.status)
+
+
+class TestASubmittedBasket(TestCase):
+
+    def setUp(self):
+        self.basket = Basket()
+        self.basket.strategy = strategy.Default()
+        self.basket.submit()
+
+    def test_has_correct_status(self):
+        self.assertTrue(self.basket.is_submitted)
+
+    def test_can_be_edited(self):
+        self.assertFalse(self.basket.can_be_edited)
+
+
+class TestMergingAVoucherBasket(TestCase):
+
+    def test_transfers_vouchers_to_new_basket(self):
+        baskets = [factories.BasketFactory(), factories.BasketFactory()]
+        voucher = factories.VoucherFactory()
+        baskets[0].vouchers.add(voucher)
+        baskets[1].merge(baskets[0])
+
+        self.assertEqual(1, baskets[1].vouchers.all().count())

tests/integration/payment/test_model.py

@@ -1,47 +0,0 @@
-from decimal import Decimal as D
-import datetime
-
-from django.test import TestCase
-
-from oscar.apps.payment.models import Bankcard
-from oscar.test import factories
-
-
-class TestAPaymentSource(TestCase):
-
-    def setUp(self):
-        order = factories.create_order()
-        self.source = factories.SourceFactory(order=order)
-
-    def test_allocation_doesnt_error(self):
-        self.source.allocate(D('100.00'))
-
-    def test_debit_doesnt_error(self):
-        self.source.allocate(D('100.00'))
-        self.source.debit(D('80.00'))
-
-    def test_full_debit_doesnt_error(self):
-        self.source.allocate(D('100.00'))
-        self.source.debit()
-        self.assertEqual(D('0.00'), self.source.balance)
-
-    def test_refund_doesnt_error(self):
-        self.source.allocate(D('100.00'))
-        self.source.debit(D('80.00'))
-        self.source.refund(D('50.00'))
-
-
-class TestBankcard(TestCase):
-
-    def test_cardtype_persists_after_save(self):
-        user = factories.UserFactory()
-        end = datetime.date(day=1, month=1, year=2010)
-        bankcard = Bankcard(
-            user=user, number="5500000000000004", expiry_date=end)
-        self.assertEqual('Mastercard', bankcard.card_type)
-
-        bankcard.save()
-        self.assertEqual('Mastercard', bankcard.card_type)
-
-        reloaded_bankcard = Bankcard.objects.get(id=bankcard.id)
-        self.assertEqual('Mastercard', reloaded_bankcard.card_type)

tests/integration/payment/test_models.py

@@ -3,8 +3,9 @@ from decimal import Decimal as D
 
 from django.test import TestCase
 
-from oscar.core.compat import get_user_model
 from oscar.apps.payment.models import Bankcard, Source
+from oscar.core.compat import get_user_model
+from oscar.test import factories
 
 
 class TestBankcard(TestCase):
@@ -38,6 +39,19 @@ class TestBankcard(TestCase):
         saved_bankcard = Bankcard.objects.get(id=bankcard.id)
         self.assertEqual('Mastercard', saved_bankcard.card_type)
 
+    def test_cardtype_persists_after_save(self):
+        user = factories.UserFactory()
+        end = datetime.date(day=1, month=1, year=2010)
+        bankcard = Bankcard(
+            user=user, number="5500000000000004", expiry_date=end)
+        self.assertEqual('Mastercard', bankcard.card_type)
+
+        bankcard.save()
+        self.assertEqual('Mastercard', bankcard.card_type)
+
+        reloaded_bankcard = Bankcard.objects.get(id=bankcard.id)
+        self.assertEqual('Mastercard', reloaded_bankcard.card_type)
+
 
 class TestSource(TestCase):
 
@@ -60,3 +74,27 @@ class TestSource(TestCase):
             amount_refunded=D('20'))
         self.assertEqual(
             D('80') - D('20'), source.amount_available_for_refund)
+
+
+class TestAPaymentSource(TestCase):
+
+    def setUp(self):
+        order = factories.create_order()
+        self.source = factories.SourceFactory(order=order)
+
+    def test_allocation_doesnt_error(self):
+        self.source.allocate(D('100.00'))
+
+    def test_debit_doesnt_error(self):
+        self.source.allocate(D('100.00'))
+        self.source.debit(D('80.00'))
+
+    def test_full_debit_doesnt_error(self):
+        self.source.allocate(D('100.00'))
+        self.source.debit()
+        self.assertEqual(D('0.00'), self.source.balance)
+
+    def test_refund_doesnt_error(self):
+        self.source.allocate(D('100.00'))
+        self.source.debit(D('80.00'))
+        self.source.refund(D('50.00'))