Refactor a bunch of stuff into mixins, more tests

2 files changed, 7 insertions, 7 deletions

diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py
index 43769123..e3f2c41f 100644
--- a/djangorestframework/tests/content.py
+++ b/djangorestframework/tests/content.py
@@ -21,8 +21,8 @@ class TestContentMixins(TestCase):
     def test_overloaded_content_mixin_interface(self):
         """Ensure the OverloadedContentMixin interface is as expected."""
         self.assertTrue(issubclass(OverloadedContentMixin, ContentMixin))
-        getattr(OverloadedContentMixin, 'FORM_PARAM_CONTENT')
-        getattr(OverloadedContentMixin, 'FORM_PARAM_CONTENTTYPE')
+        getattr(OverloadedContentMixin, 'CONTENT_PARAM')
+        getattr(OverloadedContentMixin, 'CONTENTTYPE_PARAM')
         getattr(OverloadedContentMixin, 'determine_content')
 
   
@@ -107,14 +107,14 @@ class TestContentMixins(TestCase):
         """Ensure determine_content(request) returns (content type, content) for overloaded POST request"""
         content = 'qwerty'
         content_type = 'text/plain'
-        form_data = {OverloadedContentMixin.FORM_PARAM_CONTENT: content,
-                     OverloadedContentMixin.FORM_PARAM_CONTENTTYPE: content_type}
+        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))
  
     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.FORM_PARAM_CONTENT: content})
+        request = self.req.post('/', {OverloadedContentMixin.CONTENT_PARAM: content})
         self.assertEqual(OverloadedContentMixin().determine_content(request), (None, content))
 
diff --git a/djangorestframework/tests/methods.py b/djangorestframework/tests/methods.py
index e580ba02..833457f5 100644
--- a/djangorestframework/tests/methods.py
+++ b/djangorestframework/tests/methods.py
@@ -21,7 +21,7 @@ class TestMethodMixins(TestCase):
     def test_overloaded_method_mixin_interface(self):
         """Ensure the OverloadedPOSTMethodMixin interface is as expected."""
         self.assertTrue(issubclass(OverloadedPOSTMethodMixin, MethodMixin))
-        getattr(OverloadedPOSTMethodMixin, 'FORM_PARAM_METHOD')
+        getattr(OverloadedPOSTMethodMixin, 'METHOD_PARAM')
         getattr(OverloadedPOSTMethodMixin, 'determine_method')
 
     # Behavioural tests
@@ -48,5 +48,5 @@ class TestMethodMixins(TestCase):
     
     def test_overloaded_POST_behaviour_determines_overloaded_method(self):
         """POST requests can be overloaded to another method by setting a reserved form field with OverloadedPOSTMethodMixin"""
-        request = self.req.post('/', {OverloadedPOSTMethodMixin.FORM_PARAM_METHOD: 'DELETE'})
+        request = self.req.post('/', {OverloadedPOSTMethodMixin.METHOD_PARAM: 'DELETE'})
         self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'DELETE')