From adb791fdcbdbd6d1b5c258d114b88953d2248c13 Mon Sep 17 00:00:00 2001
From: Morgan Aubert <morgan.aubert@savoirfairelinux.com>
Date: Wed, 14 Dec 2016 11:48:57 -0500
Subject: [PATCH] Moved test_field_ordering to the model_fields package.

---
 tests/basic/tests.py        | 17 -----------------
 tests/model_fields/tests.py | 10 ++++++++++
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index b4acd1ff45..05a49ac3ab 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -5,7 +5,6 @@ from datetime import datetime, timedelta
 
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.db import DEFAULT_DB_ALIAS, DatabaseError, connections
-from django.db.models.fields import Field
 from django.db.models.manager import BaseManager
 from django.db.models.query import EmptyQuerySet, QuerySet
 from django.test import (
@@ -268,22 +267,6 @@ class ModelTest(TestCase):
         s = {a10, a11, a12}
         self.assertIn(Article.objects.get(headline='Article 11'), s)
 
-    def test_field_ordering(self):
-        """
-        Field instances have a `__lt__` comparison function to define an
-        ordering based on their creation. Prior to #17851 this ordering
-        comparison relied on the now unsupported `__cmp__` and was assuming
-        compared objects were both Field instances raising `AttributeError`
-        when it should have returned `NotImplemented`.
-        """
-        f1 = Field()
-        f2 = Field(auto_created=True)
-        f3 = Field()
-        self.assertLess(f2, f1)
-        self.assertGreater(f3, f1)
-        self.assertIsNotNone(f1)
-        self.assertNotIn(f2, (None, 1, ''))
-
     def test_extra_method_select_argument_with_dashes_and_values(self):
         # The 'select' argument to extra() supports names with dashes in
         # them, as long as you use values().
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index 85e2825165..f7faf399c7 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -59,6 +59,16 @@ class BasicFieldTests(TestCase):
         f = Foo._meta.get_field('a')
         self.assertEqual(force_str(f), 'model_fields.Foo.a')
 
+    def test_field_ordering(self):
+        """Fields are ordered based on their creation."""
+        f1 = models.Field()
+        f2 = models.Field(auto_created=True)
+        f3 = models.Field()
+        self.assertLess(f2, f1)
+        self.assertGreater(f3, f1)
+        self.assertIsNotNone(f1)
+        self.assertNotIn(f2, (None, 1, ''))
+
 
 class ChoicesTests(SimpleTestCase):