Moved tests into separate package.

Also split them into unit and functional tests.

create_migration.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
-import sys
-import os
+"""
+Convenience script to create migrations
+"""
 from optparse import OptionParser
 
-import tests.config
+from tests.config import configure
+configure()
 
 
 def create_migration(app_label, **kwargs):
@@ -20,4 +22,3 @@ if __name__ == '__main__':
                       action='store_true', default=False)
     (options, args) = parser.parse_args()
     create_migration(args[0], initial=options.initial, auto=options.auto)
-

oscar/apps/partner/tests/__init__.py

@@ -1,4 +0,0 @@
-from oscar.apps.partner.tests.models import *
-from oscar.apps.partner.tests.imports import *
-from oscar.apps.partner.tests.checkout import *
-from oscar.apps.partner.tests.wrappers import *

oscar/apps/payment/tests/__init__.py

@@ -1,2 +0,0 @@
-from oscar.apps.payment.tests.main import *
-

oscar/apps/promotions/tests.py

@@ -1,61 +0,0 @@
-import httplib
-
-from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.core.urlresolvers import resolve
-from django.test import Client
-
-from oscar.apps.promotions.models import * 
-
-
-class PromotionTest(TestCase):
-
-    def test_default_template_name(self):
-        promotion = Image.objects.create(name="dummy banner")
-        self.assertEqual('promotions/image.html', promotion.template_name())
-
-
-
-
-
-#class PagePromotionTest(unittest.TestCase):
-#    
-#    def setUp(self):
-#        self.promotion = Promotion.objects.create(name='Dummy', link_url='http://www.example.com')
-#        self.page_prom = PagePromotion.objects.create(promotion=self.promotion,
-#                                                      position=RAW_HTML,
-#                                                      page_url='/')
-#    
-#    def test_clicks_start_at_zero(self):
-#        self.assertEquals(0, self.page_prom.clicks)
-#    
-#    def test_click_is_recorded(self):
-#        self.page_prom.record_click()
-#        self.assertEquals(1, self.page_prom.clicks)
-#
-#    def test_get_link(self):
-#        link = self.page_prom.get_link()
-#        match = resolve(link)
-#        self.assertEquals('page-click', match.url_name)
-#
-#
-#class KeywordPromotionTest(unittest.TestCase):
-#    
-#    def setUp(self):
-#        self.promotion = Promotion.objects.create(name='Dummy', link_url='http://www.example.com')
-#        self.kw_prom = KeywordPromotion.objects.create(promotion=self.promotion,
-#                                                       position=RAW_HTML,
-#                                                       keyword='cheese')
-#    
-#    def test_clicks_start_at_zero(self):
-#        self.assertEquals(0, self.kw_prom.clicks)
-#    
-#    def test_click_is_recorded(self):
-#        self.kw_prom.record_click()
-#        self.assertEquals(1, self.kw_prom.clicks)
-#        
-#    def test_get_link(self):
-#        link = self.kw_prom.get_link()
-#        match = resolve(link)
-#        self.assertEquals('keyword-click', match.url_name)
-        

oscar/apps/search/tests.py

@@ -1,42 +0,0 @@
-from django.test import TestCase, Client
-from django.core.urlresolvers import reverse
-
-from django.core import management
-from haystack import backend
-
-
-class SuggestViewTest(TestCase):
-    fixtures = ['sample-products']
-
-    def setUp(self):
-        #clear out existing index without prompting user and ensure that
-        #fixtures are indexed
-        self.client = Client()
-        sb = backend.SearchBackend()
-        sb.clear()
-        management.call_command('update_index', verbosity=0) #silenced
-
-    def test_term_in_fixtures_found(self):
-        url = reverse('oscar-search-suggest')
-        response = self.client.get(url, {'query_term': 'Pint'})
-        self.assertEquals(200, response.status_code)
-        self.assertTrue('Pint' in response.content) #ensuring we actually find a result in the response
-
-class MultiFacetedSearchViewTest(TestCase):
-    fixtures = ['sample-products']
-
-    def setUp(self):
-        #clear out existing index without prompting user and ensure that
-        #fixtures are indexed
-        self.client = Client()
-        sb = backend.SearchBackend()
-        sb.clear()
-        management.call_command('update_index', verbosity=0) #silenced
-
-    def test_with_query(self):
-        url = reverse('oscar-search')
-        response = self.client.get(url, {'q': 'Pint'})
-        self.assertEquals(200, response.status_code)
-        self.assertTrue('value="Pint"' in response.content) #ensuring query field is set
-    
-        

oscar/defaults.py

@@ -53,5 +53,7 @@ OSCAR_OFFER_BLACKLIST_PRODUCT = None
 # Max total number of items in basket
 OSCAR_MAX_BASKET_QUANTITY_THRESHOLD = None
 
-#Cookies
-OSCAR_COOKIES_DELETE_ON_LOGOUT = ['oscar_recently_viewed_products', ]
+# Cookies
+OSCAR_COOKIES_DELETE_ON_LOGOUT = ['oscar_recently_viewed_products', ]
+
+OSCAR_SETTINGS = dict([(k, v) for k, v in locals().items() if k.startswith('OSCAR_')])

oscar/test/helpers.py

@@ -16,7 +16,7 @@ from oscar.apps.shipping.methods import Free
 from oscar.apps.offer.models import Range, ConditionalOffer, Condition, Benefit
 
 
-def create_product(price=None, title="Dummy title", product_class="Dummy item class", 
+def create_product(price=None, title="Dummy title", product_class="Dummy item class",
         partner="Dummy partner", partner_sku=None, upc=None, num_in_stock=10, attributes=None):
     """
     Helper method for creating products that are used in tests.

oscar/tests.py

@@ -1,38 +0,0 @@
-from django.test import TestCase
-
-from oscar.apps.address.tests import *
-from oscar.apps.basket.tests import *
-from oscar.apps.order.tests import *
-from oscar.apps.catalogue.tests import *
-from oscar.apps.partner.tests import *
-from oscar.apps.checkout.tests import *
-from oscar.apps.payment.tests import *
-from oscar.apps.offer.tests import *
-from oscar.apps.shipping.tests import *
-from oscar.apps.customer.tests import *
-from oscar.apps.promotions.tests import *
-from oscar.apps.catalogue.reviews.tests import *
-from oscar.apps.voucher.tests import *
-from oscar.apps.partner.tests import *
-from oscar.apps.dashboard.tests import *
-
-from oscar.core.tests import *
-from oscar.core.logging.tests import *
-
-import oscar
-
-
-class OscarTests(TestCase):
-
-    def test_app_list_exists(self):
-        core_apps = oscar.OSCAR_CORE_APPS
-        self.assertTrue('oscar' in core_apps)
-
-    def test_app_list_can_be_accessed_through_fn(self):
-        core_apps = oscar.get_core_apps()
-        self.assertTrue('oscar' in core_apps)
-
-    def test_app_list_can_be_accessed_with_overrides(self):
-        apps = oscar.get_core_apps(overrides=['apps.shipping'])
-        self.assertTrue('apps.shipping' in apps)
-        self.assertTrue('oscar.apps.shipping' not in apps)

pre-commit.sh

@@ -4,7 +4,7 @@ git stash --keep-index -q
 
 source ~/.virtualenvs/oscar/bin/activate
 
-./run_tests.py
+./runtests.py
 TEST_RESULT=$?
 
 jshint oscar/static/oscar/js/oscar

runtests.py

@@ -4,17 +4,19 @@ import logging
 from optparse import OptionParser
 from coverage import coverage
 
-import tests.config
+# This configures the settings
+from tests.config import configure
+configure()
 
-from django.test.simple import DjangoTestSuiteRunner
+from django_nose import NoseTestSuiteRunner
 
 logging.disable(logging.CRITICAL)
 
 
 def run_tests(verbosity, *test_args):
-    test_runner = DjangoTestSuiteRunner(verbosity=verbosity)
+    test_runner = NoseTestSuiteRunner(verbosity=verbosity)
     if not test_args:
-        test_args = ['oscar']
+        test_args = ['tests']
     num_failures = test_runner.run_tests(test_args)
     if num_failures:
         sys.exit(num_failures)

tests/config.py

@@ -3,58 +3,58 @@ import os
 from django.conf import settings, global_settings
 from oscar import OSCAR_CORE_APPS
 
-if not settings.configured:
-    # Extract Oscar's settings
-    from oscar.defaults import *
-    oscar_settings = dict([(k, v) for k, v in locals().items() if k.startswith('OSCAR_')])
+def configure():
+    if not settings.configured:
+        from oscar.defaults import OSCAR_SETTINGS
 
-    # Helper function to extract absolute path
-    location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
+        # Helper function to extract absolute path
+        location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
 
-    settings.configure(
-        DATABASES={
-            'default': {
-                'ENGINE': 'django.db.backends.sqlite3',
-                'NAME': ':memory:',
-                }
-            },
-        INSTALLED_APPS=[
-            'django.contrib.auth',
-            'django.contrib.admin',
-            'django.contrib.contenttypes',
-            'django.contrib.sessions',
-            'django.contrib.sites',
-            'django.contrib.flatpages',
-            'sorl.thumbnail',
-            ] + OSCAR_CORE_APPS,
-        TEMPLATE_CONTEXT_PROCESSORS=(
-            "django.contrib.auth.context_processors.auth",
-            "django.core.context_processors.request",
-            "django.core.context_processors.debug",
-            "django.core.context_processors.i18n",
-            "django.core.context_processors.media",
-            "django.core.context_processors.static",
-            "django.contrib.messages.context_processors.messages",
-            'oscar.apps.search.context_processors.search_form',
-            'oscar.apps.promotions.context_processors.promotions',
-            'oscar.apps.checkout.context_processors.checkout',
-            ),
-        TEMPLATE_DIRS=(
-            location('templates'),
-            ),
-        MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES + (
-            'oscar.apps.basket.middleware.BasketMiddleware',
-            ),
-        AUTHENTICATION_BACKENDS=(
-            'oscar.apps.customer.auth_backends.Emailbackend',
-            'django.contrib.auth.backends.ModelBackend',
-            ),
-        ROOT_URLCONF='tests.site.urls',
-        LOGIN_REDIRECT_URL='/accounts/',
-        DEBUG=False,
-        SITE_ID=1,
-        HAYSTACK_SEARCH_ENGINE='dummy',
-        HAYSTACK_SITECONF = 'oscar.search_sites',
-        APPEND_SLASH=True,
-        **oscar_settings
-    )
+        settings.configure(
+            DATABASES={
+                'default': {
+                    'ENGINE': 'django.db.backends.sqlite3',
+                    'NAME': ':memory:',
+                    }
+                },
+            INSTALLED_APPS=[
+                'django.contrib.auth',
+                'django.contrib.admin',
+                'django.contrib.contenttypes',
+                'django.contrib.sessions',
+                'django.contrib.sites',
+                'django.contrib.flatpages',
+                'sorl.thumbnail',
+                ] + OSCAR_CORE_APPS,
+            TEMPLATE_CONTEXT_PROCESSORS=(
+                "django.contrib.auth.context_processors.auth",
+                "django.core.context_processors.request",
+                "django.core.context_processors.debug",
+                "django.core.context_processors.i18n",
+                "django.core.context_processors.media",
+                "django.core.context_processors.static",
+                "django.contrib.messages.context_processors.messages",
+                'oscar.apps.search.context_processors.search_form',
+                'oscar.apps.promotions.context_processors.promotions',
+                'oscar.apps.checkout.context_processors.checkout',
+                ),
+            TEMPLATE_DIRS=(
+                location('templates'),
+                ),
+            MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES + (
+                'oscar.apps.basket.middleware.BasketMiddleware',
+                ),
+            AUTHENTICATION_BACKENDS=(
+                'oscar.apps.customer.auth_backends.Emailbackend',
+                'django.contrib.auth.backends.ModelBackend',
+                ),
+            ROOT_URLCONF='tests.site.urls',
+            LOGIN_REDIRECT_URL='/accounts/',
+            DEBUG=False,
+            SITE_ID=1,
+            HAYSTACK_SEARCH_ENGINE='dummy',
+            HAYSTACK_SITECONF = 'oscar.search_sites',
+            APPEND_SLASH=True,
+            NOSE_ARGS=['-s', '-x'],
+            **OSCAR_SETTINGS
+        )

oscar/apps/basket/tests.py → tests/functional/basket_tests.py

@@ -1,42 +1,13 @@
 from decimal import Decimal as D
 import httplib
-import datetime
 
-from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.conf import settings
 from django.test import TestCase, Client
-from django.http import HttpResponse
+from django.core.urlresolvers import reverse
 
-from oscar.apps.basket.models import Basket, Line
 from oscar.test.helpers import create_product
-from oscar.apps.basket.reports import (
-    OpenBasketReportGenerator, SubmittedBasketReportGenerator)
-
-
-class BasketModelTest(TestCase):
-
-    def setUp(self):
-        self.basket = Basket.objects.create()
-        self.dummy_product = create_product()
-
-    def test_empty_baskets_have_zero_lines(self):
-        self.assertTrue(Basket().num_lines == 0)
-
-    def test_new_baskets_are_empty(self):
-        self.assertTrue(Basket().is_empty)
-
-    def test_basket_have_with_one_line(self):
-        Line.objects.create(basket=self.basket, product=self.dummy_product)
-        self.assertTrue(self.basket.num_lines == 1)
-
-    def test_add_product_creates_line(self):
-        self.basket.add_product(self.dummy_product)
-        self.assertTrue(self.basket.num_lines == 1)
-
-    def test_adding_multiproduct_line_returns_correct_number_of_items(self):
-        self.basket.add_product(self.dummy_product, 10)
-        self.assertEqual(self.basket.num_items, 10)
+from oscar.apps.basket.models import Basket
 
 
 class AnonAddToBasketViewTests(TestCase):
@@ -47,6 +18,7 @@ class AnonAddToBasketViewTests(TestCase):
         post_params = {'product_id': self.product.id,
                        'action': 'add',
                        'quantity': 1}
+        self.client = Client()
         self.response = self.client.post(url, post_params)
 
     def test_cookie_is_created(self):
@@ -109,28 +81,9 @@ class BasketThresholdTest(TestCase):
         self.assertTrue('Your basket currently has 2 items.' in
                         response.cookies['messages'].value)
 
-class BasketReportTests(TestCase):
-
-    def test_open_report_doesnt_error(self):
-        data = {
-            'start_date': datetime.date(2012, 5, 1),
-            'end_date': datetime.date(2012, 5, 17),
-            'formatter': 'CSV'
-        }
-        generator = OpenBasketReportGenerator(**data)
-        generator.generate()
-
-    def test_submitted_report_doesnt_error(self):
-        data = {
-            'start_date': datetime.date(2012, 5, 1),
-            'end_date': datetime.date(2012, 5, 17),
-            'formatter': 'CSV'
-        }
-        generator = SubmittedBasketReportGenerator(**data)
-        generator.generate()
-
 
 class SavedBasketTests(TestCase):
+
     def test_moving_from_saved_basket(self):
         user = User.objects.create_user(username='test', password='pass',
                                         email='test@example.com')

tests/functional/catalogue_tests.py

@@ -0,0 +1,21 @@
+import httplib
+
+from django.test import TestCase
+from django.test.client import Client
+from django.core.urlresolvers import reverse
+
+from oscar.test.helpers import create_product
+
+
+class SingleProductViewTest(TestCase):
+    
+    def setUp(self):
+        self.client = Client()
+        
+    def test_canonical_urls_are_enforced(self):
+        p = create_product()
+        args = {'product_slug': 'wrong-slug',
+                'pk': p.id}
+        wrong_url = reverse('catalogue:detail', kwargs=args)
+        response = self.client.get(wrong_url)
+        self.assertEquals(httplib.MOVED_PERMANENTLY, response.status_code)

oscar/apps/customer/tests.py → tests/functional/customer_tests.py

@@ -1,12 +1,11 @@
 import httplib
 
 from django.test.client import Client
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.http import HttpRequest
-from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
 
-from oscar.apps.customer.models import CommunicationEventType
 from oscar.apps.customer.history_helpers import get_recently_viewed_product_ids
 from oscar.test.helpers import create_product, create_order
 
@@ -28,22 +27,6 @@ class HistoryHelpersTest(TestCase):
         self.assertTrue(self.product.id in get_recently_viewed_product_ids(request))
 
 
-class CommunicationTypeTest(TestCase):
-    keys = ('body', 'html', 'sms', 'subject')
-
-    def test_no_templates_returns_empty_string(self):
-        et = CommunicationEventType()
-        messages = et.get_messages()
-        for key in self.keys:
-            self.assertEqual('', messages[key])
-
-    def test_field_template_render(self):
-        et = CommunicationEventType(email_subject_template='Hello {{ name }}')
-        ctx = {'name': 'world'}
-        messages = et.get_messages(ctx)
-        self.assertEqual('Hello world', messages['subject'])
-
-
 class AnonOrderDetail(TestCase):
 
     def setUp(self):

oscar/apps/dashboard/tests.py → tests/functional/dashboard_tests.py

@@ -2,16 +2,6 @@ from decimal import Decimal as D
 
 from django.core.urlresolvers import reverse
 
-from oscar.apps.dashboard.orders.tests import *
-from oscar.apps.dashboard.reports.tests import *
-from oscar.apps.dashboard.users.tests import *
-from oscar.apps.dashboard.promotions.tests import *
-from oscar.apps.dashboard.catalogue.tests import *
-from oscar.apps.dashboard.pages.tests import *
-from oscar.apps.dashboard.offers.tests import *
-from oscar.apps.dashboard.ranges.tests import *
-from oscar.apps.dashboard.reviews.tests import *
-
 from oscar.apps.dashboard.views import IndexView
 from oscar.test import ClientTestCase
 from oscar.test.helpers import create_order

oscar/apps/address/tests.py → tests/unit/address_tests.py

@@ -8,17 +8,16 @@ from oscar.apps.order.models import ShippingAddress
 
 
 class UserAddressTest(TestCase):
-    fixtures = ['countries.json']
     
     def setUp(self):
         self.user = User.objects.create(username='dummy_user')
-        self.country = Country.objects.get(iso_3166_1_a2='GB')
+        self.country = Country(iso_3166_1_a2='GB', name="UNITED KINGDOM")
     
     def tearDown(self):
         self.user.delete()
     
     def test_titleless_salutation_is_stripped(self):
-        a = UserAddress.objects.create(last_name='Barrington', line1="75 Smith Road", postcode="N4 8TY", 
+        a = UserAddress(last_name='Barrington', line1="75 Smith Road", postcode="N4 8TY", 
                                        country=self.country, user=self.user)
         self.assertEquals("Barrington", a.salutation())
     
@@ -67,10 +66,9 @@ class UserAddressTest(TestCase):
     def test_hashing_with_utf8(self):
         a = UserAddress(first_name=u"\u0141ukasz Smith", last_name=u'Smith', line1=u"75 Smith Road", postcode=u"n4 8ty", 
                         country=self.country, user=self.user)
-        hash = a.active_address_fields()
+        a.active_address_fields()
         
     def test_city_is_alias_of_line4(self):
-        a = UserAddress.objects.create(last_name='Barrington', line1="75 Smith Road", line4="London", postcode="n4 8ty", 
+        a = UserAddress(last_name='Barrington', line1="75 Smith Road", line4="London", postcode="n4 8ty", 
                                        country=self.country, user=self.user)
         self.assertEqual('London', a.city)
-           

tests/unit/basket_tests.py

@@ -0,0 +1,54 @@
+import datetime
+
+from django.test import TestCase
+
+from oscar.apps.basket.models import Basket, Line
+from oscar.test.helpers import create_product
+from oscar.apps.basket.reports import (
+    OpenBasketReportGenerator, SubmittedBasketReportGenerator)
+
+
+class BasketModelTest(TestCase):
+
+    def setUp(self):
+        self.basket = Basket.objects.create()
+        self.dummy_product = create_product()
+
+    def test_empty_baskets_have_zero_lines(self):
+        self.assertTrue(Basket().num_lines == 0)
+
+    def test_new_baskets_are_empty(self):
+        self.assertTrue(Basket().is_empty)
+
+    def test_basket_have_with_one_line(self):
+        Line.objects.create(basket=self.basket, product=self.dummy_product)
+        self.assertTrue(self.basket.num_lines == 1)
+
+    def test_add_product_creates_line(self):
+        self.basket.add_product(self.dummy_product)
+        self.assertTrue(self.basket.num_lines == 1)
+
+    def test_adding_multiproduct_line_returns_correct_number_of_items(self):
+        self.basket.add_product(self.dummy_product, 10)
+        self.assertEqual(self.basket.num_items, 10)
+
+
+class BasketReportTests(TestCase):
+
+    def test_open_report_doesnt_error(self):
+        data = {
+            'start_date': datetime.date(2012, 5, 1),
+            'end_date': datetime.date(2012, 5, 17),
+            'formatter': 'CSV'
+        }
+        generator = OpenBasketReportGenerator(**data)
+        generator.generate()
+
+    def test_submitted_report_doesnt_error(self):
+        data = {
+            'start_date': datetime.date(2012, 5, 1),
+            'end_date': datetime.date(2012, 5, 17),
+            'formatter': 'CSV'
+        }
+        generator = SubmittedBasketReportGenerator(**data)
+        generator.generate()

oscar/apps/catalogue/tests.py → tests/unit/catalogue_tests.py

@@ -1,7 +1,5 @@
-from django.test import TestCase, Client
+from django.test import TestCase
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
-from django.conf import settings
 
 from oscar.apps.catalogue.models import Product, ProductClass, Category, \
         ProductAttribute
@@ -90,11 +88,11 @@ class VariantProductTests(ProductTests):
         self.parent = Product.objects.create(title="Parent product", product_class=self.product_class)
     
     def test_variant_products_dont_need_titles(self):
-        p = Product.objects.create(parent=self.parent, product_class=self.product_class)
+        Product.objects.create(parent=self.parent, product_class=self.product_class)
         
     def test_variant_products_dont_need_a_product_class(self):
-        p = Product.objects.create(parent=self.parent)
-        
+        Product.objects.create(parent=self.parent)
+       
     def test_variant_products_inherit_parent_titles(self):
         p = Product.objects.create(parent=self.parent, product_class=self.product_class)
         self.assertEquals("Parent product", p.get_title())
@@ -102,18 +100,3 @@ class VariantProductTests(ProductTests):
     def test_variant_products_inherit_product_class(self):
         p = Product.objects.create(parent=self.parent)
         self.assertEquals("Clothing", p.get_product_class().name)
-
-
-class SingleProductViewTest(TestCase):
-    fixtures = ['sample-products']
-    
-    def setUp(self):
-        self.client = Client()
-        
-    def test_canonical_urls_are_enforced(self):
-        p = Product.objects.get(id=1)
-        args = {'product_slug': 'wrong-slug',
-                'pk': p.id}
-        wrong_url = reverse('catalogue:detail', kwargs=args)
-        response = self.client.get(wrong_url)
-        self.assertEquals(301, response.status_code)

tests/unit/customer_tests.py

@@ -0,0 +1,19 @@
+from django.test import TestCase
+
+from oscar.apps.customer.models import CommunicationEventType
+
+
+class CommunicationTypeTest(TestCase):
+    keys = ('body', 'html', 'sms', 'subject')
+
+    def test_no_templates_returns_empty_string(self):
+        et = CommunicationEventType()
+        messages = et.get_messages()
+        for key in self.keys:
+            self.assertEqual('', messages[key])
+
+    def test_field_template_render(self):
+        et = CommunicationEventType(email_subject_template='Hello {{ name }}')
+        ctx = {'name': 'world'}
+        messages = et.get_messages(ctx)
+        self.assertEqual('Hello world', messages['subject'])

oscar/apps/order/tests.py → tests/unit/order_tests.py

@@ -10,12 +10,11 @@ from oscar.apps.address.models import Country
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import ShippingAddress, Order, Line, \
         ShippingEvent, ShippingEventType, ShippingEventQuantity, OrderNote, \
-        ShippingEventType, OrderDiscount
+        OrderDiscount
 from oscar.apps.order.exceptions import (InvalidOrderStatus, InvalidLineStatus,
                                          InvalidShippingEvent)
 from oscar.test.helpers import create_order, create_product, create_offer
 from oscar.apps.order.utils import OrderCreator
-from oscar.apps.shipping.methods import Free
 from oscar.apps.order.processing import EventHandler
 from oscar.test import patch_settings
 

tests/unit/promotion_tests.py

@@ -0,0 +1,11 @@
+from django.test import TestCase
+
+from oscar.apps.promotions import models
+
+
+class PromotionTest(TestCase):
+
+    def test_default_template_name(self):
+        promotion = models.Image.objects.create(name="dummy banner")
+        self.assertEqual('promotions/image.html', promotion.template_name())
+

oscar/apps/catalogue/reviews/tests.py → tests/unit/review_tests.py

@@ -6,16 +6,13 @@ from django.core.exceptions import ValidationError
 from django.contrib.auth.models import User, AnonymousUser
 from django.db import IntegrityError
 from django.core.urlresolvers import reverse
-from django.utils import unittest
 
 from oscar.apps.catalogue.reviews.models import ProductReview, Vote
 from oscar.test.helpers import create_product
 
 
-class ProductReviewTests(unittest.TestCase):
-    u"""
-    Basic setup
-    """
+class ProductReviewTests(TestCase):
+
     def setUp(self):
         username = str(randint(0, maxint))
         self.user = User.objects.create_user(username, '%s@users.com'%username, '%spass123'%username)
@@ -36,9 +33,6 @@ class ProductReviewTests(unittest.TestCase):
 
 
 class TopLevelProductReviewVoteTests(ProductReviewTests):
-    """
-    Basic tests for Vote model
-    """
 
     def test_try_vote_without_login(self):
         self.assertRaises(ValueError, Vote.objects.create, review=self.review, delta=-1, user=self.anon_user)
@@ -50,9 +44,7 @@ class TopLevelProductReviewVoteTests(ProductReviewTests):
 
 
 class SingleProductReviewViewTest(ProductReviewTests, TestCase):
-    u"""
-    Tests for each product review 
-    """
+
     def setUp(self):
         self.client = Client()
         super(SingleProductReviewViewTest, self).setUp()
@@ -73,9 +65,11 @@ class SingleProductReviewViewTest(ProductReviewTests, TestCase):
         self.client.login(username='testuser', password='secret')
         response = self.client.get(url)
         self.assertEquals(200, response.status_code)
+
         # check necessary review fields for logged in user
         self.assertContains(response, 'title')
         self.assertContains(response, 'score')
+
         # check additional fields for anonymous user
         self.client.login(username=None)
         response = self.client.get(url)

tests/unit/settings_tests.py

@@ -0,0 +1,19 @@
+from django.test import TestCase
+
+import oscar
+
+
+class OscarTests(TestCase):
+
+    def test_app_list_exists(self):
+        core_apps = oscar.OSCAR_CORE_APPS
+        self.assertTrue('oscar' in core_apps)
+
+    def test_app_list_can_be_accessed_through_fn(self):
+        core_apps = oscar.get_core_apps()
+        self.assertTrue('oscar' in core_apps)
+
+    def test_app_list_can_be_accessed_with_overrides(self):
+        apps = oscar.get_core_apps(overrides=['apps.shipping'])
+        self.assertTrue('apps.shipping' in apps)
+        self.assertTrue('oscar.apps.shipping' not in apps)

oscar/apps/shipping/tests.py → tests/unit/shipping_tests.py

@@ -1,11 +1,10 @@
 from decimal import Decimal as D
 
-from django.utils import unittest
-from django.test.client import Client
+from django.test import TestCase
 from django.contrib.auth.models import User
 
 from oscar.apps.shipping.methods import Free, FixedPrice
-from oscar.apps.shipping.models import OrderAndItemCharges, WeightBand, WeightBased
+from oscar.apps.shipping.models import OrderAndItemCharges, WeightBased
 from oscar.apps.shipping.repository import Repository
 from oscar.apps.shipping import Scales
 from oscar.apps.basket.models import Basket
@@ -13,7 +12,7 @@ from oscar.test.helpers import create_product
 from oscar.test.decorators import dataProvider
 
 
-class FreeTest(unittest.TestCase):
+class FreeTest(TestCase):
 
     def setUp(self):
         self.method = Free()
@@ -32,7 +31,7 @@ class FreeTest(unittest.TestCase):
         self.assertEquals(D('0.00'), self.method.basket_charge_excl_tax())
         
         
-class FixedPriceTest(unittest.TestCase):        
+class FixedPriceTest(TestCase):        
     
     def test_fixed_price_shipping_charges_for_empty_basket(self):
         method = FixedPrice(D('10.00'), D('10.00'))
@@ -60,7 +59,7 @@ class FixedPriceTest(unittest.TestCase):
         self.assertEquals(D(value), method.basket_charge_excl_tax())
         
         
-class OrderAndItemChargesTests(unittest.TestCase):
+class OrderAndItemChargesTests(TestCase):
     
     def setUp(self):
         self.method = OrderAndItemCharges(price_per_order=D('5.00'), price_per_item=D('1.00'))
@@ -81,7 +80,7 @@ class OrderAndItemChargesTests(unittest.TestCase):
         self.assertEquals(D('5.00') + 7*D('1.00'), self.method.basket_charge_incl_tax())
 
 
-class ZeroFreeThresholdTest(unittest.TestCase):
+class ZeroFreeThresholdTest(TestCase):
     
     def setUp(self):
         self.method = OrderAndItemCharges(price_per_order=D('10.00'), free_shipping_threshold=D('0.00'))
@@ -97,7 +96,7 @@ class ZeroFreeThresholdTest(unittest.TestCase):
         self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())
 
 
-class NonZeroFreeThresholdTest(unittest.TestCase):
+class NonZeroFreeThresholdTest(TestCase):
     
     def setUp(self):
         self.method = OrderAndItemCharges(price_per_order=D('10.00'), free_shipping_threshold=D('20.00'))
@@ -120,7 +119,7 @@ class NonZeroFreeThresholdTest(unittest.TestCase):
         self.assertEquals(D('0.00'), self.method.basket_charge_incl_tax())
 
 
-class ScalesTests(unittest.TestCase):
+class ScalesTests(TestCase):
 
     def test_simple_weight_calculation(self):
         scales = Scales(attribute_code='weight')
@@ -153,7 +152,7 @@ class ScalesTests(unittest.TestCase):
         self.assertEquals(1+2, scales.weigh_basket(basket))
 
 
-class WeightBasedMethodTests(unittest.TestCase):
+class WeightBasedMethodTests(TestCase):
 
     def setUp(self):
         self.standard = WeightBased.objects.create(name='Standard')
@@ -217,7 +216,7 @@ class WeightBasedMethodTests(unittest.TestCase):
         self.assertEqual(D('0.00'), charge)
 
 
-class RepositoryTests(unittest.TestCase):
+class RepositoryTests(TestCase):
 
     def setUp(self):
         self.repo = Repository()