aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--djangorestframework/tests/parsers.py10
-rw-r--r--djangorestframework/tests/renderers.py4
-rw-r--r--djangorestframework/tests/request.py164
-rw-r--r--djangorestframework/tests/response.py44
-rw-r--r--djangorestframework/tests/validators.py15
5 files changed, 121 insertions, 116 deletions
diff --git a/djangorestframework/tests/parsers.py b/djangorestframework/tests/parsers.py
index 0f36cece..c733d9d0 100644
--- a/djangorestframework/tests/parsers.py
+++ b/djangorestframework/tests/parsers.py
@@ -150,7 +150,7 @@ class TestFormParser(TestCase):
def test_parse(self):
""" Make sure the `QueryDict` works OK """
- parser = FormParser(None)
+ parser = FormParser()
stream = StringIO(self.string)
(data, files) = parser.parse(stream, {}, [])
@@ -202,11 +202,11 @@ class TestXMLParser(TestCase):
}
def test_parse(self):
- parser = XMLParser(None)
- (data, files) = parser.parse(self._input)
+ parser = XMLParser()
+ (data, files) = parser.parse(self._input, {}, [])
self.assertEqual(data, self._data)
def test_complex_data_parse(self):
- parser = XMLParser(None)
- (data, files) = parser.parse(self._complex_data_input)
+ parser = XMLParser()
+ (data, files) = parser.parse(self._complex_data_input, {}, [])
self.assertEqual(data, self._complex_data)
diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py
index 8eb78b74..fce4af64 100644
--- a/djangorestframework/tests/renderers.py
+++ b/djangorestframework/tests/renderers.py
@@ -381,8 +381,8 @@ class XMLRendererTestCase(TestCase):
renderer = XMLRenderer(None)
content = StringIO(renderer.render(self._complex_data, 'application/xml'))
- parser = XMLParser(None)
- complex_data_out, dummy = parser.parse(content)
+ parser = XMLParser()
+ complex_data_out, dummy = parser.parse(content, {}, [])
error_msg = "complex data differs!IN:\n %s \n\n OUT:\n %s" % (repr(self._complex_data), repr(complex_data_out))
self.assertEqual(self._complex_data, complex_data_out, error_msg)
diff --git a/djangorestframework/tests/request.py b/djangorestframework/tests/request.py
index 7e289536..85b2f418 100644
--- a/djangorestframework/tests/request.py
+++ b/djangorestframework/tests/request.py
@@ -125,88 +125,88 @@ class TestContentParsing(TestCase):
request = factory.post('/', data, parsers=parsers)
self.assertEqual(request.DATA, content)
- def test_accessing_post_after_data_form(self):
- """
- Ensures request.POST can be accessed after request.DATA in
- form request.
- """
- data = {'qwerty': 'uiop'}
- request = factory.post('/', data=data)
- self.assertEqual(request.DATA.items(), data.items())
- self.assertEqual(request.POST.items(), data.items())
-
- def test_accessing_post_after_data_for_json(self):
- """
- Ensures request.POST can be accessed after request.DATA in
- json request.
- """
- data = {'qwerty': 'uiop'}
- content = json.dumps(data)
- content_type = 'application/json'
- parsers = (JSONParser, )
-
- request = factory.post('/', content, content_type=content_type,
- parsers=parsers)
- self.assertEqual(request.DATA.items(), data.items())
- self.assertEqual(request.POST.items(), [])
-
- def test_accessing_post_after_data_for_overloaded_json(self):
- """
- Ensures request.POST can be accessed after request.DATA in overloaded
- json request.
- """
- data = {'qwerty': 'uiop'}
- content = json.dumps(data)
- content_type = 'application/json'
- parsers = (JSONParser, )
- form_data = {Request._CONTENT_PARAM: content,
- Request._CONTENTTYPE_PARAM: content_type}
-
- request = factory.post('/', form_data, parsers=parsers)
- self.assertEqual(request.DATA.items(), data.items())
- self.assertEqual(request.POST.items(), form_data.items())
-
- def test_accessing_data_after_post_form(self):
- """
- Ensures request.DATA can be accessed after request.POST in
- form request.
- """
- data = {'qwerty': 'uiop'}
- parsers = (FormParser, MultiPartParser)
- request = factory.post('/', data, parsers=parsers)
-
- self.assertEqual(request.POST.items(), data.items())
- self.assertEqual(request.DATA.items(), data.items())
-
- def test_accessing_data_after_post_for_json(self):
- """
- Ensures request.DATA can be accessed after request.POST in
- json request.
- """
- data = {'qwerty': 'uiop'}
- content = json.dumps(data)
- content_type = 'application/json'
- parsers = (JSONParser, )
- request = factory.post('/', content, content_type=content_type,
- parsers=parsers)
- self.assertEqual(request.POST.items(), [])
- self.assertEqual(request.DATA.items(), data.items())
-
- def test_accessing_data_after_post_for_overloaded_json(self):
- """
- Ensures request.DATA can be accessed after request.POST in overloaded
- json request
- """
- data = {'qwerty': 'uiop'}
- content = json.dumps(data)
- content_type = 'application/json'
- parsers = (JSONParser, )
- form_data = {Request._CONTENT_PARAM: content,
- Request._CONTENTTYPE_PARAM: content_type}
-
- request = factory.post('/', form_data, parsers=parsers)
- self.assertEqual(request.POST.items(), form_data.items())
- self.assertEqual(request.DATA.items(), data.items())
+ # def test_accessing_post_after_data_form(self):
+ # """
+ # Ensures request.POST can be accessed after request.DATA in
+ # form request.
+ # """
+ # data = {'qwerty': 'uiop'}
+ # request = factory.post('/', data=data)
+ # self.assertEqual(request.DATA.items(), data.items())
+ # self.assertEqual(request.POST.items(), data.items())
+
+ # def test_accessing_post_after_data_for_json(self):
+ # """
+ # Ensures request.POST can be accessed after request.DATA in
+ # json request.
+ # """
+ # data = {'qwerty': 'uiop'}
+ # content = json.dumps(data)
+ # content_type = 'application/json'
+ # parsers = (JSONParser, )
+
+ # request = factory.post('/', content, content_type=content_type,
+ # parsers=parsers)
+ # self.assertEqual(request.DATA.items(), data.items())
+ # self.assertEqual(request.POST.items(), [])
+
+ # def test_accessing_post_after_data_for_overloaded_json(self):
+ # """
+ # Ensures request.POST can be accessed after request.DATA in overloaded
+ # json request.
+ # """
+ # data = {'qwerty': 'uiop'}
+ # content = json.dumps(data)
+ # content_type = 'application/json'
+ # parsers = (JSONParser, )
+ # form_data = {Request._CONTENT_PARAM: content,
+ # Request._CONTENTTYPE_PARAM: content_type}
+
+ # request = factory.post('/', form_data, parsers=parsers)
+ # self.assertEqual(request.DATA.items(), data.items())
+ # self.assertEqual(request.POST.items(), form_data.items())
+
+ # def test_accessing_data_after_post_form(self):
+ # """
+ # Ensures request.DATA can be accessed after request.POST in
+ # form request.
+ # """
+ # data = {'qwerty': 'uiop'}
+ # parsers = (FormParser, MultiPartParser)
+ # request = factory.post('/', data, parsers=parsers)
+
+ # self.assertEqual(request.POST.items(), data.items())
+ # self.assertEqual(request.DATA.items(), data.items())
+
+ # def test_accessing_data_after_post_for_json(self):
+ # """
+ # Ensures request.DATA can be accessed after request.POST in
+ # json request.
+ # """
+ # data = {'qwerty': 'uiop'}
+ # content = json.dumps(data)
+ # content_type = 'application/json'
+ # parsers = (JSONParser, )
+ # request = factory.post('/', content, content_type=content_type,
+ # parsers=parsers)
+ # self.assertEqual(request.POST.items(), [])
+ # self.assertEqual(request.DATA.items(), data.items())
+
+ # def test_accessing_data_after_post_for_overloaded_json(self):
+ # """
+ # Ensures request.DATA can be accessed after request.POST in overloaded
+ # json request
+ # """
+ # data = {'qwerty': 'uiop'}
+ # content = json.dumps(data)
+ # content_type = 'application/json'
+ # parsers = (JSONParser, )
+ # form_data = {Request._CONTENT_PARAM: content,
+ # Request._CONTENTTYPE_PARAM: content_type}
+
+ # request = factory.post('/', form_data, parsers=parsers)
+ # self.assertEqual(request.POST.items(), form_data.items())
+ # self.assertEqual(request.DATA.items(), data.items())
class MockView(View):
diff --git a/djangorestframework/tests/response.py b/djangorestframework/tests/response.py
index 4cd000bd..fd83da29 100644
--- a/djangorestframework/tests/response.py
+++ b/djangorestframework/tests/response.py
@@ -4,7 +4,7 @@ import unittest
from django.conf.urls.defaults import patterns, url, include
from django.test import TestCase
-from djangorestframework.response import Response, ImmediateResponse
+from djangorestframework.response import Response, NotAcceptable
from djangorestframework.views import View
from djangorestframework.compat import RequestFactory
from djangorestframework import status
@@ -16,6 +16,14 @@ from djangorestframework.renderers import (
)
+class MockPickleRenderer(BaseRenderer):
+ media_type = 'application/pickle'
+
+
+class MockJsonRenderer(BaseRenderer):
+ media_type = 'application/json'
+
+
class TestResponseDetermineRenderer(TestCase):
def get_response(self, url='', accept_list=[], renderers=[]):
@@ -25,11 +33,6 @@ class TestResponseDetermineRenderer(TestCase):
request = RequestFactory().get(url, **kwargs)
return Response(request=request, renderers=renderers)
- def get_renderer_mock(self, media_type):
- return type('RendererMock', (BaseRenderer,), {
- 'media_type': media_type,
- })()
-
def test_determine_accept_list_accept_header(self):
"""
Test that determine_accept_list takes the Accept header.
@@ -59,46 +62,43 @@ class TestResponseDetermineRenderer(TestCase):
Test that right renderer is chosen, in the order of Accept list.
"""
accept_list = ['application/pickle', 'application/json']
- prenderer = self.get_renderer_mock('application/pickle')
- jrenderer = self.get_renderer_mock('application/json')
-
- response = self.get_response(accept_list=accept_list, renderers=(prenderer, jrenderer))
+ renderers = (MockPickleRenderer, MockJsonRenderer)
+ response = self.get_response(accept_list=accept_list, renderers=renderers)
renderer, media_type = response._determine_renderer()
self.assertEqual(media_type, 'application/pickle')
- self.assertTrue(renderer, prenderer)
+ self.assertTrue(isinstance(renderer, MockPickleRenderer))
- response = self.get_response(accept_list=accept_list, renderers=(jrenderer,))
+ renderers = (MockJsonRenderer, )
+ response = self.get_response(accept_list=accept_list, renderers=renderers)
renderer, media_type = response._determine_renderer()
self.assertEqual(media_type, 'application/json')
- self.assertTrue(renderer, jrenderer)
+ self.assertTrue(isinstance(renderer, MockJsonRenderer))
def test_determine_renderer_default(self):
"""
Test determine renderer when Accept was not specified.
"""
- prenderer = self.get_renderer_mock('application/pickle')
-
- response = self.get_response(accept_list=None, renderers=(prenderer,))
+ renderers = (MockPickleRenderer, )
+ response = self.get_response(accept_list=None, renderers=renderers)
renderer, media_type = response._determine_renderer()
self.assertEqual(media_type, '*/*')
- self.assertTrue(renderer, prenderer)
+ self.assertTrue(isinstance(renderer, MockPickleRenderer))
def test_determine_renderer_no_renderer(self):
"""
Test determine renderer when no renderer can satisfy the Accept list.
"""
accept_list = ['application/json']
- prenderer = self.get_renderer_mock('application/pickle')
-
- response = self.get_response(accept_list=accept_list, renderers=(prenderer,))
- self.assertRaises(ImmediateResponse, response._determine_renderer)
+ renderers = (MockPickleRenderer, )
+ response = self.get_response(accept_list=accept_list, renderers=renderers)
+ self.assertRaises(NotAcceptable, response._determine_renderer)
class TestResponseRenderContent(TestCase):
def get_response(self, url='', accept_list=[], content=None):
request = RequestFactory().get(url, HTTP_ACCEPT=','.join(accept_list))
- return Response(request=request, content=content, renderers=[r() for r in DEFAULT_RENDERERS])
+ return Response(request=request, content=content, renderers=DEFAULT_RENDERERS)
def test_render(self):
"""
diff --git a/djangorestframework/tests/validators.py b/djangorestframework/tests/validators.py
index 771b3125..bf2bf8b7 100644
--- a/djangorestframework/tests/validators.py
+++ b/djangorestframework/tests/validators.py
@@ -81,7 +81,8 @@ class TestNonFieldErrors(TestCase):
content = {'field1': 'example1', 'field2': 'example2'}
try:
MockResource(view).validate_request(content, None)
- except ImmediateResponse, response:
+ except ImmediateResponse, exc:
+ response = exc.response
self.assertEqual(response.raw_content, {'errors': [MockForm.ERROR_TEXT]})
else:
self.fail('ImmediateResponse was not raised')
@@ -154,7 +155,8 @@ class TestFormValidation(TestCase):
content = {}
try:
validator.validate_request(content, None)
- except ImmediateResponse, response:
+ except ImmediateResponse, exc:
+ response = exc.response
self.assertEqual(response.raw_content, {'field_errors': {'qwerty': ['This field is required.']}})
else:
self.fail('ResourceException was not raised')
@@ -164,7 +166,8 @@ class TestFormValidation(TestCase):
content = {'qwerty': ''}
try:
validator.validate_request(content, None)
- except ImmediateResponse, response:
+ except ImmediateResponse, exc:
+ response = exc.response
self.assertEqual(response.raw_content, {'field_errors': {'qwerty': ['This field is required.']}})
else:
self.fail('ResourceException was not raised')
@@ -174,7 +177,8 @@ class TestFormValidation(TestCase):
content = {'qwerty': 'uiop', 'extra': 'extra'}
try:
validator.validate_request(content, None)
- except ImmediateResponse, response:
+ except ImmediateResponse, exc:
+ response = exc.response
self.assertEqual(response.raw_content, {'field_errors': {'extra': ['This field does not exist.']}})
else:
self.fail('ResourceException was not raised')
@@ -184,7 +188,8 @@ class TestFormValidation(TestCase):
content = {'qwerty': '', 'extra': 'extra'}
try:
validator.validate_request(content, None)
- except ImmediateResponse, response:
+ except ImmediateResponse, exc:
+ response = exc.response
self.assertEqual(response.raw_content, {'field_errors': {'qwerty': ['This field is required.'],
'extra': ['This field does not exist.']}})
else:
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 13:26:06 +0000