Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #10183 -- Corrected the handling of unicode in assertCo…

…ntains and assertNotContains. Thanks to trbs for the patch.

Merge of r10414 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3931829c6e2251f992b24701b893d20720f0384e 1 parent bb55853
@freakboy3742 freakboy3742 authored
View
7 django/test/testcases.py
@@ -12,6 +12,7 @@
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)
@@ -264,6 +265,7 @@ def assertContains(self, response, text, count=None, status_code=200):
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,
@@ -282,8 +284,9 @@ def assertNotContains(self, response, text, status_code=200):
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):
"""
View
22 tests/regressiontests/test_client_regress/models.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
"""
Regression tests for the Test Client, especially the customized assertions.
"""
@@ -10,6 +11,13 @@
from django.template import TemplateDoesNotExist, TemplateSyntaxError
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/')
@@ -56,6 +64,20 @@ def test_contains(self):
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']
View
5 tests/regressiontests/test_client_regress/templates/unicode.html
@@ -0,0 +1,5 @@
+* 峠 (とうげ tōge "mountain pass")
+* 榊 (さかき sakaki "tree, genus Cleyera")
+* 辻 (つじ tsuji "crossroads, street")
+* 働 (どう dō, はたら hatara(ku) "work")
+* 腺 (せん sen, "gland")
View
1  tests/regressiontests/test_client_regress/urls.py
@@ -9,4 +9,5 @@
(r'^login_protected_redirect_view/$', views.login_protected_redirect_view),
(r'^set_session/$', views.set_session_view),
(r'^check_session/$', views.check_session_view),
+ (r'^check_unicode/$', views.return_unicode),
)
View
4 tests/regressiontests/test_client_regress/views.py
@@ -1,6 +1,7 @@
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse, HttpResponseRedirect
from django.core.exceptions import SuspiciousOperation
+from django.shortcuts import render_to_response
def no_template_view(request):
"A simple view that expects a GET request, and returns a rendered template"
@@ -43,3 +44,6 @@ def set_session_view(request):
def check_session_view(request):
"A view that reads a session variable"
return HttpResponse(request.session.get('session_var', 'NO'))
+
+def return_unicode(request):
+ return render_to_response('unicode.html')
Please sign in to comment.
Something went wrong with that request. Please try again.