diff options
author | Jason Myers <jason@jasonamyers.com> | 2013-11-02 16:34:05 -0500 |
---|---|---|
committer | Jason Myers <jason@jasonamyers.com> | 2013-11-02 23:48:47 -0500 |
commit | c3791463a5a9674f8e0148fbab57eae23c138896 (patch) | |
tree | 6606acdb74132a344a49e910dec5d0356389a569 /tests/validation | |
parent | 2a03a9a9a1c4517be75e72899e545b0bc9dd0688 (diff) | |
download | django-c3791463a5a9674f8e0148fbab57eae23c138896.tar.gz |
Fixing E302 Errors
Signed-off-by: Jason Myers <jason@jasonamyers.com>
Diffstat (limited to 'tests/validation')
-rw-r--r-- | tests/validation/models.py | 13 | ||||
-rw-r--r-- | tests/validation/test_unique.py | 1 | ||||
-rw-r--r-- | tests/validation/tests.py | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/tests/validation/models.py b/tests/validation/models.py index ee5bcfc9aa..157b8cb158 100644 --- a/tests/validation/models.py +++ b/tests/validation/models.py @@ -11,6 +11,7 @@ def validate_answer_to_universe(value): if value != 42: raise ValidationError('This is not the answer to life, universe and everything!', code='not42') + class ModelToValidate(models.Model): name = models.CharField(max_length=100) created = models.DateTimeField(default=datetime.now) @@ -26,14 +27,17 @@ class ModelToValidate(models.Model): if self.number == 11: raise ValidationError('Invalid number supplied!') + class UniqueFieldsModel(models.Model): unique_charfield = models.CharField(max_length=100, unique=True) unique_integerfield = models.IntegerField(unique=True) non_unique_field = models.IntegerField() + class CustomPKModel(models.Model): my_pk_field = models.CharField(max_length=100, primary_key=True) + class UniqueTogetherModel(models.Model): cfield = models.CharField(max_length=100) ifield = models.IntegerField() @@ -42,6 +46,7 @@ class UniqueTogetherModel(models.Model): class Meta: unique_together = (('ifield', 'cfield',), ['ifield', 'efield']) + class UniqueForDateModel(models.Model): start_date = models.DateField() end_date = models.DateTimeField() @@ -49,6 +54,7 @@ class UniqueForDateModel(models.Model): order = models.IntegerField(unique_for_month="end_date") name = models.CharField(max_length=100) + class CustomMessagesModel(models.Model): other = models.IntegerField(blank=True, null=True) number = models.IntegerField(db_column='number_val', @@ -56,9 +62,11 @@ class CustomMessagesModel(models.Model): validators=[validate_answer_to_universe] ) + class Author(models.Model): name = models.CharField(max_length=100) + class Article(models.Model): title = models.CharField(max_length=100) author = models.ForeignKey(Author) @@ -68,6 +76,7 @@ class Article(models.Model): if self.pub_date is None: self.pub_date = datetime.now() + @python_2_unicode_compatible class Post(models.Model): title = models.CharField(max_length=50, unique_for_date='posted', blank=True) @@ -78,16 +87,19 @@ class Post(models.Model): def __str__(self): return self.name + class FlexibleDatePost(models.Model): title = models.CharField(max_length=50, unique_for_date='posted', blank=True) slug = models.CharField(max_length=50, unique_for_year='posted', blank=True) subtitle = models.CharField(max_length=50, unique_for_month='posted', blank=True) posted = models.DateField(blank=True, null=True) + class UniqueErrorsModel(models.Model): name = models.CharField(max_length=100, unique=True, error_messages={'unique': 'Custom unique name message.'}) no = models.IntegerField(unique=True, error_messages={'unique': 'Custom unique number message.'}) + class GenericIPAddressTestModel(models.Model): generic_ip = models.GenericIPAddressField(blank=True, null=True, unique=True) v4_ip = models.GenericIPAddressField(blank=True, null=True, protocol="ipv4") @@ -95,6 +107,7 @@ class GenericIPAddressTestModel(models.Model): ip_verbose_name = models.GenericIPAddressField("IP Address Verbose", blank=True, null=True) + class GenericIPAddrUnpackUniqueTest(models.Model): generic_v4unpack_ip = models.GenericIPAddressField(null=True, blank=True, unique=True, unpack_ipv4=True) diff --git a/tests/validation/test_unique.py b/tests/validation/test_unique.py index 7d4ba26ff0..14ac5a2471 100644 --- a/tests/validation/test_unique.py +++ b/tests/validation/test_unique.py @@ -55,6 +55,7 @@ class GetUniqueCheckTests(unittest.TestCase): ), m._get_unique_checks(exclude='start_date') ) + class PerformUniqueChecksTest(TestCase): def test_primary_key_unique_check_not_performed_when_adding_and_pk_not_specified(self): # Regression test for #12560 diff --git a/tests/validation/tests.py b/tests/validation/tests.py index 02839eaf26..7f81cafccf 100644 --- a/tests/validation/tests.py +++ b/tests/validation/tests.py @@ -52,7 +52,7 @@ class BaseModelValidationTests(ValidationTestCase): self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', ['Enter a valid URL.']) def test_text_greater_that_charfields_max_length_raises_erros(self): - mtv = ModelToValidate(number=10, name='Some Name'*100) + mtv = ModelToValidate(number=10, name='Some Name' * 100) self.assertFailsValidation(mtv.full_clean, ['name']) def test_malformed_slug_raises_error(self): @@ -65,6 +65,7 @@ class ArticleForm(forms.ModelForm): model = Article exclude = ['author'] + class ModelFormsTests(TestCase): def setUp(self): self.author = Author.objects.create(name='Joseph Kocherhans') |