diff options
| author | Tim Graham <timograham@gmail.com> | 2015-10-13 06:08:27 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-14 05:21:08 -0700 |
| commit | c7aff31397a7228f6ac2e33c10ebdf36c4b7a9b7 (patch) | |
| tree | a034b8762c029ef9f9b42ceef248081664220673 /tests/foreign_object | |
| parent | 92c1ae1b0b9955a511c19e07921c10126b6faa54 (diff) | |
Refs #25535 -- Minor edits to ForeignObject check changes.
Diffstat (limited to 'tests/foreign_object')
| -rw-r--r-- | tests/foreign_object/tests.py | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py index 559c988edd..5188645325 100644 --- a/tests/foreign_object/tests.py +++ b/tests/foreign_object/tests.py @@ -4,7 +4,7 @@ from operator import attrgetter from django.core.exceptions import FieldError from django.db import models from django.db.models.fields.related import ForeignObject -from django.test import TestCase, skipUnlessDBFeature +from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature from django.utils import translation from .models import ( @@ -394,21 +394,21 @@ class MultiColumnFKTests(TestCase): objs = [Person(name="abcd_%s" % i, person_country=self.usa) for i in range(0, 5)] Person.objects.bulk_create(objs, 10) + +class TestModelCheckTests(SimpleTestCase): + def test_check_composite_foreign_object(self): class Parent(models.Model): a = models.PositiveIntegerField() b = models.PositiveIntegerField() class Meta: - unique_together = ( - ('a', 'b'), - ) + unique_together = (('a', 'b'),) class Child(models.Model): a = models.PositiveIntegerField() b = models.PositiveIntegerField() value = models.CharField(max_length=255) - parent = ForeignObject( Parent, on_delete=models.SET_NULL, @@ -417,10 +417,7 @@ class MultiColumnFKTests(TestCase): related_name='children', ) - field = Child._meta.get_field('parent') - errors = field.check(from_model=Child) - - self.assertEqual(errors, []) + self.assertEqual(Child._meta.get_field('parent').check(from_model=Child), []) def test_check_subset_composite_foreign_object(self): class Parent(models.Model): @@ -429,16 +426,13 @@ class MultiColumnFKTests(TestCase): c = models.PositiveIntegerField() class Meta: - unique_together = ( - ('a', 'b'), - ) + unique_together = (('a', 'b'),) class Child(models.Model): a = models.PositiveIntegerField() b = models.PositiveIntegerField() c = models.PositiveIntegerField() d = models.CharField(max_length=255) - parent = ForeignObject( Parent, on_delete=models.SET_NULL, @@ -447,7 +441,4 @@ class MultiColumnFKTests(TestCase): related_name='children', ) - field = Child._meta.get_field('parent') - errors = field.check(from_model=Child) - - self.assertEqual(errors, []) + self.assertEqual(Child._meta.get_field('parent').check(from_model=Child), []) |