[1.8.x] Cleaned up schema tests

Thanks Tim Graham for the review.

Backport of 0204714b0b from master

tests/schema/fields.py

@@ -52,3 +52,7 @@ class CustomManyToManyField(RelatedField):
     _get_m2m_attr = ManyToManyField.__dict__['_get_m2m_attr']
     _get_m2m_reverse_attr = ManyToManyField.__dict__['_get_m2m_reverse_attr']
     _get_m2m_db_table = ManyToManyField.__dict__['_get_m2m_db_table']
+
+
+class InheritedManyToManyField(ManyToManyField):
+    pass

tests/schema/models.py

@@ -25,24 +25,9 @@ class AuthorWithDefaultHeight(models.Model):
         apps = new_apps
 
 
-class AuthorWithM2M(models.Model):
+class AuthorWithEvenLongerName(models.Model):
     name = models.CharField(max_length=255)
-
+    height = models.PositiveIntegerField(null=True, blank=True)
-    class Meta:
-        apps = new_apps
-
-
-class AuthorWithM2MThrough(models.Model):
-    name = models.CharField(max_length=255)
-    tags = models.ManyToManyField("schema.TagM2MTest", related_name="authors", through="AuthorTag")
-
-    class Meta:
-        apps = new_apps
-
-
-class AuthorTag(models.Model):
-    author = models.ForeignKey("schema.AuthorWithM2MThrough")
-    tag = models.ForeignKey("schema.TagM2MTest")
 
     class Meta:
         apps = new_apps
@@ -67,6 +52,13 @@ class BookWeak(models.Model):
         apps = new_apps
 
 
+class BookWithLongName(models.Model):
+    author_foreign_key_with_really_long_field_name = models.ForeignKey(AuthorWithEvenLongerName)
+
+    class Meta:
+        apps = new_apps
+
+
 class BookWithO2O(models.Model):
     author = models.OneToOneField(Author)
     title = models.CharField(max_length=100, db_index=True)
@@ -77,31 +69,6 @@ class BookWithO2O(models.Model):
         db_table = "schema_book"
 
 
-class BookWithM2M(models.Model):
-    author = models.ForeignKey(Author)
-    title = models.CharField(max_length=100, db_index=True)
-    pub_date = models.DateTimeField()
-    tags = models.ManyToManyField("TagM2MTest", related_name="books")
-
-    class Meta:
-        apps = new_apps
-
-
-class TagThrough(models.Model):
-    book = models.ForeignKey("schema.BookWithM2MThrough")
-    tag = models.ForeignKey("schema.TagM2MTest")
-
-    class Meta:
-        apps = new_apps
-
-
-class BookWithM2MThrough(models.Model):
-    tags = models.ManyToManyField("TagM2MTest", related_name="books", through=TagThrough)
-
-    class Meta:
-        apps = new_apps
-
-
 class BookWithSlug(models.Model):
     author = models.ForeignKey(Author)
     title = models.CharField(max_length=100, db_index=True)
@@ -113,6 +80,10 @@ class BookWithSlug(models.Model):
         db_table = "schema_book"
 
 
+class Note(models.Model):
+    info = models.TextField()
+
+
 class Tag(models.Model):
     title = models.CharField(max_length=255)
     slug = models.SlugField(unique=True)
@@ -121,14 +92,6 @@ class Tag(models.Model):
         apps = new_apps
 
 
-class TagM2MTest(models.Model):
-    title = models.CharField(max_length=255)
-    slug = models.SlugField(unique=True)
-
-    class Meta:
-        apps = new_apps
-
-
 class TagIndexed(models.Model):
     title = models.CharField(max_length=255)
     slug = models.SlugField(unique=True)
@@ -138,6 +101,14 @@ class TagIndexed(models.Model):
         index_together = [["slug", "title"]]
 
 
+class TagM2MTest(models.Model):
+    title = models.CharField(max_length=255)
+    slug = models.SlugField(unique=True)
+
+    class Meta:
+        apps = new_apps
+
+
 class TagUniqueRename(models.Model):
     title = models.CharField(max_length=255)
     slug2 = models.SlugField(unique=True)
@@ -147,30 +118,6 @@ class TagUniqueRename(models.Model):
         db_table = "schema_tag"
 
 
-class UniqueTest(models.Model):
-    year = models.IntegerField()
-    slug = models.SlugField(unique=False)
-
-    class Meta:
-        apps = new_apps
-        unique_together = ["year", "slug"]
-
-
-class AuthorWithEvenLongerName(models.Model):
-    name = models.CharField(max_length=255)
-    height = models.PositiveIntegerField(null=True, blank=True)
-
-    class Meta:
-        apps = new_apps
-
-
-class BookWithLongName(models.Model):
-    author_foreign_key_with_really_long_field_name = models.ForeignKey(AuthorWithEvenLongerName)
-
-    class Meta:
-        apps = new_apps
-
-
 # Based on tests/reserved_names/models.py
 @python_2_unicode_compatible
 class Thing(models.Model):
@@ -183,5 +130,10 @@ class Thing(models.Model):
         return self.when
 
 
-class Note(models.Model):
+class UniqueTest(models.Model):
-    info = models.TextField()
+    year = models.IntegerField()
+    slug = models.SlugField(unique=False)
+
+    class Meta:
+        apps = new_apps
+        unique_together = ["year", "slug"]