commit 80b7e6e0ad9b338339a6f3d42f57db03c17206cc Author: Jonas Haag Date: Sun Aug 14 20:17:36 2011 +0200 tests diff --git a/tests/modeltests/generic_relations/tests.py b/tests/modeltests/generic_relations/tests.py index 7596f77..1be81ef 100644 --- a/tests/modeltests/generic_relations/tests.py +++ b/tests/modeltests/generic_relations/tests.py @@ -229,7 +229,7 @@ class GenericRelationsTests(TestCase): tag = TaggedItem.objects.create(content_object=tailless, tag="lizard") self.assertEqual(tag.content_object, tailless) -class CustomWidget(forms.CharField): +class CustomWidget(forms.TextInput): pass class TaggedItemForm(forms.ModelForm): diff --git a/tests/modeltests/model_forms/tests.py b/tests/modeltests/model_forms/tests.py index 0831035..52eb065 100644 --- a/tests/modeltests/model_forms/tests.py +++ b/tests/modeltests/model_forms/tests.py @@ -1087,7 +1087,7 @@ class OldFormForXTests(TestCase):

-

''') +

''') data = { 'writer': unicode(w_woodward.pk), @@ -1105,7 +1105,7 @@ class OldFormForXTests(TestCase):

-

''') +

''') def test_phone_number_field(self): f = PhoneNumberForm({'phone': '(312) 555-1212', 'description': 'Assistance'}) diff --git a/tests/modeltests/model_formsets/tests.py b/tests/modeltests/model_formsets/tests.py index 34f8d47..b0575e1 100644 --- a/tests/modeltests/model_formsets/tests.py +++ b/tests/modeltests/model_formsets/tests.py @@ -359,7 +359,7 @@ class ModelFormsetTest(TestCase): self.assertEqual(len(formset.forms), 1) self.assertEqual(formset.forms[0].as_p(), '

\n' - '

') + '

') data = { 'form-TOTAL_FORMS': '1', # the number of forms rendered @@ -382,10 +382,10 @@ class ModelFormsetTest(TestCase): self.assertEqual(len(formset.forms), 2) self.assertEqual(formset.forms[0].as_p(), '

\n' - '

' % hemingway_id) + '

' % hemingway_id) self.assertEqual(formset.forms[1].as_p(), '

\n' - '

') + '

') data = { 'form-TOTAL_FORMS': '2', # the number of forms rendered @@ -525,7 +525,7 @@ class ModelFormsetTest(TestCase): formset = AuthorBooksFormSet2(instance=author) self.assertEqual(len(formset.forms), 1) self.assertEqual(formset.forms[0].as_p(), - '

\n' + '

\n' '

') data = { @@ -773,7 +773,7 @@ class ModelFormsetTest(TestCase): '\n' '\n' '

\n' - '

' + '

' % (owner1.auto_id, owner2.auto_id)) owner1 = Owner.objects.get(name=u'Joe Perry') @@ -783,7 +783,7 @@ class ModelFormsetTest(TestCase): formset = FormSet(instance=owner1) self.assertEqual(len(formset.forms), 1) self.assertEqual(formset.forms[0].as_p(), - '

' + '

' % owner1.auto_id) data = { @@ -804,7 +804,7 @@ class ModelFormsetTest(TestCase): formset = FormSet(instance=owner1) self.assertEqual(len(formset.forms), 1) self.assertEqual(formset.forms[0].as_p(), - '

' + '

' % owner1.auto_id) data = { @@ -960,7 +960,7 @@ class ModelFormsetTest(TestCase): result = re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)?', '__DATETIME__', result) self.assertEqual(result, '

\n' - '

' + '

' % person.id) # test for validation with callable defaults. Validations rely on hidden fields diff --git a/tests/regressiontests/forms/tests/extra.py b/tests/regressiontests/forms/tests/extra.py index 67a5ffc..f10a57c 100644 --- a/tests/regressiontests/forms/tests/extra.py +++ b/tests/regressiontests/forms/tests/extra.py @@ -591,7 +591,7 @@ class FormsExtraTestCase(unittest.TestCase, AssertFormErrorsMixin): f = CommentForm(data, auto_id=False, error_class=DivErrorList) self.assertEqual(f.as_p(), """

Name:

Enter a valid e-mail address.
-

Email:

+

Email:

This field is required.

Comment:

""") diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py index e1b7fe0..a293556 100644 --- a/tests/regressiontests/forms/tests/fields.py +++ b/tests/regressiontests/forms/tests/fields.py @@ -71,6 +71,11 @@ def verify_exists_urls(existing_urls=()): class FieldsTests(SimpleTestCase): + def assertWidgetRendersTo(self, field, to): + class _Form(Form): + f = field + self.assertEqual(str(_Form()['f']), to) + def test_field_sets_widget_is_required(self): self.assertTrue(Field(required=True).widget.is_required) self.assertFalse(Field(required=False).widget.is_required) @@ -127,6 +132,7 @@ class FieldsTests(SimpleTestCase): def test_integerfield_1(self): f = IntegerField() + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertEqual(1, f.clean('1')) @@ -161,6 +167,7 @@ class FieldsTests(SimpleTestCase): def test_integerfield_3(self): f = IntegerField(max_value=10) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertEqual(1, f.clean(1)) self.assertEqual(10, f.clean(10)) @@ -172,6 +179,7 @@ class FieldsTests(SimpleTestCase): def test_integerfield_4(self): f = IntegerField(min_value=10) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertRaisesMessage(ValidationError, "[u'Ensure this value is greater than or equal to 10.']", f.clean, 1) self.assertEqual(10, f.clean(10)) @@ -183,6 +191,7 @@ class FieldsTests(SimpleTestCase): def test_integerfield_5(self): f = IntegerField(min_value=10, max_value=20) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertRaisesMessage(ValidationError, "[u'Ensure this value is greater than or equal to 10.']", f.clean, 1) self.assertEqual(10, f.clean(10)) @@ -198,6 +207,7 @@ class FieldsTests(SimpleTestCase): def test_floatfield_1(self): f = FloatField() + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertEqual(1.0, f.clean('1')) @@ -224,6 +234,7 @@ class FieldsTests(SimpleTestCase): def test_floatfield_3(self): f = FloatField(max_value=1.5, min_value=0.5) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'Ensure this value is less than or equal to 1.5.']", f.clean, '1.6') self.assertRaisesMessage(ValidationError, "[u'Ensure this value is greater than or equal to 0.5.']", f.clean, '0.4') self.assertEqual(1.5, f.clean('1.5')) @@ -235,6 +246,7 @@ class FieldsTests(SimpleTestCase): def test_decimalfield_1(self): f = DecimalField(max_digits=4, decimal_places=2) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertEqual(f.clean('1'), Decimal("1")) @@ -280,6 +292,7 @@ class FieldsTests(SimpleTestCase): def test_decimalfield_3(self): f = DecimalField(max_digits=4, decimal_places=2, max_value=Decimal('1.5'), min_value=Decimal('0.5')) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'Ensure this value is less than or equal to 1.5.']", f.clean, '1.6') self.assertRaisesMessage(ValidationError, "[u'Ensure this value is greater than or equal to 0.5.']", f.clean, '0.4') self.assertEqual(f.clean('1.5'), Decimal("1.5")) @@ -484,6 +497,7 @@ class FieldsTests(SimpleTestCase): def test_emailfield_1(self): f = EmailField() + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertEqual(u'person@example.com', f.clean('person@example.com')) @@ -522,6 +536,7 @@ class FieldsTests(SimpleTestCase): def test_emailfield_3(self): f = EmailField(min_length=10, max_length=15) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'Ensure this value has at least 10 characters (it has 9).']", f.clean, 'a@foo.com') self.assertEqual(u'alf@foo.com', f.clean('alf@foo.com')) self.assertRaisesMessage(ValidationError, "[u'Ensure this value has at most 15 characters (it has 20).']", f.clean, 'alf123456788@foo.com') @@ -562,6 +577,7 @@ class FieldsTests(SimpleTestCase): def test_urlfield_1(self): f = URLField() + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, '') self.assertRaisesMessage(ValidationError, "[u'This field is required.']", f.clean, None) self.assertEqual(u'http://localhost/', f.clean('http://localhost')) @@ -634,6 +650,7 @@ class FieldsTests(SimpleTestCase): def test_urlfield_5(self): f = URLField(min_length=15, max_length=20) + self.assertWidgetRendersTo(f, '') self.assertRaisesMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com') self.assertEqual(u'http://example.com/', f.clean('http://example.com')) self.assertRaisesMessage(ValidationError, "[u'Ensure this value has at most 20 characters (it has 38).']", f.clean, 'http://abcdefghijklmnopqrstuvwxyz.com') diff --git a/tests/regressiontests/forms/tests/forms.py b/tests/regressiontests/forms/tests/forms.py index ed783af..f0463f4 100644 --- a/tests/regressiontests/forms/tests/forms.py +++ b/tests/regressiontests/forms/tests/forms.py @@ -252,11 +252,11 @@ class FormsTestCase(TestCase): get_spam = BooleanField() f = SignupForm(auto_id=False) - self.assertEqual(str(f['email']), '') + self.assertEqual(str(f['email']), '') self.assertEqual(str(f['get_spam']), '') f = SignupForm({'email': 'test@example.com', 'get_spam': True}, auto_id=False) - self.assertEqual(str(f['email']), '') + self.assertEqual(str(f['email']), '') self.assertEqual(str(f['get_spam']), '') # 'True' or 'true' should be rendered without a value attribute @@ -1710,8 +1710,8 @@ class FormsTestCase(TestCase): -
    • -
    • """) +
    • +
    • """) self.assertEqual(p.as_p(), """

    @@ -1720,9 +1720,9 @@ class FormsTestCase(TestCase):

    -

    +

    -

    """) +

    """) self.assertEqual(p.as_table(), """ - -""") + +""") def test_label_split_datetime_not_displayed(self): class EventForm(Form): diff --git a/tests/regressiontests/forms/tests/formsets.py b/tests/regressiontests/forms/tests/formsets.py index 4451fc7..4920ed8 100644 --- a/tests/regressiontests/forms/tests/formsets.py +++ b/tests/regressiontests/forms/tests/formsets.py @@ -49,7 +49,7 @@ class FormsFormsetTestCase(TestCase): formset = ChoiceFormSet(auto_id=False, prefix='choices') self.assertEqual(str(formset), """ Choice: -Votes:""") +Votes:""") # On thing to note is that there needs to be a special value in the data. This # value tells the FormSet how many forms were displayed so it can tell how @@ -106,9 +106,9 @@ class FormsFormsetTestCase(TestCase): form_output.append(form.as_ul()) self.assertEqual('\n'.join(form_output), """
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Choice:
    • -
  • Votes:
    • """) +
  • Votes:
    • """) # Let's simulate what would happen if we submitted this form. @@ -179,11 +179,11 @@ class FormsFormsetTestCase(TestCase): form_output.append(form.as_ul()) self.assertEqual('\n'.join(form_output), """
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Choice:
    • -
  • Votes:
    • """) +
  • Votes:
    • """) # Since we displayed every form as blank, we will also accept them back as blank. # This may seem a little strange, but later we will show how to require a minimum @@ -270,19 +270,19 @@ class FormsFormsetTestCase(TestCase): form_output.append(form.as_ul()) self.assertEqual('\n'.join(form_output), """
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Choice:
    • -
  • Votes:
    • """) +
  • Votes:
    • """) # Make sure retrieving an empty form works, and it shows up in the form list self.assertTrue(formset.empty_form.empty_permitted) self.assertEqual(formset.empty_form.as_ul(), """
  • Choice:
    • -
  • Votes:
    • """) +
  • Votes:
    • """) def test_formset_with_deletion(self): # FormSets with deletion ###################################################### @@ -300,13 +300,13 @@ class FormsFormsetTestCase(TestCase): form_output.append(form.as_ul()) self.assertEqual('\n'.join(form_output), """
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Delete:
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Delete:
  • Choice:
    • -
  • Votes:
    • +
  • Votes:
  • Delete:
    • """) # To delete something, we just need to set that form's special delete field to @@ -397,14 +397,14 @@ class FormsFormsetTestCase(TestCase): form_output.append(form.as_ul()) self.assertEqual('\n'.join(form_output), """
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • +
  • Votes:
    • +
  • Order:
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • +
  • Votes:
    • +
  • Order:
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • """) +
  • Votes:
    • +
  • Order:
    • """) data = { 'choices-TOTAL_FORMS': '3', # the number of forms rendered @@ -508,20 +508,20 @@ class FormsFormsetTestCase(TestCase): form_output.append(form.as_ul()) self.assertEqual('\n'.join(form_output), """
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • +
  • Votes:
    • +
  • Order:
  • Delete:
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • +
  • Votes:
    • +
  • Order:
  • Delete:
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • +
  • Votes:
    • +
  • Order:
  • Delete:
  • Choice:
    • -
  • Votes:
    • -
  • Order:
    • +
  • Votes:
    • +
  • Order:
  • Delete:
    • """) # Let's delete Fergie, and put The Decemberists ahead of Calexico. @@ -824,19 +824,19 @@ class FormsetAsFooTests(TestCase): formset = ChoiceFormSet(data, auto_id=False, prefix='choices') self.assertEqual(formset.as_table(),""" Choice: -Votes:""") +Votes:""") def test_as_p(self): formset = ChoiceFormSet(data, auto_id=False, prefix='choices') self.assertEqual(formset.as_p(),"""

    Choice:

    -

    Votes:

    """) +

    Votes:

    """) def test_as_ul(self): formset = ChoiceFormSet(data, auto_id=False, prefix='choices') self.assertEqual(formset.as_ul(),"""
  • Choice:
    • -
  • Votes:
    • """) +
  • Votes:
    • """) # Regression test for #11418 ################################################# diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py index da59922..63d073a 100644 --- a/tests/regressiontests/generic_inline_admin/tests.py +++ b/tests/regressiontests/generic_inline_admin/tests.py @@ -97,22 +97,22 @@ class GenericAdminViewTest(TestCase): # Works with no queryset formset = EpisodeMediaFormSet(instance=e) self.assertEqual(len(formset.forms), 5) - self.assertEqual(formset.forms[0].as_p(), '

    ' % self.mp3_media_pk) - self.assertEqual(formset.forms[1].as_p(), '

    ' % self.png_media_pk) - self.assertEqual(formset.forms[2].as_p(), '

    ') + self.assertEqual(formset.forms[0].as_p(), '

    ' % self.mp3_media_pk) + self.assertEqual(formset.forms[1].as_p(), '

    ' % self.png_media_pk) + self.assertEqual(formset.forms[2].as_p(), '

    ') # A queryset can be used to alter display ordering formset = EpisodeMediaFormSet(instance=e, queryset=Media.objects.order_by('url')) self.assertEqual(len(formset.forms), 5) - self.assertEqual(formset.forms[0].as_p(), '

    ' % self.png_media_pk) - self.assertEqual(formset.forms[1].as_p(), '

    ' % self.mp3_media_pk) - self.assertEqual(formset.forms[2].as_p(), '

    ') + self.assertEqual(formset.forms[0].as_p(), '

    ' % self.png_media_pk) + self.assertEqual(formset.forms[1].as_p(), '

    ' % self.mp3_media_pk) + self.assertEqual(formset.forms[2].as_p(), '

    ') # Works with a queryset that omits items formset = EpisodeMediaFormSet(instance=e, queryset=Media.objects.filter(url__endswith=".png")) self.assertEqual(len(formset.forms), 4) - self.assertEqual(formset.forms[0].as_p(), '

    ' % self.png_media_pk) - self.assertEqual(formset.forms[1].as_p(), '

    ') + self.assertEqual(formset.forms[0].as_p(), '

    ' % self.png_media_pk) + self.assertEqual(formset.forms[1].as_p(), '

    ') def testGenericInlineFormsetFactory(self): # Regression test for #10522. diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py index 0b955ad..9700cf7 100644 --- a/tests/regressiontests/i18n/tests.py +++ b/tests/regressiontests/i18n/tests.py @@ -431,13 +431,13 @@ class FormattingTests(TestCase): self.assertEqual(True, form6.is_valid()) self.assertEqual( form6.as_ul(), - u'
    • \n
    • \n
    • \n
    • ' + u'
    • \n
    • \n
    • \n
    • ' ) self.assertEqual(localize_input(datetime.datetime(2009, 12, 31, 6, 0, 0)), '31.12.2009 06:00:00') self.assertEqual(datetime.datetime(2009, 12, 31, 6, 0, 0), form6.cleaned_data['date_added']) with self.settings(USE_THOUSAND_SEPARATOR=True): # Checking for the localized "products_delivered" field - self.assertTrue(u'' in form6.as_ul()) + self.assertTrue(u'' in form6.as_ul()) def test_iter_format_modules(self): """