Commit 587c66f7 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Migrated forms (minus localflavor) doctests. A huge thanks to Daniel... 

[1.2.X] Migrated forms (minus localflavor) doctests. A huge thanks to Daniel Lindsley for the patch.

Backport of r14570 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3cbcce42

AUTHORS

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ answer newbie questions, and generally made Django that much better: 
    limodou

    Philip Lindborg <philip.lindborg@gmail.com>

    Simon Litchfield <simon@quo.com.au>

    Daniel Lindsley <polarcowz@gmail.com>

    Daniel Lindsley <daniel@toastdriven.com>

    Trey Long <trey@ktrl.com>

    Laurent Luce <http://www.laurentluce.com>

    Martin Mahner <http://www.mahner.org/>

tests/regressiontests/forms/error_messages.py

deleted100644 → 0
+0 −399
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

tests = r"""

>>> from django.forms import *

>>> from django.core.files.uploadedfile import SimpleUploadedFile



# CharField ###################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['min_length'] = 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s'

>>> e['max_length'] = 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s'

>>> f = CharField(min_length=5, max_length=10, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('1234')

Traceback (most recent call last):

...

ValidationError: [u'LENGTH 4, MIN LENGTH 5']

>>> f.clean('12345678901')

Traceback (most recent call last):

...

ValidationError: [u'LENGTH 11, MAX LENGTH 10']



# IntegerField ################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['min_value'] = 'MIN VALUE IS %(limit_value)s'

>>> e['max_value'] = 'MAX VALUE IS %(limit_value)s'

>>> f = IntegerField(min_value=5, max_value=10, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean('4')

Traceback (most recent call last):

...

ValidationError: [u'MIN VALUE IS 5']

>>> f.clean('11')

Traceback (most recent call last):

...

ValidationError: [u'MAX VALUE IS 10']



# FloatField ##################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['min_value'] = 'MIN VALUE IS %(limit_value)s'

>>> e['max_value'] = 'MAX VALUE IS %(limit_value)s'

>>> f = FloatField(min_value=5, max_value=10, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean('4')

Traceback (most recent call last):

...

ValidationError: [u'MIN VALUE IS 5']

>>> f.clean('11')

Traceback (most recent call last):

...

ValidationError: [u'MAX VALUE IS 10']



# DecimalField ################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['min_value'] = 'MIN VALUE IS %(limit_value)s'

>>> e['max_value'] = 'MAX VALUE IS %(limit_value)s'

>>> e['max_digits'] = 'MAX DIGITS IS %s'

>>> e['max_decimal_places'] = 'MAX DP IS %s'

>>> e['max_whole_digits'] = 'MAX DIGITS BEFORE DP IS %s'

>>> f = DecimalField(min_value=5, max_value=10, error_messages=e)

>>> f2 = DecimalField(max_digits=4, decimal_places=2, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean('4')

Traceback (most recent call last):

...

ValidationError: [u'MIN VALUE IS 5']

>>> f.clean('11')

Traceback (most recent call last):

...

ValidationError: [u'MAX VALUE IS 10']

>>> f2.clean('123.45')

Traceback (most recent call last):

...

ValidationError: [u'MAX DIGITS IS 4']

>>> f2.clean('1.234')

Traceback (most recent call last):

...

ValidationError: [u'MAX DP IS 2']

>>> f2.clean('123.4')

Traceback (most recent call last):

...

ValidationError: [u'MAX DIGITS BEFORE DP IS 2']



# DateField ###################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> f = DateField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']



# TimeField ###################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> f = TimeField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']



# DateTimeField ###############################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> f = DateTimeField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']



# RegexField ##################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['min_length'] = 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s'

>>> e['max_length'] = 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s'

>>> f = RegexField(r'^\d+$', min_length=5, max_length=10, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abcde')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean('1234')

Traceback (most recent call last):

...

ValidationError: [u'LENGTH 4, MIN LENGTH 5']

>>> f.clean('12345678901')

Traceback (most recent call last):

...

ValidationError: [u'LENGTH 11, MAX LENGTH 10']



# EmailField ##################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['min_length'] = 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s'

>>> e['max_length'] = 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s'

>>> f = EmailField(min_length=8, max_length=10, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abcdefgh')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean('a@b.com')

Traceback (most recent call last):

...

ValidationError: [u'LENGTH 7, MIN LENGTH 8']

>>> f.clean('aye@bee.com')

Traceback (most recent call last):

...

ValidationError: [u'LENGTH 11, MAX LENGTH 10']



# FileField ##################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['missing'] = 'MISSING'

>>> e['empty'] = 'EMPTY FILE'

>>> f = FileField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean(SimpleUploadedFile('name', None))

Traceback (most recent call last):

...

ValidationError: [u'EMPTY FILE']

>>> f.clean(SimpleUploadedFile('name', ''))

Traceback (most recent call last):

...

ValidationError: [u'EMPTY FILE']



# URLField ##################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID'

>>> e['invalid_link'] = 'INVALID LINK'

>>> f = URLField(verify_exists=True, error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('abc.c')

Traceback (most recent call last):

...

ValidationError: [u'INVALID']

>>> f.clean('http://www.broken.djangoproject.com')

Traceback (most recent call last):

...

ValidationError: [u'INVALID LINK']



# BooleanField ################################################################



>>> e = {'required': 'REQUIRED'}

>>> f = BooleanField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']



# ChoiceField #################################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid_choice'] = '%(value)s IS INVALID CHOICE'

>>> f = ChoiceField(choices=[('a', 'aye')], error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('b')

Traceback (most recent call last):

...

ValidationError: [u'b IS INVALID CHOICE']



# MultipleChoiceField #########################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid_choice'] = '%(value)s IS INVALID CHOICE'

>>> e['invalid_list'] = 'NOT A LIST'

>>> f = MultipleChoiceField(choices=[('a', 'aye')], error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('b')

Traceback (most recent call last):

...

ValidationError: [u'NOT A LIST']

>>> f.clean(['b'])

Traceback (most recent call last):

...

ValidationError: [u'b IS INVALID CHOICE']



# SplitDateTimeField ##########################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid_date'] = 'INVALID DATE'

>>> e['invalid_time'] = 'INVALID TIME'

>>> f = SplitDateTimeField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean(['a', 'b'])

Traceback (most recent call last):

...

ValidationError: [u'INVALID DATE', u'INVALID TIME']



# IPAddressField ##############################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid'] = 'INVALID IP ADDRESS'

>>> f = IPAddressField(error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('127.0.0')

Traceback (most recent call last):

...

ValidationError: [u'INVALID IP ADDRESS']



###############################################################################



# Create choices for the model choice field tests below.



>>> from regressiontests.forms.models import ChoiceModel

>>> ChoiceModel.objects.create(pk=1, name='a')

<ChoiceModel: ChoiceModel object>

>>> ChoiceModel.objects.create(pk=2, name='b')

<ChoiceModel: ChoiceModel object>

>>> ChoiceModel.objects.create(pk=3, name='c')

<ChoiceModel: ChoiceModel object>



# ModelChoiceField ############################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid_choice'] = 'INVALID CHOICE'

>>> f = ModelChoiceField(queryset=ChoiceModel.objects.all(), error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('4')

Traceback (most recent call last):

...

ValidationError: [u'INVALID CHOICE']



# ModelMultipleChoiceField ####################################################



>>> e = {'required': 'REQUIRED'}

>>> e['invalid_choice'] = '%s IS INVALID CHOICE'

>>> e['list'] = 'NOT A LIST OF VALUES'

>>> f = ModelMultipleChoiceField(queryset=ChoiceModel.objects.all(), error_messages=e)

>>> f.clean('')

Traceback (most recent call last):

...

ValidationError: [u'REQUIRED']

>>> f.clean('3')

Traceback (most recent call last):

...

ValidationError: [u'NOT A LIST OF VALUES']

>>> f.clean(['4'])

Traceback (most recent call last):

...

ValidationError: [u'4 IS INVALID CHOICE']



# Subclassing ErrorList #######################################################



>>> from django.utils.safestring import mark_safe

>>>

>>> class TestForm(Form):

...      first_name = CharField()

...      last_name = CharField()

...      birthday = DateField()

...

...      def clean(self):

...          raise ValidationError("I like to be awkward.")

...

>>> class CustomErrorList(util.ErrorList):

...      def __unicode__(self):

...          return self.as_divs()

...      def as_divs(self):

...          if not self: return u''

...          return mark_safe(u'<div class="error">%s</div>'

...                    % ''.join([u'<p>%s</p>' % e for e in self]))

...



This form should print errors the default way.



>>> form1 = TestForm({'first_name': 'John'})

>>> print form1['last_name'].errors

<ul class="errorlist"><li>This field is required.</li></ul>

>>> print form1.errors['__all__']

<ul class="errorlist"><li>I like to be awkward.</li></ul>



This one should wrap error groups in the customized way.



>>> form2 = TestForm({'first_name': 'John'}, error_class=CustomErrorList)

>>> print form2['last_name'].errors

<div class="error"><p>This field is required.</p></div>

>>> print form2.errors['__all__']

<div class="error"><p>I like to be awkward.</p></div>



"""

tests/regressiontests/forms/forms.py

deleted100644 → 0
+0 −1887

File deleted.

Preview size limit exceeded, changes collapsed.

tests/regressiontests/forms/formsets.py

deleted100644 → 0
+0 −724

File deleted.

Preview size limit exceeded, changes collapsed.

tests/regressiontests/forms/tests.py→tests/regressiontests/forms/localflavortests.py

+0 −21
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

from extra import tests as extra_tests

from forms import tests as form_tests

from error_messages import tests as custom_error_message_tests

from localflavor.ar import tests as localflavor_ar_tests

from localflavor.at import tests as localflavor_at_tests

from localflavor.au import tests as localflavor_au_tests
@@ -31,22 +28,9 @@ from localflavor.uk import tests as localflavor_uk_tests 
from localflavor.us import tests as localflavor_us_tests

from localflavor.uy import tests as localflavor_uy_tests

from localflavor.za import tests as localflavor_za_tests

from regressions import tests as regression_tests

from util import tests as util_tests

from widgets import tests as widgets_tests

from formsets import tests as formset_tests

from media import media_tests



from fields import FieldsTests

from validators import TestFieldWithValidators

from widgets import WidgetTests



from input_formats import *



__test__ = {

    'extra_tests': extra_tests,

    'form_tests': form_tests,

    'custom_error_message_tests': custom_error_message_tests,

    'localflavor_ar_tests': localflavor_ar_tests,

    'localflavor_at_tests': localflavor_at_tests,

    'localflavor_au_tests': localflavor_au_tests,
@@ -76,11 +60,6 @@ __test__ = { 
    'localflavor_us_tests': localflavor_us_tests,

    'localflavor_uy_tests': localflavor_uy_tests,

    'localflavor_za_tests': localflavor_za_tests,

    'regression_tests': regression_tests,

    'formset_tests': formset_tests,

    'media_tests': media_tests,

    'util_tests': util_tests,

    'widgets_tests': widgets_tests,

}



if __name__ == "__main__":