From 8d873dcf8fc18a85f1e2fa3a8b652d96753b5125 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 13 Mar 2015 00:02:59 +0100 Subject: [PATCH] Make use of Django 1.8's setUpTestData classmethod --- src/pretix/base/tests/test_cache.py | 8 +++--- src/pretix/base/tests/test_middleware.py | 12 ++++----- src/pretix/base/tests/test_models.py | 18 +++++++------ src/pretix/base/tests/test_plugins.py | 6 ++--- src/pretix/plugins/timerestriction/tests.py | 28 ++++++++++----------- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/pretix/base/tests/test_cache.py b/src/pretix/base/tests/test_cache.py index d160801764..31f6c645f4 100644 --- a/src/pretix/base/tests/test_cache.py +++ b/src/pretix/base/tests/test_cache.py @@ -12,13 +12,15 @@ class CacheTest(TestCase): This test case tests the invalidation of the event related cache. """ - - def setUp(self): + @classmethod + def setUpTestData(cls): o = Organizer.objects.create(name='Dummy', slug='dummy') - self.event = Event.objects.create( + cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', date_from=now(), ) + + def setUp(self): self.cache = self.event.get_cache() randint = random.random() self.testkey = "test" + str(randint) diff --git a/src/pretix/base/tests/test_middleware.py b/src/pretix/base/tests/test_middleware.py index be4d406396..3f6b4c0b8d 100644 --- a/src/pretix/base/tests/test_middleware.py +++ b/src/pretix/base/tests/test_middleware.py @@ -10,16 +10,16 @@ class LocaleDeterminationTest(TestCase): This test case tests various methods around the properties / variations concept. """ - - def setUp(self): + @classmethod + def setUpTestData(cls): o = Organizer.objects.create(name='Dummy', slug='dummy') - self.event = Event.objects.create( + cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', date_from=now(), ) - self.TEST_LOCALE = 'de' if settings.LANGUAGE_CODE == 'en' else 'en' - self.TEST_LOCALE_LONG = 'de-AT' if settings.LANGUAGE_CODE == 'en' else 'en-NZ' - self.user = User.objects.create_user('dummy@dummy.dummy', 'dummy@dummy.dummy', 'dummy') + cls.TEST_LOCALE = 'de' if settings.LANGUAGE_CODE == 'en' else 'en' + cls.TEST_LOCALE_LONG = 'de-AT' if settings.LANGUAGE_CODE == 'en' else 'en-NZ' + cls.user = User.objects.create_user('dummy@dummy.dummy', 'dummy@dummy.dummy', 'dummy') def test_global_default(self): c = Client() diff --git a/src/pretix/base/tests/test_models.py b/src/pretix/base/tests/test_models.py index ebb6d2b7b4..b924b94c90 100644 --- a/src/pretix/base/tests/test_models.py +++ b/src/pretix/base/tests/test_models.py @@ -16,18 +16,18 @@ class ItemVariationsTest(TestCase): This test case tests various methods around the properties / variations concept. """ - - def setUp(self): + @classmethod + def setUpTestData(cls): o = Organizer.objects.create(name='Dummy', slug='dummy') - self.event = Event.objects.create( + cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', date_from=now(), ) - p = Property.objects.create(event=self.event, name='Size') + p = Property.objects.create(event=cls.event, name='Size') PropertyValue.objects.create(prop=p, value='S') PropertyValue.objects.create(prop=p, value='M') PropertyValue.objects.create(prop=p, value='L') - p = Property.objects.create(event=self.event, name='Color') + p = Property.objects.create(event=cls.event, name='Color') PropertyValue.objects.create(prop=p, value='black') PropertyValue.objects.create(prop=p, value='blue') @@ -183,13 +183,15 @@ class UserTestCase(TestCase): class QuotaTestCase(TestCase): - - def setUp(self): + @classmethod + def setUpTestData(cls): o = Organizer.objects.create(name='Dummy', slug='dummy') - self.event = Event.objects.create( + cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', date_from=now(), ) + + def setUp(self): self.quota = Quota.objects.create(name="Test", size=2, event=self.event) self.item1 = Item.objects.create(event=self.event, name="Ticket") self.item2 = Item.objects.create(event=self.event, name="T-Shirt") diff --git a/src/pretix/base/tests/test_plugins.py b/src/pretix/base/tests/test_plugins.py index 8b0570433d..bc7980237d 100644 --- a/src/pretix/base/tests/test_plugins.py +++ b/src/pretix/base/tests/test_plugins.py @@ -34,10 +34,10 @@ class PluginSignalTest(TestCase): """ This test case tests the EventPluginSignal handler """ - - def setUp(self): + @classmethod + def setUpTestData(cls): o = Organizer.objects.create(name='Dummy', slug='dummy') - self.event = Event.objects.create( + cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', date_from=now(), ) diff --git a/src/pretix/plugins/timerestriction/tests.py b/src/pretix/plugins/timerestriction/tests.py index 619792778c..1194a3014e 100644 --- a/src/pretix/plugins/timerestriction/tests.py +++ b/src/pretix/plugins/timerestriction/tests.py @@ -17,24 +17,24 @@ class TimeRestrictionTest(TestCase): This test case tests the various aspects of the time restriction plugin """ - - def setUp(self): + @classmethod + def setUpTestData(cls): o = Organizer.objects.create(name='Dummy', slug='dummy') - self.event = Event.objects.create( + cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', date_from=now(), ) - self.item = Item.objects.create(event=self.event, name='Dummy', default_price=14) - self.property = Property.objects.create(event=self.event, name='Size') - self.value1 = PropertyValue.objects.create(prop=self.property, value='S') - self.value2 = PropertyValue.objects.create(prop=self.property, value='M') - self.value3 = PropertyValue.objects.create(prop=self.property, value='L') - self.variation1 = ItemVariation.objects.create(item=self.item) - self.variation1.values.add(self.value1) - self.variation2 = ItemVariation.objects.create(item=self.item) - self.variation2.values.add(self.value2) - self.variation3 = ItemVariation.objects.create(item=self.item) - self.variation3.values.add(self.value3) + cls.item = Item.objects.create(event=cls.event, name='Dummy', default_price=14) + cls.property = Property.objects.create(event=cls.event, name='Size') + cls.value1 = PropertyValue.objects.create(prop=cls.property, value='S') + cls.value2 = PropertyValue.objects.create(prop=cls.property, value='M') + cls.value3 = PropertyValue.objects.create(prop=cls.property, value='L') + cls.variation1 = ItemVariation.objects.create(item=cls.item) + cls.variation1.values.add(cls.value1) + cls.variation2 = ItemVariation.objects.create(item=cls.item) + cls.variation2.values.add(cls.value2) + cls.variation3 = ItemVariation.objects.create(item=cls.item) + cls.variation3.values.add(cls.value3) def test_nothing(self): result = signals.availability_handler(