Commit 366710e6 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #10183 -- Corrected the handling of unicode in assertContains and... 

Fixed #10183 -- Corrected the handling of unicode in assertContains and assertNotContains. Thanks to trbs for the patch.

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

django/test/testcases.py

+5 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ from django.http import QueryDict 
from django.test import _doctest as doctest

from django.test.client import Client

from django.utils import simplejson

from django.utils.encoding import smart_str



normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)

normalize_decimals = lambda s: re.sub(r"Decimal\('(\d+(\.\d*)?)'\)", lambda m: "Decimal(\"%s\")" % m.groups()[0], s)
@@ -330,6 +331,7 @@ class TransactionTestCase(unittest.TestCase): 
        self.assertEqual(response.status_code, status_code,

            "Couldn't retrieve page: Response code was %d (expected %d)'" %

                (response.status_code, status_code))

        text = smart_str(text, response._charset)

        real_count = response.content.count(text)

        if count is not None:

            self.assertEqual(real_count, count,
@@ -348,8 +350,9 @@ class TransactionTestCase(unittest.TestCase): 
        self.assertEqual(response.status_code, status_code,

            "Couldn't retrieve page: Response code was %d (expected %d)'" %

                (response.status_code, status_code))

        self.assertEqual(response.content.count(text), 0,

                         "Response should not contain '%s'" % text)

        text = smart_str(text, response._charset)

        self.assertEqual(response.content.count(text),

             0, "Response should not contain '%s'" % text)



    def assertFormError(self, response, form, field, errors):

        """

tests/regressiontests/test_client_regress/models.py

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

"""

Regression tests for the Test Client, especially the customized assertions.

"""
@@ -11,6 +12,13 @@ from django.core.exceptions import SuspiciousOperation 
from django.template import TemplateDoesNotExist, TemplateSyntaxError, Context



class AssertContainsTests(TestCase):

    def setUp(self):

        self.old_templates = settings.TEMPLATE_DIRS

        settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), 'templates'),)



    def tearDown(self):

        settings.TEMPLATE_DIRS = self.old_templates



    def test_contains(self):

        "Responses can be inspected for content, including counting repeated substrings"

        response = self.client.get('/test_client_regress/no_template_view/')
@@ -57,6 +65,20 @@ class AssertContainsTests(TestCase): 
        except AssertionError, e:

            self.assertEquals(str(e), "Found 0 instances of 'thrice' in response (expected 3)")



    def test_unicode_contains(self):

        "Unicode characters can be found in template context"

        #Regression test for #10183

        r = self.client.get('/test_client_regress/check_unicode/')

        self.assertContains(r, u'さかき')

        self.assertContains(r, '\xe5\xb3\xa0'.decode('utf-8'))



    def test_unicode_not_contains(self):

        "Unicode characters can be searched for, and not found in template context"

        #Regression test for #10183

        r = self.client.get('/test_client_regress/check_unicode/')

        self.assertNotContains(r, u'はたけ')

        self.assertNotContains(r, '\xe3\x81\xaf\xe3\x81\x9f\xe3\x81\x91'.decode('utf-8'))



class AssertTemplateUsedTests(TestCase):

    fixtures = ['testdata.json']

tests/regressiontests/test_client_regress/templates/unicode.html

0 → 100644
+5 −0
Original line number Diff line number Diff line 
* 峠 (とうげ tōge "mountain pass")

* 榊 (さかき sakaki "tree, genus Cleyera")

* 辻 (つじ tsuji "crossroads, street")

* 働 (どう dō, はたら hatara(ku) "work")

* 腺 (せん sen, "gland")

tests/regressiontests/test_client_regress/urls.py

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ urlpatterns = patterns('', 
    (r'^set_session/$', views.set_session_view),

    (r'^check_session/$', views.check_session_view),

    (r'^request_methods/$', views.request_methods_view),

    (r'^check_unicode/$', views.return_unicode),

)

tests/regressiontests/test_client_regress/views.py

+3 −0
Original line number Diff line number Diff line
@@ -60,3 +60,6 @@ def check_session_view(request): 
def request_methods_view(request):

    "A view that responds with the request method"

    return HttpResponse('request method: %s' % request.method)



def return_unicode(request):

    return render_to_response('unicode.html')