Ticket #16122: unified-tests.diff

docs/internals/contributing/writing-code/unit-tests.txt

@@ -7 +7 @@
 
 The tests cover:
 
-    * Models and the database API (``tests/modeltests/``).
-    * Everything else in core Django code (``tests/regressiontests``)
+    * Models, the database API and everything else in core Django code
+      (``tests/regressiontests``)
     * Contrib apps (``django/contrib/<contribapp>/tests``, see below)
 
 We appreciate any and all contributions to the test suite!
@@ -105 +105 @@
     ./runtests.py --settings=path.to.settings generic_relations i18n
 
 How do you find out the names of individual tests? Look in
-``tests/modeltests`` and ``tests/regressiontests`` -- each directory name
-there is the name of a test.
+``tests/regressiontests`` -- each directory name there is the name of a test.
 
 If you just want to run a particular class of tests, you can specify a list of
 paths to individual test classes. For example, to run the ``TranslationTests``

docs/topics/db/models.txt

@@ -18 +18 @@
     * With all of this, Django gives you an automatically-generated
       database-access API; see :doc:`/topics/db/queries`.
 
-.. seealso::
-
-    A companion to this document is the `official repository of model
-    examples`_. (In the Django source distribution, these examples are in the
-    ``tests/modeltests`` directory.)
-
-    .. _official repository of model examples: http://code.djangoproject.com/browser/django/trunk/tests/modeltests
-
 Quick example
 =============
 
@@ -329 +321 @@
     For sample code, see the `Many-to-one relationship model tests`_.
 
     .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
-    .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
+    .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/regressiontests/many_to_one
 
 Many-to-many relationships
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -379 +371 @@
 
     See the `Many-to-many relationship model example`_ for a full example.
 
-.. _Many-to-many relationship model example: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_many/models.py
+.. _Many-to-many relationship model example: http://code.djangoproject.com/browser/django/trunk/tests/regressiontests/many_to_many/models.py
 
 :class:`~django.db.models.ManyToManyField` fields also accept a number of extra
 arguments which are explained in :ref:`the model field reference
@@ -553 +545 @@
 
     See the `One-to-one relationship model example`_ for a full example.
 
-.. _One-to-one relationship model example: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/one_to_one/models.py
+.. _One-to-one relationship model example: http://code.djangoproject.com/browser/django/trunk/tests/regressiontests/one_to_one/models.py
 
 :class:`~django.db.models.OneToOneField` fields also accept one optional argument
 described in the :ref:`model field reference <ref-onetoone>`.

docs/topics/db/queries.txt

@@ -740 +740 @@
     The `OR lookups examples`_ in the Django unit tests show some possible uses
     of ``Q``.
 
-    .. _OR lookups examples: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/or_lookups/tests.py
+    .. _OR lookups examples: http://code.djangoproject.com/browser/django/trunk/tests/regressiontests/or_lookups/tests.py
 
 Comparing objects
 =================

delete/tests.py

@@ -1 +1 @@
 from django.db import models, IntegrityError
 from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature
 
-from modeltests.delete.models import (R, RChild, S, T, U, A, M, MR, MRNull,
-    create_a, get_default_r, User, Avatar, HiddenUser, HiddenUserProfile)
+from models import (R, RChild, S, T, U, A, M, MR, MRNull, create_a,
+    get_default_r, User, Avatar, HiddenUser, HiddenUserProfile)
 
 
 class OnDeleteTests(TestCase):

model_formsets/tests.py

@@ -9 +9 @@
     modelformset_factory, modelformset_factory)
 from django.test import TestCase, skipUnlessDBFeature
 
-from modeltests.model_formsets.models import (
+from models import (
     Author, BetterAuthor, Book, BookWithCustomPK, Editor,
     BookWithOptionalAltEditor, AlternateBook, AuthorMeeting, CustomPrimaryKey,
     Place, Owner, Location, OwnerProfile, Restaurant, Product, Price,

model_inheritance_same_model_name/models.py

@@ -7 +7 @@
 """
 
 from django.db import models
-from modeltests.model_inheritance.models import NamedURL
+from regressiontests.model_inheritance.models import NamedURL
 
 #
 # Abstract base classes with related models

model_inheritance_same_model_name/tests.py

@@ -1 +1 @@
 from django.test import TestCase
-from modeltests.model_inheritance.models import Title
+from regressiontests.model_inheritance.models import Title
 
 class InheritanceSameModelNameTests(TestCase):
 
@@ -10 +10 @@
         self.title = Title.objects.create(title='Lorem Ipsum')
 
     def test_inheritance_related_name(self):
-        from modeltests.model_inheritance.models import Copy
+        from regressiontests.model_inheritance.models import Copy
         self.assertEqual(
             self.title.attached_model_inheritance_copy_set.create(
                 content='Save $ on V1agr@',
@@ -19 +19 @@
             ), Copy.objects.get(content='Save $ on V1agr@'))
 
     def test_inheritance_with_same_model_name(self):
-        from modeltests.model_inheritance_same_model_name.models import Copy
+        from regressiontests.model_inheritance_same_model_name.models import Copy
         self.assertEqual(
             self.title.attached_model_inheritance_same_model_name_copy_set.create(
                 content='The Web framework for perfectionists with deadlines.',

test_client/views.py

@@ -151 +151 @@
                  name='Permissions Template')
     c = Context({'user': request.user})
     return HttpResponse(t.render(c))
-permission_protected_view = permission_required('modeltests.test_perm')(permission_protected_view)
+permission_protected_view = permission_required('regressiontests.test_perm')(permission_protected_view)
 
 class _ViewManager(object):
     @method_decorator(login_required)
@@ -162 +162 @@
         c = Context({'user': request.user})
         return HttpResponse(t.render(c))
 
-    @method_decorator(permission_required('modeltests.test_perm'))
+    @method_decorator(permission_required('regressiontests.test_perm'))
     def permission_protected_view(self, request):
         t = Template('This is a permission protected test using a method. '
                      'Username is {{ user.username }}. '

validation/test_custom_messages.py

@@ -1 @@
-from modeltests.validation import ValidationTestCase
+from regressiontests.validation import ValidationTestCase
 from models import CustomMessagesModel
 
 

validation/tests.py

@@ -1 +1 @@
 from django import forms
 from django.test import TestCase
 from django.core.exceptions import NON_FIELD_ERRORS
-from modeltests.validation import ValidationTestCase
-from modeltests.validation.models import Author, Article, ModelToValidate
+from regressiontests.validation import ValidationTestCase
+from regressiontests.validation.models import Author, Article, ModelToValidate
 
 # Import other tests for this package.
-from modeltests.validation.validators import TestModelsWithValidators
-from modeltests.validation.test_unique import (GetUniqueCheckTests,
+from regressiontests.validation.validators import TestModelsWithValidators
+from regressiontests.validation.test_unique import (GetUniqueCheckTests,
     PerformUniqueChecksTest)
-from modeltests.validation.test_custom_messages import CustomMessagesTest
+from regressiontests.validation.test_custom_messages import CustomMessagesTest
 
 
 class BaseModelValidationTests(ValidationTestCase):

validation/validators.py

@@ -1 +1 @@
 from django.utils.unittest import TestCase
 
-from modeltests.validation import ValidationTestCase
+from regressiontests.validation import ValidationTestCase
 from models import *
 
 

tests/runtests.py

@@ -5 +5 @@
 from django.utils import unittest
 
 CONTRIB_DIR_NAME = 'django.contrib'
-MODEL_TESTS_DIR_NAME = 'modeltests'
 REGRESSION_TESTS_DIR_NAME = 'regressiontests'
 
 TEST_TEMPLATE_DIR = 'templates'
 
 CONTRIB_DIR = os.path.dirname(contrib.__file__)
-MODEL_TEST_DIR = os.path.join(os.path.dirname(__file__), MODEL_TESTS_DIR_NAME)
 REGRESSION_TEST_DIR = os.path.join(os.path.dirname(__file__), REGRESSION_TESTS_DIR_NAME)
 
 REGRESSION_SUBDIRS_TO_SKIP = ['locale']
@@ -39 +37 @@
 
 def get_test_modules():
     modules = []
-    for loc, dirpath in (MODEL_TESTS_DIR_NAME, MODEL_TEST_DIR), (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR), (CONTRIB_DIR_NAME, CONTRIB_DIR):
+    for loc, dirpath in (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR), (CONTRIB_DIR_NAME, CONTRIB_DIR):
         for f in os.listdir(dirpath):
             if f.startswith('__init__') or f.startswith('.') or \
                f.startswith('sql') or f.startswith('invalid') or \
@@ -50 +48 @@
 
 def get_invalid_modules():
     modules = []
-    for loc, dirpath in (MODEL_TESTS_DIR_NAME, MODEL_TEST_DIR), (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR), (CONTRIB_DIR_NAME, CONTRIB_DIR):
+    for loc, dirpath in (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR), (CONTRIB_DIR_NAME, CONTRIB_DIR):
         for f in os.listdir(dirpath):
             if f.startswith('__init__') or f.startswith('.') or f.startswith('sql'):
                 continue

tests/urls.py

@@ -3 +3 @@
 
 urlpatterns = patterns('',
     # test_client modeltest urls
-    (r'^test_client/', include('modeltests.test_client.urls')),
+    (r'^test_client/', include('regressiontests.test_client.urls')),
     (r'^test_client_regress/', include('regressiontests.test_client_regress.urls')),
 
     # File upload test views