Revert "Add support to OAuth1 for including body in the base string based on"

This reverts commit ae386c2154f65054427f33419bf17b6feda563d5.

Will be replaced in favour of passing a 'content_type' parameter.

1 files changed, 11 insertions, 30 deletions

diff --git a/tests/oauth1/rfc5849/test_server.py b/tests/oauth1/rfc5849/test_server.py
index 3143e7a..47dc426 100644
--- a/tests/oauth1/rfc5849/test_server.py
+++ b/tests/oauth1/rfc5849/test_server.py
@@ -31,21 +31,22 @@ class ServerTests(TestCase):
         def check_timestamp_and_nonce(self, timestamp, nonce):
             return True
 
-    def setUp(self):
-        self.server = self.TestServer()
-        self.client = Client(self.CLIENT_KEY,
+    def test_basic_server_request(self):
+        c = Client(self.CLIENT_KEY,
             client_secret=self.CLIENT_SECRET,
             resource_owner_key=self.RESOURCE_OWNER_KEY,
             resource_owner_secret=self.RESOURCE_OWNER_SECRET,
         )
 
-    def test_basic_request(self):
-        uri, body, headers = self.client.sign(u'http://server.example.com:80/init')
+        uri, body, headers = c.sign(u'http://server.example.com:80/init')
+
         headers = dict([(str(k), str(v)) for k, v in headers.iteritems()])
-        self.assertTrue(self.server.check_request_signature(uri, body=body,
+
+        s = self.TestServer()
+        self.assertTrue(s.check_request_signature(uri, body=body,
             headers=headers))
 
-    def test_callback_request(self):
+    def test_server_callback_request(self):
         c = Client(self.CLIENT_KEY,
             client_secret=self.CLIENT_SECRET,
             resource_owner_key=self.RESOURCE_OWNER_KEY,
@@ -54,30 +55,10 @@ class ServerTests(TestCase):
         )
 
         uri, body, headers = c.sign(u'http://server.example.com:80/init')
-        headers = dict([(str(k), str(v)) for k, v in headers.iteritems()])
-        self.assertTrue(self.server.check_request_signature(uri, body=body,
-            headers=headers))
-
-    def test_multipart_body_request(self):
-        headers = {
-            u'Content-Type': u'multipart/form-data; boundary=BoUnDaRyStRiNg'
-        }
-        body = u"--BoUnDaRyStRiNg--\n\n"
-
-        uri, body, headers = self.client.sign(u'http://server.example.com:80/resource',
-            body=body, headers=headers)
 
         headers = dict([(str(k), str(v)) for k, v in headers.iteritems()])
-        self.assertTrue(self.server.check_request_signature(uri, body=body,
-            headers=headers))
-
-    def test_urlencoded_body_request(self):
-        headers = { u'Content-Type': u'application/x-www-form-urlencoded' }
-        body = u"key=value"
 
-        uri, body, headers = self.client.sign(u'http://server.example.com:80/resource',
-            body=body, headers=headers)
-
-        headers = dict([(str(k), str(v)) for k, v in headers.iteritems()])
-        self.assertTrue(self.server.check_request_signature(uri, body=body,
+        s = self.TestServer()
+        self.assertTrue(s.check_request_signature(uri, body=body,
             headers=headers))
+