mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Modified the requests unit tests so that they aren't dependent on dictionary ordering.

Browse Source 
Backport of r13848 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-09-28 12:10:52 +00:00
parent 0f41f91bc2
commit aec5f084a3
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/regressiontests/requests/tests.py
View File

@ -10,22 +10,21 @@ from django.utils.http import cookie_date
class RequestsTests(unittest.TestCase): class RequestsTests(unittest.TestCase):
def test_httprequest(self): def test_httprequest(self):
self.assertEquals(repr(HttpRequest()), request = HttpRequest()
"<HttpRequest\n"\ self.assertEqual(request.GET.keys(), [])
"GET:{},\n"\ self.assertEqual(request.POST.keys(), [])
"POST:{},\n"\ self.assertEqual(request.COOKIES.keys(), [])
"COOKIES:{},\n"\ self.assertEqual(request.META.keys(), [])
"META:{}>"
)
def test_wsgirequest(self): def test_wsgirequest(self):
self.assertEquals(repr(WSGIRequest({'PATH_INFO': 'bogus', 'REQUEST_METHOD': 'bogus'})), request = WSGIRequest({'PATH_INFO': 'bogus', 'REQUEST_METHOD': 'bogus'})
"<WSGIRequest\n"\ self.assertEqual(request.GET.keys(), [])
"GET:<QueryDict: {}>,\n"\ self.assertEqual(request.POST.keys(), [])
"POST:<QueryDict: {}>,\n"\ self.assertEqual(request.COOKIES.keys(), [])
"COOKIES:{},\n"\ self.assertEqual(set(request.META.keys()), set(['PATH_INFO', 'REQUEST_METHOD', 'SCRIPT_NAME']))
"META:{'PATH_INFO': u'bogus', 'REQUEST_METHOD': 'bogus', 'SCRIPT_NAME': u''}>" self.assertEqual(request.META['PATH_INFO'], 'bogus')
) self.assertEqual(request.META['REQUEST_METHOD'], 'bogus')
self.assertEqual(request.META['SCRIPT_NAME'], '')
def test_modpythonrequest(self): def test_modpythonrequest(self):
class FakeModPythonRequest(ModPythonRequest): class FakeModPythonRequest(ModPythonRequest):
@ -39,23 +38,22 @@ class RequestsTests(unittest.TestCase):
req = Dummy() req = Dummy()
req.uri = 'bogus' req.uri = 'bogus'
self.assertEquals(repr(FakeModPythonRequest(req)), request = FakeModPythonRequest(req)
"<ModPythonRequest\n"\ self.assertEqual(request.path, 'bogus')
"path:bogus,\n"\ self.assertEqual(request.GET.keys(), [])
"GET:{},\n"\ self.assertEqual(request.POST.keys(), [])
"POST:{},\n"\ self.assertEqual(request.COOKIES.keys(), [])
"COOKIES:{},\n"\ self.assertEqual(request.META.keys(), [])
"META:{}>")
def test_parse_cookie(self): def test_parse_cookie(self):
self.assertEquals(parse_cookie('invalid:key=true'), {}) self.assertEqual(parse_cookie('invalid:key=true'), {})
def test_httprequest_location(self): def test_httprequest_location(self):
request = HttpRequest() request = HttpRequest()
self.assertEquals(request.build_absolute_uri(location="https://www.example.com/asdf"), self.assertEqual(request.build_absolute_uri(location="https://www.example.com/asdf"),
'https://www.example.com/asdf') 'https://www.example.com/asdf')
request.get_host = lambda: 'www.example.com' request.get_host = lambda: 'www.example.com'
request.path = '' request.path = ''
self.assertEquals(request.build_absolute_uri(location="/path/with:colons"), self.assertEqual(request.build_absolute_uri(location="/path/with:colons"),
'http://www.example.com/path/with:colons') 'http://www.example.com/path/with:colons')