Split oscar.test.newfactories in multiple modules

Create a factory module per app and move them under the new
oscar.test.factories module.

src/oscar/test/factories.py → src/oscar/test/factories/__init__.py

@@ -6,11 +6,20 @@ import datetime
 from django.conf import settings
 from django.utils import timezone
 
-from oscar.core.loading import get_model
-from oscar.apps.partner import strategy, availability, prices
-from oscar.core.loading import get_class
 from oscar.apps.offer import models
-from oscar.test.newfactories import *  # noqa
+from oscar.apps.partner import strategy, availability, prices
+from oscar.core.loading import get_class, get_model
+from oscar.test.factories.address import *  # noqa
+from oscar.test.factories.basket import *  # noqa
+from oscar.test.factories.catalogue import *  # noqa
+from oscar.test.factories.contrib import *  # noqa
+from oscar.test.factories.customer import *  # noqa
+from oscar.test.factories.offer import *  # noqa
+from oscar.test.factories.order import *  # noqa
+from oscar.test.factories.partner import *  # noqa
+from oscar.test.factories.payment import *  # noqa
+from oscar.test.factories.voucher import *  # noqa
+
 
 Basket = get_model('basket', 'Basket')
 Free = get_class('shipping.methods', 'Free')

src/oscar/test/factories/address.py

@@ -0,0 +1,33 @@
+import factory
+
+from oscar.core.phonenumber import PhoneNumber
+from oscar.core.loading import get_model
+
+__all__ = [
+    'CountryFactory', 'UserAddressFactory',
+]
+
+
+class CountryFactory(factory.DjangoModelFactory):
+    iso_3166_1_a2 = 'GB'
+    name = "UNITED KINGDOM"
+
+    class Meta:
+        model = get_model('address', 'Country')
+        django_get_or_create = ('iso_3166_1_a2',)
+
+
+class UserAddressFactory(factory.DjangoModelFactory):
+    title = "Dr"
+    first_name = "Barry"
+    last_name = 'Barrington'
+    line1 = "1 King Road"
+    line4 = "London"
+    postcode = "SW1 9RE"
+    phone_number = PhoneNumber.from_string('+49 351 3296645')
+    country = factory.SubFactory(CountryFactory)
+    user = factory.SubFactory(
+        'oscar.test.factories.UserFactory')
+
+    class Meta:
+        model = get_model('address', 'UserAddress')

src/oscar/test/factories/basket.py

@@ -0,0 +1,28 @@
+import factory
+
+from oscar.core.loading import get_model, get_class
+
+Selector = get_class('partner.strategy', 'Selector')
+
+
+__all__ = [
+    'BasketFactory', 'BasketLineAttributeFactory'
+]
+
+
+class BasketFactory(factory.DjangoModelFactory):
+
+    @factory.post_generation
+    def set_strategy(self, create, extracted, **kwargs):
+        # Load default strategy (without a user/request)
+        self.strategy = Selector().strategy()
+
+    class Meta:
+        model = get_model('basket', 'Basket')
+
+
+class BasketLineAttributeFactory(factory.DjangoModelFactory):
+    option = factory.SubFactory('oscar.test.factories.OptionFactory')
+
+    class Meta:
+        model = get_model('basket', 'LineAttribute')

src/oscar/test/factories/catalogue.py

@@ -0,0 +1,106 @@
+# coding=utf-8
+import factory
+
+from oscar.core.loading import get_model
+
+__all__ = [
+    'ProductClassFactory', 'ProductFactory',
+    'CategoryFactory', 'ProductCategoryFactory',
+    'ProductAttributeFactory', 'AttributeOptionGroupFactory',
+    'OptionFactory', 'AttributeOptionFactory',
+    'ProductAttributeValueFactory', 'ProductReviewFactory',
+]
+
+
+class ProductClassFactory(factory.DjangoModelFactory):
+    name = "Books"
+    requires_shipping = True
+    track_stock = True
+
+    class Meta:
+        model = get_model('catalogue', 'ProductClass')
+
+
+class ProductFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = get_model('catalogue', 'Product')
+
+    structure = Meta.model.STANDALONE
+    upc = factory.Sequence(lambda n: '978080213020%d' % n)
+    title = "A confederacy of dunces"
+    product_class = factory.SubFactory(ProductClassFactory)
+
+    stockrecords = factory.RelatedFactory(
+        'oscar.test.factories.StockRecordFactory', 'product')
+    categories = factory.RelatedFactory(
+        'oscar.test.factories.ProductCategoryFactory', 'product')
+
+
+class CategoryFactory(factory.DjangoModelFactory):
+    name = factory.Sequence(lambda n: 'Category %d' % n)
+
+    # Very naive handling of treebeard node fields. Works though!
+    depth = 1
+    path = factory.Sequence(lambda n: '%04d' % n)
+
+    class Meta:
+        model = get_model('catalogue', 'Category')
+
+
+class ProductCategoryFactory(factory.DjangoModelFactory):
+    category = factory.SubFactory(CategoryFactory)
+
+    class Meta:
+        model = get_model('catalogue', 'ProductCategory')
+
+
+class ProductAttributeFactory(factory.DjangoModelFactory):
+    code = name = 'weight'
+    product_class = factory.SubFactory(ProductClassFactory)
+    type = "float"
+
+    class Meta:
+        model = get_model('catalogue', 'ProductAttribute')
+
+
+class OptionFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = get_model('catalogue', 'Option')
+
+    name = 'example option'
+    code = 'example'
+    type = Meta.model.OPTIONAL
+
+
+class AttributeOptionFactory(factory.DjangoModelFactory):
+    # Ideally we'd get_or_create a AttributeOptionGroup here, but I'm not
+    # aware of how to not create a unique option group for each call of the
+    # factory
+
+    option = factory.Sequence(lambda n: 'Option %d' % n)
+
+    class Meta:
+        model = get_model('catalogue', 'AttributeOption')
+
+
+class AttributeOptionGroupFactory(factory.DjangoModelFactory):
+    name = u'Grüppchen'
+
+    class Meta:
+        model = get_model('catalogue', 'AttributeOptionGroup')
+
+
+class ProductAttributeValueFactory(factory.DjangoModelFactory):
+    attribute = factory.SubFactory(ProductAttributeFactory)
+    product = factory.SubFactory(ProductFactory)
+
+    class Meta:
+        model = get_model('catalogue', 'ProductAttributeValue')
+
+
+class ProductReviewFactory(factory.DjangoModelFactory):
+    score = 5
+    product = factory.SubFactory(ProductFactory, stockrecords=[])
+
+    class Meta:
+        model = get_model('reviews', 'ProductReview')

src/oscar/test/factories/contrib.py

@@ -0,0 +1,14 @@
+import factory
+
+from django.contrib.auth import models as auth_models
+
+__all__ = ['PermissionFactory']
+
+
+class PermissionFactory(factory.DjangoModelFactory):
+    name = 'Dummy permission'
+    codename = 'dummy'
+
+    class Meta:
+        model = auth_models.Permission
+        django_get_or_create = ('content_type', 'codename')

src/oscar/test/factories/customer.py

@@ -0,0 +1,19 @@
+import factory
+
+from oscar.core.compat import get_user_model
+
+__all__ = ['UserFactory']
+
+
+class UserFactory(factory.DjangoModelFactory):
+    username = factory.Sequence(lambda n: 'the_j_meister nummer %d' % n)
+    email = factory.Sequence(lambda n: 'example_%s@example.com' % n)
+    first_name = 'joseph'
+    last_name = 'winterbottom'
+    password = factory.PostGenerationMethodCall('set_password', 'skelebrain')
+    is_active = True
+    is_superuser = False
+    is_staff = False
+
+    class Meta:
+        model = get_user_model()

src/oscar/test/factories/offer.py

@@ -0,0 +1,54 @@
+import factory
+
+from oscar.core.loading import get_model
+
+
+__all__ = [
+    'RangeFactory', 'ConditionFactory', 'BenefitFactory',
+    'ConditionalOfferFactory',
+]
+
+
+class RangeFactory(factory.DjangoModelFactory):
+    name = factory.Sequence(lambda n: 'Range %d' % n)
+    slug = factory.Sequence(lambda n: 'range-%d' % n)
+
+    class Meta:
+        model = get_model('offer', 'Range')
+
+    @factory.post_generation
+    def products(self, create, extracted, **kwargs):
+        if not create or not extracted:
+            return
+
+        RangeProduct = get_model('offer', 'RangeProduct')
+
+        for product in extracted:
+            RangeProduct.objects.create(product=product, range=self)
+
+
+class BenefitFactory(factory.DjangoModelFactory):
+    type = get_model('offer', 'Benefit').PERCENTAGE
+    value = 10
+    max_affected_items = None
+    range = factory.SubFactory(RangeFactory)
+
+    class Meta:
+        model = get_model('offer', 'Benefit')
+
+
+class ConditionFactory(factory.DjangoModelFactory):
+    type = get_model('offer', 'Condition').COUNT
+    value = 10
+
+    class Meta:
+        model = get_model('offer', 'Condition')
+
+
+class ConditionalOfferFactory(factory.DjangoModelFactory):
+    name = 'Test offer'
+    benefit = factory.SubFactory(BenefitFactory)
+    condition = factory.SubFactory(ConditionFactory)
+
+    class Meta:
+        model = get_model('offer', 'ConditionalOffer')

src/oscar/test/factories/order.py

@@ -0,0 +1,142 @@
+from decimal import Decimal as D
+
+import factory
+from django.conf import settings
+
+from oscar.core.loading import get_model
+from oscar.core.utils import slugify
+from oscar.test.factories.utils import tax_add, tax_subtract
+
+
+__all__ = [
+    'BillingAddressFactory', 'ShippingAddressFactory', 'OrderDiscountFactory',
+    'OrderFactory', 'OrderLineFactory', 'ShippingEventTypeFactory',
+    'ShippingEventFactory',
+]
+
+
+class BillingAddressFactory(factory.DjangoModelFactory):
+    country = factory.SubFactory('oscar.test.factories.CountryFactory')
+
+    first_name = 'John'
+    last_name = 'Doe'
+    line1 = 'Streetname'
+    line2 = '1a'
+    line4 = 'City'
+    postcode = '1000AA'
+
+    class Meta:
+        model = get_model('order', 'BillingAddress')
+
+
+class ShippingAddressFactory(factory.DjangoModelFactory):
+    country = factory.SubFactory('oscar.test.factories.CountryFactory')
+
+    first_name = 'John'
+    last_name = 'Doe'
+    line1 = 'Streetname'
+    line2 = '1a'
+    line4 = 'City'
+    postcode = '1000 AA'
+    phone_number = '06-12345678'
+
+    class Meta:
+        model = get_model('order', 'ShippingAddress')
+
+
+class OrderDiscountFactory(factory.DjangoModelFactory):
+
+    class Meta:
+        model = get_model('order', 'OrderDiscount')
+
+
+class OrderFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = get_model('order', 'Order')
+        exclude = ('basket',)
+
+    if hasattr(settings, 'OSCAR_INITIAL_ORDER_STATUS'):
+        status = settings.OSCAR_INITIAL_ORDER_STATUS
+
+    site_id = settings.SITE_ID
+    number = factory.LazyAttribute(lambda o: '%d' % (100000 + o.basket.pk))
+    basket = factory.SubFactory(
+        'oscar.test.factories.BasketFactory')
+
+    shipping_code = 'delivery'
+    shipping_incl_tax = D('4.95')
+    shipping_excl_tax = factory.LazyAttribute(
+        lambda o: tax_subtract(o.shipping_incl_tax))
+
+    total_incl_tax = factory.LazyAttribute(lambda o: o.basket.total_incl_tax)
+    total_excl_tax = factory.LazyAttribute(lambda o: o.basket.total_excl_tax)
+
+    guest_email = factory.LazyAttribute(
+        lambda o: (
+            '%s.%s@example.com' % (
+                o.billing_address.first_name[0],
+                o.billing_address.last_name
+            )).lower())
+
+    shipping_address = factory.SubFactory(ShippingAddressFactory)
+    billing_address = factory.SubFactory(BillingAddressFactory)
+
+    @classmethod
+    def _create(cls, target_class, *args, **kwargs):
+        date_placed = kwargs.pop('date_placed', None)
+        instance = super(OrderFactory, cls)._create(
+            target_class, *args, **kwargs)
+
+        if date_placed:
+            instance.date_placed = date_placed
+        return instance
+
+
+class OrderLineFactory(factory.DjangoModelFactory):
+    order = factory.SubFactory(OrderFactory)
+    product = factory.SubFactory(
+        'oscar.test.factories.ProductFactory')
+    partner_sku = factory.LazyAttribute(lambda l: l.product.upc)
+    stockrecord = factory.LazyAttribute(
+        lambda l: l.product.stockrecords.first())
+    quantity = 1
+
+    line_price_incl_tax = factory.LazyAttribute(
+        lambda obj: tax_add(obj.stockrecord.price_excl_tax) * obj.quantity)
+    line_price_excl_tax = factory.LazyAttribute(
+        lambda obj: obj.stockrecord.price_excl_tax * obj.quantity)
+
+    line_price_before_discounts_incl_tax = (
+        factory.SelfAttribute('.line_price_incl_tax'))
+    line_price_before_discounts_excl_tax = (
+        factory.SelfAttribute('.line_price_excl_tax'))
+
+    unit_price_incl_tax = factory.LazyAttribute(
+        lambda obj: tax_add(obj.stockrecord.price_excl_tax))
+    unit_cost_price = factory.LazyAttribute(
+        lambda obj: obj.stockrecord.cost_price)
+    unit_price_excl_tax = factory.LazyAttribute(
+        lambda obj: obj.stockrecord.price_excl_tax)
+    unit_retail_price = factory.LazyAttribute(
+        lambda obj: obj.stockrecord.price_retail)
+
+    class Meta:
+        model = get_model('order', 'Line')
+
+
+class ShippingEventTypeFactory(factory.DjangoModelFactory):
+    name = 'Test event'
+    code = factory.LazyAttribute(lambda o: slugify(o.name).replace('-', '_'))
+
+    class Meta:
+        model = get_model('order', 'ShippingEventType')
+        django_get_or_create = ('code', )
+
+
+class ShippingEventFactory(factory.DjangoModelFactory):
+
+    order = factory.SubFactory(OrderFactory)
+    event_type = factory.SubFactory(ShippingEventTypeFactory)
+
+    class Meta:
+        model = get_model('order', 'ShippingEvent')

src/oscar/test/factories/partner.py

@@ -0,0 +1,37 @@
+from decimal import Decimal as D
+
+import factory
+
+from oscar.core.loading import get_model
+
+
+__all__ = [
+    'PartnerFactory', 'StockRecordFactory',
+]
+
+
+class PartnerFactory(factory.DjangoModelFactory):
+    name = "Gardners"
+
+    class Meta:
+        model = get_model('partner', 'Partner')
+
+    @factory.post_generation
+    def users(self, create, extracted, **kwargs):
+        if not create:
+            return
+
+        if extracted:
+            for user in extracted:
+                self.users.add(user)
+
+
+class StockRecordFactory(factory.DjangoModelFactory):
+    partner = factory.SubFactory(PartnerFactory)
+    partner_sku = factory.Sequence(lambda n: 'unit%d' % n)
+    price_currency = "GBP"
+    price_excl_tax = D('9.99')
+    num_in_stock = 100
+
+    class Meta:
+        model = get_model('partner', 'StockRecord')

src/oscar/test/factories/payment.py

@@ -0,0 +1,45 @@
+import factory
+
+from oscar.core.loading import get_model
+
+__all__ = [
+    'SourceTypeFactory', 'SourceFactory', 'TransactionFactory',
+]
+
+
+class SourceTypeFactory(factory.DjangoModelFactory):
+    name = 'Creditcard'
+    code = 'creditcard'
+
+    class Meta:
+        model = get_model('payment', 'SourceType')
+
+
+class SourceFactory(factory.DjangoModelFactory):
+    order = factory.SubFactory(
+        'oscar.test.factories.OrderFactory')
+    source_type = factory.SubFactory(SourceTypeFactory)
+
+    class Meta:
+        model = get_model('payment', 'Source')
+
+
+class TransactionFactory(factory.DjangoModelFactory):
+    amount = factory.LazyAttribute(lambda obj: obj.source.order.total_incl_tax)
+    reference = factory.LazyAttribute(lambda obj: obj.source.order.number)
+    source = factory.SubFactory(SourceFactory)
+    status = 'authorised'
+
+    class Meta:
+        model = get_model('payment', 'Transaction')
+
+    @classmethod
+    def _create(cls, target_class, *args, **kwargs):
+        date_created = kwargs.pop('date_created', None)
+        instance = super(TransactionFactory, cls)._create(
+            target_class, *args, **kwargs)
+
+        if date_created:
+            instance.date_created = date_created
+            instance.save()
+        return instance

src/oscar/test/factories/utils.py

@@ -0,0 +1,20 @@
+from decimal import Decimal as D
+from decimal import ROUND_HALF_UP
+
+
+def tax_subtract(price, tax_percentage=21):
+    """Subtract the given `tax_percentage` from the given `price`."""
+    if price is None:
+        return None
+
+    result = price / ((100 + tax_percentage) / D(100))
+    return result.quantize(D('0.01'), ROUND_HALF_UP)
+
+
+def tax_add(price, tax_percentage=21):
+    """Add the given `tax_percentage` to the given `price`."""
+    if price is None:
+        return None
+
+    result = price * ((100 + tax_percentage) / D(100))
+    return result.quantize(D('0.01'), ROUND_HALF_UP)

src/oscar/test/factories/voucher.py

@@ -0,0 +1,20 @@
+import datetime
+
+import factory
+from django.utils.timezone import now
+
+from oscar.core.loading import get_model
+
+
+__all__ = ['VoucherFactory']
+
+
+class VoucherFactory(factory.DjangoModelFactory):
+    name = "My voucher"
+    code = "MYVOUCHER"
+
+    start_datetime = now() - datetime.timedelta(days=1)
+    end_datetime = now() + datetime.timedelta(days=10)
+
+    class Meta:
+        model = get_model('voucher', 'Voucher')

src/oscar/test/newfactories.py

@@ -1,455 +1,21 @@
-# coding=utf-8
-"""
-Factories using factory boy.
-
-Using a silly module name as I don't want to mix the old and new
-implementations of factories, but I do want to allow importing both from the
-same place.
-
-In 2020, when all tests use the new factory-boy factories, we can rename this
-module to factories.py and drop the old ones.
-"""
-import datetime
-from decimal import Decimal as D
-from decimal import ROUND_HALF_UP
-
-import factory
-from django.conf import settings
-from django.contrib.auth import models as auth_models
-from django.utils.timezone import now
-
-from oscar.core.loading import get_model, get_class
-from oscar.core.compat import get_user_model
-from oscar.core.phonenumber import PhoneNumber
-from oscar.core.utils import slugify
-
-__all__ = ["UserFactory", "CountryFactory", "UserAddressFactory",
-           "BasketFactory", "VoucherFactory", "ProductFactory",
-           "ProductClassFactory", "StockRecordFactory",
-           "ProductAttributeFactory", "ProductAttributeValueFactory",
-           "AttributeOptionGroupFactory",
-           "AttributeOptionFactory", "PartnerFactory",
-           "ProductCategoryFactory", "CategoryFactory", "RangeFactory",
-           "OptionFactory", "BasketLineAttributeFactory",
-           "PermissionFactory", "ShippingAddressFactory",
-           "ProductReviewFactory", "SourceTypeFactory"]
-
-Selector = get_class('partner.strategy', 'Selector')
-
-
-class UserFactory(factory.DjangoModelFactory):
-    username = factory.Sequence(lambda n: 'the_j_meister nummer %d' % n)
-    email = factory.Sequence(lambda n: 'example_%s@example.com' % n)
-    first_name = 'joseph'
-    last_name = 'winterbottom'
-    password = factory.PostGenerationMethodCall('set_password', 'skelebrain')
-    is_active = True
-    is_superuser = False
-    is_staff = False
-
-    class Meta:
-        model = get_user_model()
-
-
-class CountryFactory(factory.DjangoModelFactory):
-    iso_3166_1_a2 = 'GB'
-    name = "UNITED KINGDOM"
-
-    class Meta:
-        model = get_model('address', 'Country')
-        django_get_or_create = ('iso_3166_1_a2',)
-
-
-class UserAddressFactory(factory.DjangoModelFactory):
-    title = "Dr"
-    first_name = "Barry"
-    last_name = 'Barrington'
-    line1 = "1 King Road"
-    line4 = "London"
-    postcode = "SW1 9RE"
-    phone_number = PhoneNumber.from_string('+49 351 3296645')
-    country = factory.SubFactory(CountryFactory)
-    user = factory.SubFactory(UserFactory)
-
-    class Meta:
-        model = get_model('address', 'UserAddress')
-
-
-class BasketFactory(factory.DjangoModelFactory):
-    @factory.post_generation
-    def set_strategy(self, create, extracted, **kwargs):
-        # Load default strategy (without a user/request)
-        self.strategy = Selector().strategy()
-
-    class Meta:
-        model = get_model('basket', 'Basket')
-
-
-class OptionFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = get_model('catalogue', 'Option')
-
-    name = 'example option'
-    code = 'example'
-    type = Meta.model.OPTIONAL
-
-
-class BasketLineAttributeFactory(factory.DjangoModelFactory):
-    option = factory.SubFactory(OptionFactory)
-
-    class Meta:
-        model = get_model('basket', 'LineAttribute')
-
-
-class VoucherFactory(factory.DjangoModelFactory):
-    name = "My voucher"
-    code = "MYVOUCHER"
-
-    start_datetime = now() - datetime.timedelta(days=1)
-    end_datetime = now() + datetime.timedelta(days=10)
-
-    class Meta:
-        model = get_model('voucher', 'Voucher')
-
-
-class PartnerFactory(factory.DjangoModelFactory):
-    name = "Gardners"
-
-    class Meta:
-        model = get_model('partner', 'Partner')
-
-    @factory.post_generation
-    def users(self, create, extracted, **kwargs):
-        if not create:
-            return
-
-        if extracted:
-            for user in extracted:
-                self.users.add(user)
-
-
-class StockRecordFactory(factory.DjangoModelFactory):
-    partner = factory.SubFactory(PartnerFactory)
-    partner_sku = factory.Sequence(lambda n: 'unit%d' % n)
-    price_currency = "GBP"
-    price_excl_tax = D('9.99')
-    num_in_stock = 100
-
-    class Meta:
-        model = get_model('partner', 'StockRecord')
-
-
-class ProductClassFactory(factory.DjangoModelFactory):
-    name = "Books"
-    requires_shipping = True
-    track_stock = True
-
-    class Meta:
-        model = get_model('catalogue', 'ProductClass')
-
-
-class CategoryFactory(factory.DjangoModelFactory):
-    name = factory.Sequence(lambda n: 'Category %d' % n)
-
-    # Very naive handling of treebeard node fields. Works though!
-    depth = 1
-    path = factory.Sequence(lambda n: '%04d' % n)
-
-    class Meta:
-        model = get_model('catalogue', 'Category')
-
-
-class ProductCategoryFactory(factory.DjangoModelFactory):
-    category = factory.SubFactory(CategoryFactory)
-
-    class Meta:
-        model = get_model('catalogue', 'ProductCategory')
-
-
-class ProductFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = get_model('catalogue', 'Product')
-
-    structure = Meta.model.STANDALONE
-    upc = factory.Sequence(lambda n: '978080213020%d' % n)
-    title = "A confederacy of dunces"
-    product_class = factory.SubFactory(ProductClassFactory)
-
-    stockrecords = factory.RelatedFactory(StockRecordFactory, 'product')
-    categories = factory.RelatedFactory(ProductCategoryFactory, 'product')
-
-
-class ProductAttributeFactory(factory.DjangoModelFactory):
-    code = name = 'weight'
-    product_class = factory.SubFactory(ProductClassFactory)
-    type = "float"
-
-    class Meta:
-        model = get_model('catalogue', 'ProductAttribute')
-
-
-class AttributeOptionGroupFactory(factory.DjangoModelFactory):
-    name = u'Grüppchen'
-
-    class Meta:
-        model = get_model('catalogue', 'AttributeOptionGroup')
-
-
-class AttributeOptionFactory(factory.DjangoModelFactory):
-    # Ideally we'd get_or_create a AttributeOptionGroup here, but I'm not
-    # aware of how to not create a unique option group for each call of the
-    # factory
-
-    option = factory.Sequence(lambda n: 'Option %d' % n)
-
-    class Meta:
-        model = get_model('catalogue', 'AttributeOption')
-
-
-class ProductAttributeValueFactory(factory.DjangoModelFactory):
-    attribute = factory.SubFactory(ProductAttributeFactory)
-    product = factory.SubFactory(ProductFactory)
-
-    class Meta:
-        model = get_model('catalogue', 'ProductAttributeValue')
-
-
-class ProductReviewFactory(factory.DjangoModelFactory):
-    score = 5
-    product = factory.SubFactory(ProductFactory, stockrecords=[])
-
-    class Meta:
-        model = get_model('reviews', 'ProductReview')
-
-
-class RangeFactory(factory.DjangoModelFactory):
-    name = factory.Sequence(lambda n: 'Range %d' % n)
-    slug = factory.Sequence(lambda n: 'range-%d' % n)
-
-    class Meta:
-        model = get_model('offer', 'Range')
-
-    @factory.post_generation
-    def products(self, create, extracted, **kwargs):
-        if not create or not extracted:
-            return
-
-        RangeProduct = get_model('offer', 'RangeProduct')
-
-        for product in extracted:
-            RangeProduct.objects.create(product=product, range=self)
-
-
-class ShippingAddressFactory(factory.DjangoModelFactory):
-    first_name = 'John'
-    last_name = 'Doe'
-    line1 = 'Streetname'
-    line2 = '1a'
-    line4 = 'City'
-    postcode = '1000 AA'
-    phone_number = '06-12345678'
-    country = factory.SubFactory(CountryFactory)
-
-    class Meta:
-        model = get_model('order', 'ShippingAddress')
-
-
-class BillingAddressFactory(factory.DjangoModelFactory):
-    country = factory.SubFactory(CountryFactory)
-
-    first_name = 'John'
-    last_name = 'Doe'
-    line1 = 'Streetname'
-    line2 = '1a'
-    line4 = 'City'
-    postcode = '1000AA'
-
-    class Meta:
-        model = get_model('order', 'BillingAddress')
-
-
-class OrderFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = get_model('order', 'Order')
-        exclude = ('basket',)
-
-    if hasattr(settings, 'OSCAR_INITIAL_ORDER_STATUS'):
-        status = settings.OSCAR_INITIAL_ORDER_STATUS
-
-    site_id = settings.SITE_ID
-    number = factory.LazyAttribute(lambda o: '%d' % (100000 + o.basket.pk))
-    basket = factory.SubFactory(BasketFactory)
-
-    shipping_code = 'delivery'
-    shipping_incl_tax = D('4.95')
-    shipping_excl_tax = factory.LazyAttribute(
-        lambda o: tax_subtract(o.shipping_incl_tax))
-
-    total_incl_tax = factory.LazyAttribute(lambda o: o.basket.total_incl_tax)
-    total_excl_tax = factory.LazyAttribute(lambda o: o.basket.total_excl_tax)
-
-    guest_email = factory.LazyAttribute(
-        lambda o: (
-            '%s.%s@example.com' % (
-                o.billing_address.first_name[0],
-                o.billing_address.last_name
-            )).lower())
-
-    shipping_address = factory.SubFactory(ShippingAddressFactory)
-    billing_address = factory.SubFactory(BillingAddressFactory)
-
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
-        date_placed = kwargs.pop('date_placed', None)
-        instance = super(OrderFactory, cls)._create(
-            target_class, *args, **kwargs)
-
-        if date_placed:
-            instance.date_placed = date_placed
-        return instance
-
-
-class OrderLineFactory(factory.DjangoModelFactory):
-    order = factory.SubFactory(OrderFactory)
-    product = factory.SubFactory(ProductFactory)
-    partner_sku = factory.LazyAttribute(lambda l: l.product.upc)
-    stockrecord = factory.LazyAttribute(
-        lambda l: l.product.stockrecords.first())
-    quantity = 1
-
-    line_price_incl_tax = factory.LazyAttribute(
-        lambda obj: tax_add(obj.stockrecord.price_excl_tax) * obj.quantity)
-    line_price_excl_tax = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.price_excl_tax * obj.quantity)
-
-    line_price_before_discounts_incl_tax = (
-        factory.SelfAttribute('.line_price_incl_tax'))
-    line_price_before_discounts_excl_tax = (
-        factory.SelfAttribute('.line_price_excl_tax'))
-
-    unit_price_incl_tax = factory.LazyAttribute(
-        lambda obj: tax_add(obj.stockrecord.price_excl_tax))
-    unit_cost_price = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.cost_price)
-    unit_price_excl_tax = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.price_excl_tax)
-    unit_retail_price = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.price_retail)
-
-    class Meta:
-        model = get_model('order', 'Line')
-
-
-class ShippingEventTypeFactory(factory.DjangoModelFactory):
-    name = 'Test event'
-    code = factory.LazyAttribute(lambda o: slugify(o.name).replace('-', '_'))
-
-    class Meta:
-        model = get_model('order', 'ShippingEventType')
-        django_get_or_create = ('code', )
-
-
-class ShippingEventFactory(factory.DjangoModelFactory):
-
-    order = factory.SubFactory(OrderFactory)
-    event_type = factory.SubFactory(ShippingEventTypeFactory)
-
-    class Meta:
-        model = get_model('order', 'ShippingEvent')
-
-
-def tax_subtract(price, tax_percentage=21):
-    """Subtract the given `tax_percentage` from the given `price`."""
-    if price is None:
-        return None
-
-    result = price / ((100 + tax_percentage) / D(100))
-    return result.quantize(D('0.01'), ROUND_HALF_UP)
-
-
-def tax_add(price, tax_percentage=21):
-    """Add the given `tax_percentage` to the given `price`."""
-    if price is None:
-        return None
-
-    result = price * ((100 + tax_percentage) / D(100))
-    return result.quantize(D('0.01'), ROUND_HALF_UP)
-
-
-class PermissionFactory(factory.DjangoModelFactory):
-    name = 'Dummy permission'
-    codename = 'dummy'
-
-    class Meta:
-        model = auth_models.Permission
-        django_get_or_create = ('content_type', 'codename')
-
-
-class SourceTypeFactory(factory.DjangoModelFactory):
-    name = 'Creditcard'
-    code = 'creditcard'
-
-    class Meta:
-        model = get_model('payment', 'SourceType')
-
-
-class SourceFactory(factory.DjangoModelFactory):
-    order = factory.SubFactory(OrderFactory)
-    source_type = factory.SubFactory(SourceTypeFactory)
-
-    class Meta:
-        model = get_model('payment', 'Source')
-
-
-class TransactionFactory(factory.DjangoModelFactory):
-    amount = factory.LazyAttribute(lambda obj: obj.source.order.total_incl_tax)
-    reference = factory.LazyAttribute(lambda obj: obj.source.order.number)
-    source = factory.SubFactory(SourceFactory)
-    status = 'authorised'
-
-    class Meta:
-        model = get_model('payment', 'Transaction')
-
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
-        date_created = kwargs.pop('date_created', None)
-        instance = super(TransactionFactory, cls)._create(
-            target_class, *args, **kwargs)
-
-        if date_created:
-            instance.date_created = date_created
-            instance.save()
-        return instance
-
-
-class ConditionFactory(factory.DjangoModelFactory):
-    type = get_model('offer', 'Condition').COUNT
-    value = 10
-
-    class Meta:
-        model = get_model('offer', 'Condition')
-
-
-class BenefitFactory(factory.DjangoModelFactory):
-    type = get_model('offer', 'Benefit').PERCENTAGE
-    value = 10
-    max_affected_items = None
-    range = factory.SubFactory(RangeFactory)
-
-    class Meta:
-        model = get_model('offer', 'Benefit')
-
-
-class ConditionalOfferFactory(factory.DjangoModelFactory):
-    name = 'Test offer'
-    benefit = factory.SubFactory(BenefitFactory)
-    condition = factory.SubFactory(ConditionFactory)
-
-    class Meta:
-        model = get_model('offer','ConditionalOffer')
-
-
-class OrderDiscountFactory(factory.DjangoModelFactory):
-
-    class Meta:
-        model = get_model('order', 'OrderDiscount')
+import warnings
+
+from oscar.test.factories.address import *  # noqa
+from oscar.test.factories.basket import *  # noqa
+from oscar.test.factories.catalogue import *  # noqa
+from oscar.test.factories.contrib import *  # noqa
+from oscar.test.factories.customer import *  # noqa
+from oscar.test.factories.offer import *  # noqa
+from oscar.test.factories.order import *  # noqa
+from oscar.test.factories.partner import *  # noqa
+from oscar.test.factories.payment import *  # noqa
+from oscar.test.factories.utils import *  # noqa
+from oscar.test.factories.voucher import *  # noqa
+
+
+message = (
+    "Module '%s' is deprecated and will be removed in the next major version "
+    "of django-oscar"
+) % __name__
+
+warnings.warn(message, PendingDeprecationWarning)

tests/functional/checkout/customer_checkout_tests.py

@@ -3,9 +3,9 @@ from django.core.urlresolvers import reverse
 from django.utils.six.moves import http_client
 
 from oscar.core.loading import get_model, get_class
-from oscar.test.newfactories import UserAddressFactory
-from oscar.test.testcases import WebTestCase
 from oscar.test import factories
+from oscar.test.factories import UserAddressFactory
+from oscar.test.testcases import WebTestCase
 from . import CheckoutMixin
 
 Order = get_model('order', 'Order')

tests/integration/catalogue/reviews/form_tests.py

@@ -1,9 +1,8 @@
 from django.test import TestCase
 
-from oscar.core.compat import get_user_model
-from oscar.apps.catalogue.reviews import forms, models
+from oscar.apps.catalogue.reviews import forms
 from oscar.test.factories import create_product
-from oscar.test.newfactories import UserFactory
+from oscar.test.factories import UserFactory
 
 
 class TestReviewForm(TestCase):

tests/integration/offer/applicator_tests.py

@@ -5,9 +5,9 @@ from mock import Mock
 
 from oscar.apps.offer import models
 from oscar.apps.offer.utils import Applicator
-from oscar.test.basket import add_product
 from oscar.test import factories
-from oscar.test.newfactories import (
+from oscar.test.basket import add_product
+from oscar.test.factories import (
     BenefitFactory, ConditionalOfferFactory, ConditionFactory, RangeFactory)
 
 

tests/integration/offer/availability_tests.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 
 from oscar.apps.offer import models
 from oscar.test.factories import create_order
-from oscar.test.newfactories import OrderDiscountFactory, UserFactory
+from oscar.test.factories import OrderDiscountFactory, UserFactory
 
 
 class TestAPerUserConditionalOffer(TestCase):

tests/integration/offer/status_tests.py

@@ -2,9 +2,8 @@ from decimal import Decimal as D
 
 from django.test import TestCase
 
-from oscar.apps.offer import models
 from oscar.core.loading import get_model
-from oscar.test.newfactories import ConditionalOfferFactory
+from oscar.test.factories import ConditionalOfferFactory
 
 
 class TestAnOfferChangesStatusWhen(TestCase):

tests/integration/order/model_tests.py

@@ -11,14 +11,13 @@ from oscar.apps.order.exceptions import (
 from oscar.apps.order.models import (
     Order, Line, ShippingEvent, ShippingEventType, ShippingEventQuantity,
     OrderNote, OrderDiscount)
+from oscar.test.basket import add_product
 from oscar.test.factories import (
     create_order, create_offer, create_voucher, create_basket)
-from oscar.test.newfactories import (
-    CountryFactory, OrderFactory, OrderLineFactory, ShippingAddressFactory,
+from oscar.test.factories import (
+    OrderFactory, OrderLineFactory, ShippingAddressFactory,
     ShippingEventFactory)
 
-from oscar.test.basket import add_product
-
 ORDER_PLACED = 'order_placed'
 
 

tests/integration/payment/model_tests.py

@@ -3,10 +3,9 @@ import datetime
 
 from django.test import TestCase
 
-from oscar.test import factories
-from oscar.apps.payment import models
 from oscar.apps.payment.models import Bankcard
-from oscar.test.newfactories import SourceFactory
+from oscar.test import factories
+from oscar.test.factories import SourceFactory
 
 
 class TestAPaymentSource(TestCase):

tests/unit/customer/alert_tests.py

@@ -3,7 +3,7 @@ from django.test import TestCase
 from oscar.apps.customer.models import ProductAlert
 from oscar.core.compat import get_user_model
 from oscar.test.factories import create_product
-from oscar.test.newfactories import UserFactory
+from oscar.test.factories import UserFactory
 
 
 User = get_user_model()

tests/unit/voucher/model_tests.py

@@ -7,7 +7,7 @@ from django.utils.timezone import utc
 
 from oscar.apps.voucher.models import Voucher
 from oscar.core.compat import get_user_model
-from oscar.test.newfactories import OrderFactory, UserFactory, VoucherFactory
+from oscar.test.factories import OrderFactory, UserFactory, VoucherFactory
 
 
 START_DATETIME = datetime.datetime(2011, 1, 1).replace(tzinfo=utc)