Commit 0db99113 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #13495 -- Refactored the localflavor test directory to provide the... 

Fixed #13495 -- Refactored the localflavor test directory to provide the placeholder structure for other flavors. Thanks to chronos for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent cefee67b

tests/regressiontests/localflavor/models.py

+0 −8
Original line number Diff line number Diff line 
from django.db import models

from django.contrib.localflavor.us.models import USStateField



class Place(models.Model):

    state = USStateField(blank=True)

    state_req = USStateField()

    state_default = USStateField(default="CA", blank=True)

    name = models.CharField(max_length=20)

tests/regressiontests/localflavor/tests.py

+3 −81
Original line number Diff line number Diff line 
import unittest

from django.test import TestCase

from models import Place

from forms import PlaceForm



class USLocalflavorTests(TestCase):

    def setUp(self):

        self.form = PlaceForm({'state':'GA', 'state_req':'NC', 'name':'impossible'})

        

    def test_get_display_methods(self):

        """Test that the get_*_display() methods are added to the model instances."""

        place = self.form.save()

        self.assertEqual(place.get_state_display(), 'Georgia')

        self.assertEqual(place.get_state_req_display(), 'North Carolina')

    

    def test_required(self):

        """Test that required USStateFields throw appropriate errors."""

        form = PlaceForm({'state':'GA', 'name':'Place in GA'})

        self.assertFalse(form.is_valid())

        self.assertEqual(form.errors['state_req'], [u'This field is required.'])

    

    def test_field_blank_option(self):

        """Test that the empty option is there."""

        state_select_html = """\

<select name="state" id="id_state">

<option value="">---------</option>

<option value="AL">Alabama</option>

<option value="AK">Alaska</option>

<option value="AS">American Samoa</option>

<option value="AZ">Arizona</option>

<option value="AR">Arkansas</option>

<option value="CA">California</option>

<option value="CO">Colorado</option>

<option value="CT">Connecticut</option>

<option value="DE">Delaware</option>

<option value="DC">District of Columbia</option>

<option value="FL">Florida</option>

<option value="GA" selected="selected">Georgia</option>

<option value="GU">Guam</option>

<option value="HI">Hawaii</option>

<option value="ID">Idaho</option>

<option value="IL">Illinois</option>

<option value="IN">Indiana</option>

<option value="IA">Iowa</option>

<option value="KS">Kansas</option>

<option value="KY">Kentucky</option>

<option value="LA">Louisiana</option>

<option value="ME">Maine</option>

<option value="MD">Maryland</option>

<option value="MA">Massachusetts</option>

<option value="MI">Michigan</option>

<option value="MN">Minnesota</option>

<option value="MS">Mississippi</option>

<option value="MO">Missouri</option>

<option value="MT">Montana</option>

<option value="NE">Nebraska</option>

<option value="NV">Nevada</option>

<option value="NH">New Hampshire</option>

<option value="NJ">New Jersey</option>

<option value="NM">New Mexico</option>

<option value="NY">New York</option>

<option value="NC">North Carolina</option>

<option value="ND">North Dakota</option>

<option value="MP">Northern Mariana Islands</option>

<option value="OH">Ohio</option>

<option value="OK">Oklahoma</option>

<option value="OR">Oregon</option>

<option value="PA">Pennsylvania</option>

<option value="PR">Puerto Rico</option>

<option value="RI">Rhode Island</option>

<option value="SC">South Carolina</option>

<option value="SD">South Dakota</option>

<option value="TN">Tennessee</option>

<option value="TX">Texas</option>

<option value="UT">Utah</option>

<option value="VT">Vermont</option>

<option value="VI">Virgin Islands</option>

<option value="VA">Virginia</option>

<option value="WA">Washington</option>

<option value="WV">West Virginia</option>

<option value="WI">Wisconsin</option>

<option value="WY">Wyoming</option>

</select>"""

        self.assertEqual(str(self.form['state']), state_select_html)
 
# just import your tests here

from us.tests import *

tests/regressiontests/localflavor/forms.py→tests/regressiontests/localflavor/us/forms.py

+3 −3
Original line number Diff line number Diff line 
from django.forms import ModelForm

from models import Place

from models import USPlace



class PlaceForm(ModelForm):

class USPlaceForm(ModelForm):

    """docstring for PlaceForm"""

    class Meta:

        model = Place
 
        model = USPlace

tests/regressiontests/localflavor/us/models.py

0 → 100644
+13 −0
Original line number Diff line number Diff line 
from django.db import models

from django.contrib.localflavor.us.models import USStateField



# When creating models you need to remember to add a app_label as

# 'localflavor', so your model can be found



class USPlace(models.Model):

    state = USStateField(blank=True)

    state_req = USStateField()

    state_default = USStateField(default="CA", blank=True)

    name = models.CharField(max_length=20)

    class Meta:

        app_label = 'localflavor'

tests/regressiontests/localflavor/us/tests.py

0 → 100644
+82 −0
Original line number Diff line number Diff line 
from django.test import TestCase

from forms import USPlaceForm



class USLocalflavorTests(TestCase):

    def setUp(self):

        self.form = USPlaceForm({'state':'GA', 'state_req':'NC', 'name':'impossible'})



    def test_get_display_methods(self):

        """Test that the get_*_display() methods are added to the model instances."""

        place = self.form.save()

        self.assertEqual(place.get_state_display(), 'Georgia')

        self.assertEqual(place.get_state_req_display(), 'North Carolina')



    def test_required(self):

        """Test that required USStateFields throw appropriate errors."""

        form = USPlaceForm({'state':'GA', 'name':'Place in GA'})

        self.assertFalse(form.is_valid())

        self.assertEqual(form.errors['state_req'], [u'This field is required.'])



    def test_field_blank_option(self):

        """Test that the empty option is there."""

        state_select_html = """\

<select name="state" id="id_state">

<option value="">---------</option>

<option value="AL">Alabama</option>

<option value="AK">Alaska</option>

<option value="AS">American Samoa</option>

<option value="AZ">Arizona</option>

<option value="AR">Arkansas</option>

<option value="CA">California</option>

<option value="CO">Colorado</option>

<option value="CT">Connecticut</option>

<option value="DE">Delaware</option>

<option value="DC">District of Columbia</option>

<option value="FL">Florida</option>

<option value="GA" selected="selected">Georgia</option>

<option value="GU">Guam</option>

<option value="HI">Hawaii</option>

<option value="ID">Idaho</option>

<option value="IL">Illinois</option>

<option value="IN">Indiana</option>

<option value="IA">Iowa</option>

<option value="KS">Kansas</option>

<option value="KY">Kentucky</option>

<option value="LA">Louisiana</option>

<option value="ME">Maine</option>

<option value="MD">Maryland</option>

<option value="MA">Massachusetts</option>

<option value="MI">Michigan</option>

<option value="MN">Minnesota</option>

<option value="MS">Mississippi</option>

<option value="MO">Missouri</option>

<option value="MT">Montana</option>

<option value="NE">Nebraska</option>

<option value="NV">Nevada</option>

<option value="NH">New Hampshire</option>

<option value="NJ">New Jersey</option>

<option value="NM">New Mexico</option>

<option value="NY">New York</option>

<option value="NC">North Carolina</option>

<option value="ND">North Dakota</option>

<option value="MP">Northern Mariana Islands</option>

<option value="OH">Ohio</option>

<option value="OK">Oklahoma</option>

<option value="OR">Oregon</option>

<option value="PA">Pennsylvania</option>

<option value="PR">Puerto Rico</option>

<option value="RI">Rhode Island</option>

<option value="SC">South Carolina</option>

<option value="SD">South Dakota</option>

<option value="TN">Tennessee</option>

<option value="TX">Texas</option>

<option value="UT">Utah</option>

<option value="VT">Vermont</option>

<option value="VI">Virgin Islands</option>

<option value="VA">Virginia</option>

<option value="WA">Washington</option>

<option value="WV">West Virginia</option>

<option value="WI">Wisconsin</option>

<option value="WY">Wyoming</option>

</select>"""

        self.assertEqual(str(self.form['state']), state_select_html)