diff options
Diffstat (limited to 'django_testscenarios')
| -rw-r--r-- | django_testscenarios/__init__.py | 1 | ||||
| -rw-r--r-- | django_testscenarios/tests.py | 52 | ||||
| -rw-r--r-- | django_testscenarios/ubertest.py | 26 |
3 files changed, 33 insertions, 46 deletions
diff --git a/django_testscenarios/__init__.py b/django_testscenarios/__init__.py index 8b13789..e69de29 100644 --- a/django_testscenarios/__init__.py +++ b/django_testscenarios/__init__.py @@ -1 +0,0 @@ - diff --git a/django_testscenarios/tests.py b/django_testscenarios/tests.py index 25455de..b20f494 100644 --- a/django_testscenarios/tests.py +++ b/django_testscenarios/tests.py @@ -98,9 +98,8 @@ class TransactionChecks(object): # Non-transaction tests -class TestsWorkWithPlainDjangoTestCase( - DjangoTestCase, - PlainDatabaseChecks): +class TestsWorkWithPlainDjangoTestCase(DjangoTestCase, + PlainDatabaseChecks): """ Test class that is using: * plain database checks @@ -108,9 +107,8 @@ class TestsWorkWithPlainDjangoTestCase( """ -class TestsWorkWithTestToolsTestCase( - TestCase, - PlainDatabaseChecks): +class TestsWorkWithTestToolsTestCase(TestCase, + PlainDatabaseChecks): """ Test class that is using: * plain database checks @@ -118,9 +116,8 @@ class TestsWorkWithTestToolsTestCase( """ -class TestsWorkWithTestScenariosTestCaseAndNoScenarios( - TestCaseWithScenarios, - PlainDatabaseChecks): +class TestsWorkWithTestScenariosTestCaseAndNoScenarios(TestCaseWithScenarios, + PlainDatabaseChecks): """ Test class that is using: * plain database checks @@ -130,10 +127,9 @@ class TestsWorkWithTestScenariosTestCaseAndNoScenarios( """ -class TestsWorkWithTestScenariosTestCaseAndSomeScenarios( - TestCaseWithScenarios, - ScenarioParametersAreVisibleChecks, - PlainDatabaseChecks): +class TestsWorkWithTestScenariosTestCaseAndSomeScenarios(TestCaseWithScenarios, + ScenarioParametersAreVisibleChecks, + PlainDatabaseChecks): """ Test class that is using: * database transactions @@ -146,10 +142,9 @@ class TestsWorkWithTestScenariosTestCaseAndSomeScenarios( # Transaction tests -class TransactionsWorkWithPlainDjangoTestCase( - DjangoTransactionTestCase, - PlainDatabaseChecks, - TransactionChecks): +class TransactionsWorkWithPlainDjangoTestCase(DjangoTransactionTestCase, + PlainDatabaseChecks, + TransactionChecks): """ Test class that is using: * database transactions @@ -157,10 +152,9 @@ class TransactionsWorkWithPlainDjangoTestCase( """ -class TransactionsWorkWithTestToolsTestCase( - TransactionTestCase, - PlainDatabaseChecks, - TransactionChecks): +class TransactionsWorkWithTestToolsTestCase(TransactionTestCase, + PlainDatabaseChecks, + TransactionChecks): """ Test class that is using: * database transactions @@ -168,10 +162,9 @@ class TransactionsWorkWithTestToolsTestCase( """ -class TransactionsWorkWithTestScenariosTestCaseAndNoScenarios( - TransactionTestCaseWithScenarios, - PlainDatabaseChecks, - TransactionChecks): +class TransactionsWorkWithTestScenariosTestCaseAndNoScenarios(TransactionTestCaseWithScenarios, + PlainDatabaseChecks, + TransactionChecks): """ Test class that is using: * database transactions @@ -181,11 +174,10 @@ class TransactionsWorkWithTestScenariosTestCaseAndNoScenarios( """ -class TransactionsWorkWithTestScenariosTestCaseAndSomeScenarios( - TransactionTestCaseWithScenarios, - ScenarioParametersAreVisibleChecks, - PlainDatabaseChecks, - TransactionChecks): +class TransactionsWorkWithTestScenariosTestCaseAndSomeScenarios(TransactionTestCaseWithScenarios, + ScenarioParametersAreVisibleChecks, + PlainDatabaseChecks, + TransactionChecks): """ Test class that is using: * database transactions diff --git a/django_testscenarios/ubertest.py b/django_testscenarios/ubertest.py index b973cc6..cd7ccd7 100644 --- a/django_testscenarios/ubertest.py +++ b/django_testscenarios/ubertest.py @@ -79,30 +79,27 @@ class ScenarioAwareTestCaseIdStrReprMixIn(object): return str(self) -class TransactionTestCase( - ScenarioAwareTestCaseIdStrReprMixIn, - testtools.TestCase, - django.test.TransactionTestCase): +class TransactionTestCase(ScenarioAwareTestCaseIdStrReprMixIn, + testtools.TestCase, + django.test.TransactionTestCase): """ Django TransactionTestCase with testtools power. """ -class TestCase( +class TestCase(django.test.TestCase, + TransactionTestCase): # XXX: Inheritance order is very important! # See comment next to TestCaseWithScenarios - django.test.TestCase, - TransactionTestCase): """ Django TestCase with testtools power. """ -class TransactionTestCaseWithScenarios( - ScenarioAwareTestCaseIdStrReprMixIn, - testtools.TestCase, - testscenarios.TestWithScenarios, - django.test.TransactionTestCase): +class TransactionTestCaseWithScenarios(ScenarioAwareTestCaseIdStrReprMixIn, + testtools.TestCase, + testscenarios.TestWithScenarios, + django.test.TransactionTestCase): """ Django TransactionTestCase with testtools power and scenario support. """ @@ -162,7 +159,8 @@ class TransactionTestCaseWithScenarios( return super(TransactionTestCaseWithScenarios, self).run(result) -class TestCaseWithScenarios( +class TestCaseWithScenarios(django.test.TestCase, + TransactionTestCaseWithScenarios): # XXX: As in Django we mimic important implementation detail. # Inheritance order is important for non-obvious reasons. @@ -179,8 +177,6 @@ class TestCaseWithScenarios( # # Hence, our implementation makes the TransactionTestCase the base # class and the plain TestCase derived class. - django.test.TestCase, - TransactionTestCaseWithScenarios): """ Django TestCase with testtools power and scenario support. """ |