method overloading tests passing

2 files changed, 28 insertions, 35 deletions

diff --git a/djangorestframework/tests/content.py b/djangorestframework/tests/content.py
index 05679b2f..240601e0 100644
--- a/djangorestframework/tests/content.py
+++ b/djangorestframework/tests/content.py
@@ -1,12 +1,11 @@
-# TODO: refactor these tests
+# TODO: finish off the refactoring
 from django.test import TestCase
 from djangorestframework.compat import RequestFactory
 from djangorestframework.request import RequestMixin
 from djangorestframework.parsers import FormParser, MultipartParser, PlainTextParser
-#from djangorestframework.content import ContentMixin, StandardContentMixin, OverloadedContentMixin
-#
-#
-class TestContentMixins(TestCase):
+
+
+class TestContentParsing(TestCase):
     def setUp(self):
         self.req = RequestFactory()
 
@@ -125,4 +124,3 @@ class TestContentMixins(TestCase):
 #        content = 'qwerty'
 #        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 f19bb3e5..8e694017 100644
--- a/djangorestframework/tests/methods.py
+++ b/djangorestframework/tests/methods.py
@@ -1,12 +1,13 @@
 # TODO: Refactor these tests
-#from django.test import TestCase
-#from djangorestframework.compat import RequestFactory
+from django.test import TestCase
+from djangorestframework.compat import RequestFactory
+from djangorestframework.request import RequestMixin
 #from djangorestframework.methods import MethodMixin, StandardMethodMixin, OverloadedPOSTMethodMixin
 #
 #
-#class TestMethodMixins(TestCase): 
-#    def setUp(self):
-#        self.req = RequestFactory()
+class TestMethodOverloading(TestCase): 
+    def setUp(self):
+        self.req = RequestFactory()
 #
 #    # Interface tests
 #
@@ -27,27 +28,21 @@
 #
 #    # Behavioural tests
 #
-#    def test_standard_behaviour_determines_GET(self):
-#        """GET requests identified as GET method with StandardMethodMixin"""
-#        request = self.req.get('/')
-#        self.assertEqual(StandardMethodMixin().determine_method(request), 'GET')
-#
-#    def test_standard_behaviour_determines_POST(self):
-#        """POST requests identified as POST method with StandardMethodMixin"""
-#        request = self.req.post('/')
-#        self.assertEqual(StandardMethodMixin().determine_method(request), 'POST')
-#    
-#    def test_overloaded_POST_behaviour_determines_GET(self):
-#        """GET requests identified as GET method with OverloadedPOSTMethodMixin"""
-#        request = self.req.get('/')
-#        self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'GET')
-#
-#    def test_overloaded_POST_behaviour_determines_POST(self):
-#        """POST requests identified as POST method with OverloadedPOSTMethodMixin"""
-#        request = self.req.post('/')
-#        self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'POST')
-#    
-#    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.METHOD_PARAM: 'DELETE'})
-#        self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'DELETE')
+    def test_standard_behaviour_determines_GET(self):
+        """GET requests identified"""
+        view = RequestMixin()
+        view.request = self.req.get('/')
+        self.assertEqual(view.method, 'GET')
+
+    def test_standard_behaviour_determines_POST(self):
+        """POST requests identified"""
+        view = RequestMixin()
+        view.request = self.req.post('/')
+        self.assertEqual(view.method, 'POST')
+    
+    def test_overloaded_POST_behaviour_determines_overloaded_method(self):
+        """POST requests can be overloaded to another method by setting a reserved form field"""
+        view = RequestMixin()
+        view.request = self.req.post('/', {view.METHOD_PARAM: 'DELETE'})
+        view.perform_form_overloading()
+        self.assertEqual(view.method, 'DELETE')