Commit 8ce46375 authored by Preston Timmons's avatar Preston Timmons Committed by Carl Meyer
Browse files

Move last remaining tests out of models.py files; prep for test discovery.

parent f2d3c4b0

tests/conditional_processing/models.py

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

from __future__ import unicode_literals



from datetime import datetime



from django.test import TestCase





FULL_RESPONSE = 'Test conditional get response'

LAST_MODIFIED = datetime(2007, 10, 21, 23, 21, 47)

LAST_MODIFIED_STR = 'Sun, 21 Oct 2007 23:21:47 GMT'

LAST_MODIFIED_NEWER_STR = 'Mon, 18 Oct 2010 16:56:23 GMT'

LAST_MODIFIED_INVALID_STR = 'Mon, 32 Oct 2010 16:56:23 GMT'

EXPIRED_LAST_MODIFIED_STR = 'Sat, 20 Oct 2007 23:21:47 GMT'

ETAG = 'b4246ffc4f62314ca13147c9d4f76974'

EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6'



class ConditionalGet(TestCase):

    urls = 'conditional_processing.urls'



    def assertFullResponse(self, response, check_last_modified=True, check_etag=True):

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.content, FULL_RESPONSE.encode())

        if check_last_modified:

            self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR)

        if check_etag:

            self.assertEqual(response['ETag'], '"%s"' % ETAG)



    def assertNotModified(self, response):

        self.assertEqual(response.status_code, 304)

        self.assertEqual(response.content, b'')



    def testWithoutConditions(self):

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



    def testIfModifiedSince(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        response = self.client.get('/condition/')

        self.assertNotModified(response)

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_NEWER_STR

        response = self.client.get('/condition/')

        self.assertNotModified(response)

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_INVALID_STR

        response = self.client.get('/condition/')

        self.assertFullResponse(response)

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



    def testIfNoneMatch(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/')

        self.assertNotModified(response)

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



        # Several etags in If-None-Match is a bit exotic but why not?

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s", "%s"' % (ETAG, EXPIRED_ETAG)

        response = self.client.get('/condition/')

        self.assertNotModified(response)



    def testIfMatch(self):

        self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % ETAG

        response = self.client.put('/condition/etag/')

        self.assertEqual(response.status_code, 200)

        self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.put('/condition/etag/')

        self.assertEqual(response.status_code, 412)



    def testBothHeaders(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/')

        self.assertNotModified(response)



        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



    def testSingleCondition1(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        response = self.client.get('/condition/last_modified/')

        self.assertNotModified(response)

        response = self.client.get('/condition/etag/')

        self.assertFullResponse(response, check_last_modified=False)



    def testSingleCondition2(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/etag/')

        self.assertNotModified(response)

        response = self.client.get('/condition/last_modified/')

        self.assertFullResponse(response, check_etag=False)



    def testSingleCondition3(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR

        response = self.client.get('/condition/last_modified/')

        self.assertFullResponse(response, check_etag=False)



    def testSingleCondition4(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.get('/condition/etag/')

        self.assertFullResponse(response, check_last_modified=False)



    def testSingleCondition5(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        response = self.client.get('/condition/last_modified2/')

        self.assertNotModified(response)

        response = self.client.get('/condition/etag2/')

        self.assertFullResponse(response, check_last_modified=False)



    def testSingleCondition6(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/etag2/')

        self.assertNotModified(response)

        response = self.client.get('/condition/last_modified2/')

        self.assertFullResponse(response, check_etag=False)



    def testInvalidETag(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = r'"\"'

        response = self.client.get('/condition/etag/')

        self.assertFullResponse(response, check_last_modified=False)

tests/conditional_processing/tests.py

0 → 100644
+129 −0
Original line number Diff line number Diff line 
# -*- coding:utf-8 -*-

from __future__ import unicode_literals



from datetime import datetime



from django.test import TestCase





FULL_RESPONSE = 'Test conditional get response'

LAST_MODIFIED = datetime(2007, 10, 21, 23, 21, 47)

LAST_MODIFIED_STR = 'Sun, 21 Oct 2007 23:21:47 GMT'

LAST_MODIFIED_NEWER_STR = 'Mon, 18 Oct 2010 16:56:23 GMT'

LAST_MODIFIED_INVALID_STR = 'Mon, 32 Oct 2010 16:56:23 GMT'

EXPIRED_LAST_MODIFIED_STR = 'Sat, 20 Oct 2007 23:21:47 GMT'

ETAG = 'b4246ffc4f62314ca13147c9d4f76974'

EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6'



class ConditionalGet(TestCase):

    urls = 'conditional_processing.urls'



    def assertFullResponse(self, response, check_last_modified=True, check_etag=True):

        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.content, FULL_RESPONSE.encode())

        if check_last_modified:

            self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR)

        if check_etag:

            self.assertEqual(response['ETag'], '"%s"' % ETAG)



    def assertNotModified(self, response):

        self.assertEqual(response.status_code, 304)

        self.assertEqual(response.content, b'')



    def testWithoutConditions(self):

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



    def testIfModifiedSince(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        response = self.client.get('/condition/')

        self.assertNotModified(response)

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_NEWER_STR

        response = self.client.get('/condition/')

        self.assertNotModified(response)

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_INVALID_STR

        response = self.client.get('/condition/')

        self.assertFullResponse(response)

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



    def testIfNoneMatch(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/')

        self.assertNotModified(response)

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



        # Several etags in If-None-Match is a bit exotic but why not?

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s", "%s"' % (ETAG, EXPIRED_ETAG)

        response = self.client.get('/condition/')

        self.assertNotModified(response)



    def testIfMatch(self):

        self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % ETAG

        response = self.client.put('/condition/etag/')

        self.assertEqual(response.status_code, 200)

        self.client.defaults['HTTP_IF_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.put('/condition/etag/')

        self.assertEqual(response.status_code, 412)



    def testBothHeaders(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/')

        self.assertNotModified(response)



        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.get('/condition/')

        self.assertFullResponse(response)



    def testSingleCondition1(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        response = self.client.get('/condition/last_modified/')

        self.assertNotModified(response)

        response = self.client.get('/condition/etag/')

        self.assertFullResponse(response, check_last_modified=False)



    def testSingleCondition2(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/etag/')

        self.assertNotModified(response)

        response = self.client.get('/condition/last_modified/')

        self.assertFullResponse(response, check_etag=False)



    def testSingleCondition3(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = EXPIRED_LAST_MODIFIED_STR

        response = self.client.get('/condition/last_modified/')

        self.assertFullResponse(response, check_etag=False)



    def testSingleCondition4(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % EXPIRED_ETAG

        response = self.client.get('/condition/etag/')

        self.assertFullResponse(response, check_last_modified=False)



    def testSingleCondition5(self):

        self.client.defaults['HTTP_IF_MODIFIED_SINCE'] = LAST_MODIFIED_STR

        response = self.client.get('/condition/last_modified2/')

        self.assertNotModified(response)

        response = self.client.get('/condition/etag2/')

        self.assertFullResponse(response, check_last_modified=False)



    def testSingleCondition6(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = '"%s"' % ETAG

        response = self.client.get('/condition/etag2/')

        self.assertNotModified(response)

        response = self.client.get('/condition/last_modified2/')

        self.assertFullResponse(response, check_etag=False)



    def testInvalidETag(self):

        self.client.defaults['HTTP_IF_NONE_MATCH'] = r'"\"'

        response = self.client.get('/condition/etag/')

        self.assertFullResponse(response, check_last_modified=False)

tests/conditional_processing/views.py

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from __future__ import absolute_import 
from django.views.decorators.http import condition, etag, last_modified

from django.http import HttpResponse



from .models import FULL_RESPONSE, LAST_MODIFIED, ETAG

from .tests import FULL_RESPONSE, LAST_MODIFIED, ETAG





def index(request):

tests/forms_tests/tests/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ from .input_formats import (LocalizedTimeTests, CustomTimeInputFormatsTests, 
    SimpleDateFormatTests, LocalizedDateTimeTests,

    CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)

from .media import FormsMediaTestCase, StaticFormsMediaTestCase

from .models import (TestTicket12510, ModelFormCallableModelDefault,

from .tests import (TestTicket12510, ModelFormCallableModelDefault,

    FormsModelTestCase, RelatedModelFormTests)

from .regressions import FormsRegressionsTestCase

from .util import FormsUtilTestCase

tests/forms_tests/tests/models.py

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

from __future__ import absolute_import, unicode_literals



import datetime



from django.core.files.uploadedfile import SimpleUploadedFile

from django.db import models

from django.forms import Form, ModelForm, FileField, ModelChoiceField

from django.forms.models import ModelFormMetaclass

from django.test import TestCase

from django.utils import six



from ..models import (ChoiceOptionModel, ChoiceFieldModel, FileModel, Group,

    BoundaryModel, Defaults, OptionalMultiChoiceModel)





class ChoiceFieldForm(ModelForm):

    class Meta:

        model = ChoiceFieldModel





class OptionalMultiChoiceModelForm(ModelForm):

    class Meta:

        model = OptionalMultiChoiceModel





class FileForm(Form):

    file1 = FileField()





class TestTicket12510(TestCase):

    ''' It is not necessary to generate choices for ModelChoiceField (regression test for #12510). '''

    def setUp(self):

        self.groups = [Group.objects.create(name=name) for name in 'abc']



    def test_choices_not_fetched_when_not_rendering(self):

        # only one query is required to pull the model from DB

        with self.assertNumQueries(1):

            field = ModelChoiceField(Group.objects.order_by('-name'))

            self.assertEqual('a', field.clean(self.groups[0].pk).name)





class TestTicket14567(TestCase):

    """

    Check that the return values of ModelMultipleChoiceFields are QuerySets

    """

    def test_empty_queryset_return(self):

        "If a model's ManyToManyField has blank=True and is saved with no data, a queryset is returned."

        form = OptionalMultiChoiceModelForm({'multi_choice_optional': '', 'multi_choice': ['1']})

        self.assertTrue(form.is_valid())

        # Check that the empty value is a QuerySet

        self.assertTrue(isinstance(form.cleaned_data['multi_choice_optional'], models.query.QuerySet))

        # While we're at it, test whether a QuerySet is returned if there *is* a value.

        self.assertTrue(isinstance(form.cleaned_data['multi_choice'], models.query.QuerySet))





class ModelFormCallableModelDefault(TestCase):

    def test_no_empty_option(self):

        "If a model's ForeignKey has blank=False and a default, no empty option is created (Refs #10792)."

        option = ChoiceOptionModel.objects.create(name='default')



        choices = list(ChoiceFieldForm().fields['choice'].choices)

        self.assertEqual(len(choices), 1)

        self.assertEqual(choices[0], (option.pk, six.text_type(option)))



    def test_callable_initial_value(self):

        "The initial value for a callable default returning a queryset is the pk (refs #13769)"

        obj1 = ChoiceOptionModel.objects.create(id=1, name='default')

        obj2 = ChoiceOptionModel.objects.create(id=2, name='option 2')

        obj3 = ChoiceOptionModel.objects.create(id=3, name='option 3')

        self.assertHTMLEqual(ChoiceFieldForm().as_p(), """<p><label for="id_choice">Choice:</label> <select name="choice" id="id_choice">

<option value="1" selected="selected">ChoiceOption 1</option>

<option value="2">ChoiceOption 2</option>

<option value="3">ChoiceOption 3</option>

</select><input type="hidden" name="initial-choice" value="1" id="initial-id_choice" /></p>

<p><label for="id_choice_int">Choice int:</label> <select name="choice_int" id="id_choice_int">

<option value="1" selected="selected">ChoiceOption 1</option>

<option value="2">ChoiceOption 2</option>

<option value="3">ChoiceOption 3</option>

</select><input type="hidden" name="initial-choice_int" value="1" id="initial-id_choice_int" /></p>

<p><label for="id_multi_choice">Multi choice:</label> <select multiple="multiple" name="multi_choice" id="id_multi_choice">

<option value="1" selected="selected">ChoiceOption 1</option>

<option value="2">ChoiceOption 2</option>

<option value="3">ChoiceOption 3</option>

</select><input type="hidden" name="initial-multi_choice" value="1" id="initial-id_multi_choice_0" /> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>

<p><label for="id_multi_choice_int">Multi choice int:</label> <select multiple="multiple" name="multi_choice_int" id="id_multi_choice_int">

<option value="1" selected="selected">ChoiceOption 1</option>

<option value="2">ChoiceOption 2</option>

<option value="3">ChoiceOption 3</option>

</select><input type="hidden" name="initial-multi_choice_int" value="1" id="initial-id_multi_choice_int_0" /> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>""")



    def test_initial_instance_value(self):

        "Initial instances for model fields may also be instances (refs #7287)"

        obj1 = ChoiceOptionModel.objects.create(id=1, name='default')

        obj2 = ChoiceOptionModel.objects.create(id=2, name='option 2')

        obj3 = ChoiceOptionModel.objects.create(id=3, name='option 3')

        self.assertHTMLEqual(ChoiceFieldForm(initial={

                'choice': obj2,

                'choice_int': obj2,

                'multi_choice': [obj2,obj3],

                'multi_choice_int': ChoiceOptionModel.objects.exclude(name="default"),

            }).as_p(), """<p><label for="id_choice">Choice:</label> <select name="choice" id="id_choice">

<option value="1">ChoiceOption 1</option>

<option value="2" selected="selected">ChoiceOption 2</option>

<option value="3">ChoiceOption 3</option>

</select><input type="hidden" name="initial-choice" value="2" id="initial-id_choice" /></p>

<p><label for="id_choice_int">Choice int:</label> <select name="choice_int" id="id_choice_int">

<option value="1">ChoiceOption 1</option>

<option value="2" selected="selected">ChoiceOption 2</option>

<option value="3">ChoiceOption 3</option>

</select><input type="hidden" name="initial-choice_int" value="2" id="initial-id_choice_int" /></p>

<p><label for="id_multi_choice">Multi choice:</label> <select multiple="multiple" name="multi_choice" id="id_multi_choice">

<option value="1">ChoiceOption 1</option>

<option value="2" selected="selected">ChoiceOption 2</option>

<option value="3" selected="selected">ChoiceOption 3</option>

</select><input type="hidden" name="initial-multi_choice" value="2" id="initial-id_multi_choice_0" />

<input type="hidden" name="initial-multi_choice" value="3" id="initial-id_multi_choice_1" /> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>

<p><label for="id_multi_choice_int">Multi choice int:</label> <select multiple="multiple" name="multi_choice_int" id="id_multi_choice_int">

<option value="1">ChoiceOption 1</option>

<option value="2" selected="selected">ChoiceOption 2</option>

<option value="3" selected="selected">ChoiceOption 3</option>

</select><input type="hidden" name="initial-multi_choice_int" value="2" id="initial-id_multi_choice_int_0" />

<input type="hidden" name="initial-multi_choice_int" value="3" id="initial-id_multi_choice_int_1" /> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>""")





class FormsModelTestCase(TestCase):

    def test_unicode_filename(self):

        # FileModel with unicode filename and data #########################

        f = FileForm(data={}, files={'file1': SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह'.encode('utf-8'))}, auto_id=False)

        self.assertTrue(f.is_valid())

        self.assertTrue('file1' in f.cleaned_data)

        m = FileModel.objects.create(file=f.cleaned_data['file1'])

        self.assertEqual(m.file.name, 'tests/\u6211\u96bb\u6c23\u588a\u8239\u88dd\u6eff\u6652\u9c54.txt')

        m.delete()



    def test_boundary_conditions(self):

        # Boundary conditions on a PostitiveIntegerField #########################

        class BoundaryForm(ModelForm):

            class Meta:

                model = BoundaryModel



        f = BoundaryForm({'positive_integer': 100})

        self.assertTrue(f.is_valid())

        f = BoundaryForm({'positive_integer': 0})

        self.assertTrue(f.is_valid())

        f = BoundaryForm({'positive_integer': -100})

        self.assertFalse(f.is_valid())



    def test_formfield_initial(self):

        # Formfield initial values ########

        # If the model has default values for some fields, they are used as the formfield

        # initial values.

        class DefaultsForm(ModelForm):

            class Meta:

                model = Defaults



        self.assertEqual(DefaultsForm().fields['name'].initial, 'class default value')

        self.assertEqual(DefaultsForm().fields['def_date'].initial, datetime.date(1980, 1, 1))

        self.assertEqual(DefaultsForm().fields['value'].initial, 42)

        r1 = DefaultsForm()['callable_default'].as_widget()

        r2 = DefaultsForm()['callable_default'].as_widget()

        self.assertNotEqual(r1, r2)



        # In a ModelForm that is passed an instance, the initial values come from the

        # instance's values, not the model's defaults.

        foo_instance = Defaults(name='instance value', def_date=datetime.date(1969, 4, 4), value=12)

        instance_form = DefaultsForm(instance=foo_instance)

        self.assertEqual(instance_form.initial['name'], 'instance value')

        self.assertEqual(instance_form.initial['def_date'], datetime.date(1969, 4, 4))

        self.assertEqual(instance_form.initial['value'], 12)



        from django.forms import CharField



        class ExcludingForm(ModelForm):

            name = CharField(max_length=255)



            class Meta:

                model = Defaults

                exclude = ['name', 'callable_default']



        f = ExcludingForm({'name': 'Hello', 'value': 99, 'def_date': datetime.date(1999, 3, 2)})

        self.assertTrue(f.is_valid())

        self.assertEqual(f.cleaned_data['name'], 'Hello')

        obj = f.save()

        self.assertEqual(obj.name, 'class default value')

        self.assertEqual(obj.value, 99)

        self.assertEqual(obj.def_date, datetime.date(1999, 3, 2))



class RelatedModelFormTests(TestCase):

    def test_invalid_loading_order(self):

        """

        Test for issue 10405

        """

        class A(models.Model):

            ref = models.ForeignKey("B")



        class Meta:

            model=A



        self.assertRaises(ValueError, ModelFormMetaclass, str('Form'), (ModelForm,), {'Meta': Meta})



        class B(models.Model):

            pass



    def test_valid_loading_order(self):

        """

        Test for issue 10405

        """

        class A(models.Model):

            ref = models.ForeignKey("B")



        class B(models.Model):

            pass



        class Meta:

            model=A



        self.assertTrue(issubclass(ModelFormMetaclass(str('Form'), (ModelForm,), {'Meta': Meta}), ModelForm))