diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/oauth1/rfc5849/test_parameters.py | 14 | ||||
| -rw-r--r-- | tests/oauth1/rfc5849/test_signatures.py | 32 |
2 files changed, 25 insertions, 21 deletions
diff --git a/tests/oauth1/rfc5849/test_parameters.py b/tests/oauth1/rfc5849/test_parameters.py index 9765cab..4388123 100644 --- a/tests/oauth1/rfc5849/test_parameters.py +++ b/tests/oauth1/rfc5849/test_parameters.py @@ -7,6 +7,10 @@ from ...unittest import TestCase class ParameterTests(TestCase): + data_params = [ + (u'data_param_foo', u'foo'), + (u'data_param_1', u'1'), + ] auth_only_params = [ (u'oauth_consumer_key', u"9djdj82h48djs9d2"), (u'oauth_token', u"kkk9d7dh3k39sjv7"), @@ -15,9 +19,7 @@ class ParameterTests(TestCase): (u'oauth_nonce', u"7d8f3e4a"), (u'oauth_signature', u"bYT5CMsGcbgUdFHObYMEfcx6bsw=") ] - auth_and_data = list(auth_only_params) - auth_and_data.append((u'data_param_foo', u'foo')) - auth_and_data.append((u'data_param_1', u'1')) + auth_and_data = auth_only_params + data_params realm = u'testrealm' norealm_authorization_header = u' '.join(( u'OAuth', @@ -72,11 +74,11 @@ class ParameterTests(TestCase): {u'Authorization': self.withrealm_authorization_header}) def test_prepare_form_encoded_body(self): - request = Request(u'http://www.google.com/') + request = Request(u'http://www.google.com/', body=self.data_params) request.oauth_params = self.auth_only_params - form_encoded_body = 'data_param_foo=foo&data_param_1=1&oauth_consumer_key=9djdj82h48djs9d2&oauth_token=kkk9d7dh3k39sjv7&oauth_signature_method=HMAC-SHA1&oauth_timestamp=137131201&oauth_nonce=7d8f3e4a&oauth_signature=bYT5CMsGcbgUdFHObYMEfcx6bsw%3D' + form_encoded_body = u'data_param_foo=foo&data_param_1=1&oauth_consumer_key=9djdj82h48djs9d2&oauth_token=kkk9d7dh3k39sjv7&oauth_signature_method=HMAC-SHA1&oauth_timestamp=137131201&oauth_nonce=7d8f3e4a&oauth_signature=bYT5CMsGcbgUdFHObYMEfcx6bsw%3D' self.assertEqual( - urlencode(prepare_form_encoded_body(self.auth_and_data, existing_body)), + urlencode(prepare_form_encoded_body(request).body), form_encoded_body) def test_prepare_request_uri_query(self): diff --git a/tests/oauth1/rfc5849/test_signatures.py b/tests/oauth1/rfc5849/test_signatures.py index fc81ea7..8fa237b 100644 --- a/tests/oauth1/rfc5849/test_signatures.py +++ b/tests/oauth1/rfc5849/test_signatures.py @@ -3,6 +3,7 @@ from __future__ import absolute_import import urllib from oauthlib.oauth1.rfc5849.signature import * +from oauthlib.common import Request from ...unittest import TestCase @@ -85,16 +86,14 @@ class SignatureTests(TestCase): """ We check against parameters multiple times in case things change after more parameters are added. """ - # check against empty parameters - # check against empty parameters - # check against empty parameters - self.assertEquals(collect_parameters(), []) + + uri = u'http://example.com/request?%s' % self.uri_query # Check against uri_query # Check against uri_query # Check against uri_query - - parameters = collect_parameters(uri_query=self.uri_query) + request = Request(uri) + parameters = collect_parameters(request) self.assertEquals(len(parameters), 6) self.assertEquals(parameters[0], ('b5', '=%3D')) @@ -108,9 +107,10 @@ class SignatureTests(TestCase): # check against authorization header as well # check against authorization header as well - parameters = collect_parameters(uri_query=self.uri_query, headers={ + request = Request(uri, headers={ 'Authorization': self.authorization_header, }) + parameters = collect_parameters(request) # Redo the checks against all the parameters. Duplicated code but better safety self.assertEquals(len(parameters), 11) @@ -129,10 +129,10 @@ class SignatureTests(TestCase): # Add in the body. # TODO - add more valid content for the body. Daniel Greenfeld 2012/03/12 # Redo again the checks against all the parameters. Duplicated code but better safety - parameters = collect_parameters(uri_query=self.uri_query, - body=self.body, headers={ - 'Authorization': self.authorization_header, - }) + request = Request(uri, body=self.body, headers={ + 'Authorization': self.authorization_header, + }) + parameters = collect_parameters(request) self.assertEquals(len(parameters), 12) self.assertEquals(parameters[0], ('b5', '=%3D')) self.assertEquals(parameters[1], ('a3', 'a')) @@ -150,11 +150,13 @@ class SignatureTests(TestCase): def test_normalize_parameters(self): """ We copy some of the variables from the test method above.""" + uri = u'http://example.com/request?%s' % self.uri_query + # Create the parameters - parameters = collect_parameters(uri_query=unicode(self.uri_query), - body=unicode(self.body), headers={ - u'Authorization': unicode(self.authorization_header), - }) + request = Request(uri, body=unicode(self.body), headers={ + u'Authorization': unicode(self.authorization_header), + }) + parameters = collect_parameters(request) normalized = normalize_parameters(parameters) # check the parameters type |