Merged regressiontests and modeltests into the test root.

3 files changed, 97 insertions, 0 deletions

diff --git a/tests/null_fk_ordering/__init__.py b/tests/null_fk_ordering/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/null_fk_ordering/__init__.py
diff --git a/tests/null_fk_ordering/models.py b/tests/null_fk_ordering/models.py
new file mode 100644
index 0000000000..3caff0d594
--- /dev/null
+++ b/tests/null_fk_ordering/models.py
@@ -0,0 +1,55 @@
+"""
+Regression tests for proper working of ForeignKey(null=True). Tests these bugs:
+
+    * #7512: including a nullable foreign key reference in Meta ordering has un
+xpected results
+
+"""
+from __future__ import unicode_literals
+
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+
+# The first two models represent a very simple null FK ordering case.
+class Author(models.Model):
+    name = models.CharField(max_length=150)
+
+@python_2_unicode_compatible
+class Article(models.Model):
+    title = models.CharField(max_length=150)
+    author = models.ForeignKey(Author, null=True)
+
+    def __str__(self):
+        return 'Article titled: %s' % (self.title, )
+
+    class Meta:
+        ordering = ['author__name', ]
+
+
+# These following 4 models represent a far more complex ordering case.
+class SystemInfo(models.Model):
+    system_name = models.CharField(max_length=32)
+
+class Forum(models.Model):
+    system_info = models.ForeignKey(SystemInfo)
+    forum_name = models.CharField(max_length=32)
+
+@python_2_unicode_compatible
+class Post(models.Model):
+    forum = models.ForeignKey(Forum, null=True)
+    title = models.CharField(max_length=32)
+
+    def __str__(self):
+        return self.title
+
+@python_2_unicode_compatible
+class Comment(models.Model):
+    post = models.ForeignKey(Post, null=True)
+    comment_text = models.CharField(max_length=250)
+
+    class Meta:
+        ordering = ['post__forum__system_info__system_name', 'comment_text']
+
+    def __str__(self):
+        return self.comment_text
diff --git a/tests/null_fk_ordering/tests.py b/tests/null_fk_ordering/tests.py
new file mode 100644
index 0000000000..aea969de4f
--- /dev/null
+++ b/tests/null_fk_ordering/tests.py
@@ -0,0 +1,42 @@
+from __future__ import absolute_import
+
+from django.test import TestCase
+
+from .models import Author, Article, SystemInfo, Forum, Post, Comment
+
+
+class NullFkOrderingTests(TestCase):
+
+    def test_ordering_across_null_fk(self):
+        """
+        Regression test for #7512
+
+        ordering across nullable Foreign Keys shouldn't exclude results
+        """
+        author_1 = Author.objects.create(name='Tom Jones')
+        author_2 = Author.objects.create(name='Bob Smith')
+        article_1 = Article.objects.create(title='No author on this article')
+        article_2 = Article.objects.create(author=author_1, title='This article written by Tom Jones')
+        article_3 = Article.objects.create(author=author_2, title='This article written by Bob Smith')
+
+        # We can't compare results directly (since different databases sort NULLs to
+        # different ends of the ordering), but we can check that all results are
+        # returned.
+        self.assertTrue(len(list(Article.objects.all())) == 3)
+
+        s = SystemInfo.objects.create(system_name='System Info')
+        f = Forum.objects.create(system_info=s, forum_name='First forum')
+        p = Post.objects.create(forum=f, title='First Post')
+        c1 = Comment.objects.create(post=p, comment_text='My first comment')
+        c2 = Comment.objects.create(comment_text='My second comment')
+        s2 = SystemInfo.objects.create(system_name='More System Info')
+        f2 = Forum.objects.create(system_info=s2, forum_name='Second forum')
+        p2 = Post.objects.create(forum=f2, title='Second Post')
+        c3 = Comment.objects.create(comment_text='Another first comment')
+        c4 = Comment.objects.create(post=p2, comment_text='Another second comment')
+
+        # We have to test this carefully. Some databases sort NULL values before
+        # everything else, some sort them afterwards. So we extract the ordered list
+        # and check the length. Before the fix, this list was too short (some values
+        # were omitted).
+        self.assertTrue(len(list(Comment.objects.all())) == 4)