aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests/content.py
diff options
context:
space:
mode:
Diffstat (limited to 'djangorestframework/tests/content.py')
-rw-r--r--djangorestframework/tests/content.py198
1 files changed, 77 insertions, 121 deletions
diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py
index c5eae2f9..ee3597a4 100644
--- a/djangorestframework/tests/content.py
+++ b/djangorestframework/tests/content.py
@@ -1,122 +1,78 @@
-# TODO: refactor these tests
-#from django.test import TestCase
-#from djangorestframework.compat import RequestFactory
-#from djangorestframework.content import ContentMixin, StandardContentMixin, OverloadedContentMixin
-#
-#
-#class TestContentMixins(TestCase):
-# def setUp(self):
-# self.req = RequestFactory()
-#
-# # Interface tests
-#
-# def test_content_mixin_interface(self):
-# """Ensure the ContentMixin interface is as expected."""
-# self.assertRaises(NotImplementedError, ContentMixin().determine_content, None)
-#
-# def test_standard_content_mixin_interface(self):
-# """Ensure the OverloadedContentMixin interface is as expected."""
-# self.assertTrue(issubclass(StandardContentMixin, ContentMixin))
-# getattr(StandardContentMixin, 'determine_content')
-#
-# def test_overloaded_content_mixin_interface(self):
-# """Ensure the OverloadedContentMixin interface is as expected."""
-# self.assertTrue(issubclass(OverloadedContentMixin, ContentMixin))
-# getattr(OverloadedContentMixin, 'CONTENT_PARAM')
-# getattr(OverloadedContentMixin, 'CONTENTTYPE_PARAM')
-# getattr(OverloadedContentMixin, 'determine_content')
-#
-#
-# # Common functionality to test with both StandardContentMixin and OverloadedContentMixin
-#
-# def ensure_determines_no_content_GET(self, mixin):
-# """Ensure determine_content(request) returns None for GET request with no content."""
-# request = self.req.get('/')
-# self.assertEqual(mixin.determine_content(request), None)
-#
-# def ensure_determines_form_content_POST(self, mixin):
-# """Ensure determine_content(request) returns content for POST request with content."""
-# form_data = {'qwerty': 'uiop'}
-# request = self.req.post('/', data=form_data)
-# self.assertEqual(mixin.determine_content(request), (request.META['CONTENT_TYPE'], request.raw_post_data))
-#
-# def ensure_determines_non_form_content_POST(self, mixin):
-# """Ensure determine_content(request) returns (content type, content) for POST request with content."""
-# content = 'qwerty'
-# content_type = 'text/plain'
-# request = self.req.post('/', content, content_type=content_type)
-# self.assertEqual(mixin.determine_content(request), (content_type, content))
-#
-# def ensure_determines_form_content_PUT(self, mixin):
-# """Ensure determine_content(request) returns content for PUT request with content."""
-# form_data = {'qwerty': 'uiop'}
-# request = self.req.put('/', data=form_data)
-# self.assertEqual(mixin.determine_content(request), (request.META['CONTENT_TYPE'], request.raw_post_data))
-#
-# def ensure_determines_non_form_content_PUT(self, mixin):
-# """Ensure determine_content(request) returns (content type, content) for PUT request with content."""
-# content = 'qwerty'
-# content_type = 'text/plain'
-# request = self.req.put('/', content, content_type=content_type)
-# self.assertEqual(mixin.determine_content(request), (content_type, content))
-#
-# # StandardContentMixin behavioural tests
-#
-# def test_standard_behaviour_determines_no_content_GET(self):
-# """Ensure StandardContentMixin.determine_content(request) returns None for GET request with no content."""
-# self.ensure_determines_no_content_GET(StandardContentMixin())
-#
-# def test_standard_behaviour_determines_form_content_POST(self):
-# """Ensure StandardContentMixin.determine_content(request) returns content for POST request with content."""
-# self.ensure_determines_form_content_POST(StandardContentMixin())
-#
-# def test_standard_behaviour_determines_non_form_content_POST(self):
-# """Ensure StandardContentMixin.determine_content(request) returns (content type, content) for POST request with content."""
-# self.ensure_determines_non_form_content_POST(StandardContentMixin())
-#
-# def test_standard_behaviour_determines_form_content_PUT(self):
-# """Ensure StandardContentMixin.determine_content(request) returns content for PUT request with content."""
-# self.ensure_determines_form_content_PUT(StandardContentMixin())
-#
-# def test_standard_behaviour_determines_non_form_content_PUT(self):
-# """Ensure StandardContentMixin.determine_content(request) returns (content type, content) for PUT request with content."""
-# self.ensure_determines_non_form_content_PUT(StandardContentMixin())
-#
-# # OverloadedContentMixin behavioural tests
-#
-# def test_overloaded_behaviour_determines_no_content_GET(self):
-# """Ensure StandardContentMixin.determine_content(request) returns None for GET request with no content."""
-# self.ensure_determines_no_content_GET(OverloadedContentMixin())
-#
-# def test_overloaded_behaviour_determines_form_content_POST(self):
-# """Ensure StandardContentMixin.determine_content(request) returns content for POST request with content."""
-# self.ensure_determines_form_content_POST(OverloadedContentMixin())
-#
-# def test_overloaded_behaviour_determines_non_form_content_POST(self):
-# """Ensure StandardContentMixin.determine_content(request) returns (content type, content) for POST request with content."""
-# self.ensure_determines_non_form_content_POST(OverloadedContentMixin())
-#
-# def test_overloaded_behaviour_determines_form_content_PUT(self):
-# """Ensure StandardContentMixin.determine_content(request) returns content for PUT request with content."""
-# self.ensure_determines_form_content_PUT(OverloadedContentMixin())
-#
-# def test_overloaded_behaviour_determines_non_form_content_PUT(self):
-# """Ensure StandardContentMixin.determine_content(request) returns (content type, content) for PUT request with content."""
-# self.ensure_determines_non_form_content_PUT(OverloadedContentMixin())
-#
-# def test_overloaded_behaviour_allows_content_tunnelling(self):
-# """Ensure determine_content(request) returns (content type, content) for overloaded POST request"""
-# content = 'qwerty'
-# content_type = 'text/plain'
-# form_data = {OverloadedContentMixin.CONTENT_PARAM: content,
-# OverloadedContentMixin.CONTENTTYPE_PARAM: content_type}
-# request = self.req.post('/', form_data)
-# self.assertEqual(OverloadedContentMixin().determine_content(request), (content_type, content))
-# self.assertEqual(request.META['CONTENT_TYPE'], content_type)
-#
-# def test_overloaded_behaviour_allows_content_tunnelling_content_type_not_set(self):
-# """Ensure determine_content(request) returns (None, content) for overloaded POST request with content type not set"""
-# content = 'qwerty'
-# request = self.req.post('/', {OverloadedContentMixin.CONTENT_PARAM: content})
-# self.assertEqual(OverloadedContentMixin().determine_content(request), (None, content))
+"""
+Tests for content parsing, and form-overloaded content parsing.
+"""
+from django.test import TestCase
+from djangorestframework.compat import RequestFactory
+from djangorestframework.mixins import RequestMixin
+from djangorestframework.parsers import FormParser, MultiPartParser, PlainTextParser
+
+class TestContentParsing(TestCase):
+ def setUp(self):
+ self.req = RequestFactory()
+
+ def ensure_determines_no_content_GET(self, view):
+ """Ensure view.DATA returns None for GET request with no content."""
+ view.request = self.req.get('/')
+ self.assertEqual(view.DATA, None)
+
+ def ensure_determines_form_content_POST(self, view):
+ """Ensure view.DATA returns content for POST request with form content."""
+ form_data = {'qwerty': 'uiop'}
+ view.parsers = (FormParser, MultiPartParser)
+ view.request = self.req.post('/', data=form_data)
+ self.assertEqual(view.DATA.items(), form_data.items())
+
+ def ensure_determines_non_form_content_POST(self, view):
+ """Ensure view.RAW_CONTENT returns content for POST request with non-form content."""
+ content = 'qwerty'
+ content_type = 'text/plain'
+ view.parsers = (PlainTextParser,)
+ view.request = self.req.post('/', content, content_type=content_type)
+ self.assertEqual(view.DATA, content)
+
+ def ensure_determines_form_content_PUT(self, view):
+ """Ensure view.RAW_CONTENT returns content for PUT request with form content."""
+ form_data = {'qwerty': 'uiop'}
+ view.parsers = (FormParser, MultiPartParser)
+ view.request = self.req.put('/', data=form_data)
+ self.assertEqual(view.DATA.items(), form_data.items())
+
+ def ensure_determines_non_form_content_PUT(self, view):
+ """Ensure view.RAW_CONTENT returns content for PUT request with non-form content."""
+ content = 'qwerty'
+ content_type = 'text/plain'
+ view.parsers = (PlainTextParser,)
+ view.request = self.req.post('/', content, content_type=content_type)
+ self.assertEqual(view.DATA, content)
+
+ def test_standard_behaviour_determines_no_content_GET(self):
+ """Ensure view.DATA returns None for GET request with no content."""
+ self.ensure_determines_no_content_GET(RequestMixin())
+
+ def test_standard_behaviour_determines_form_content_POST(self):
+ """Ensure view.DATA returns content for POST request with form content."""
+ self.ensure_determines_form_content_POST(RequestMixin())
+
+ def test_standard_behaviour_determines_non_form_content_POST(self):
+ """Ensure view.DATA returns content for POST request with non-form content."""
+ self.ensure_determines_non_form_content_POST(RequestMixin())
+
+ def test_standard_behaviour_determines_form_content_PUT(self):
+ """Ensure view.DATA returns content for PUT request with form content."""
+ self.ensure_determines_form_content_PUT(RequestMixin())
+
+ def test_standard_behaviour_determines_non_form_content_PUT(self):
+ """Ensure view.DATA returns content for PUT request with non-form content."""
+ self.ensure_determines_non_form_content_PUT(RequestMixin())
+
+ def test_overloaded_behaviour_allows_content_tunnelling(self):
+ """Ensure request.DATA returns content for overloaded POST request"""
+ content = 'qwerty'
+ content_type = 'text/plain'
+ view = RequestMixin()
+ form_data = {view._CONTENT_PARAM: content,
+ view._CONTENTTYPE_PARAM: content_type}
+ view.request = self.req.post('/', form_data)
+ view.parsers = (PlainTextParser,)
+ self.assertEqual(view.DATA, content)