Fix issue #62

1 files changed, 28 insertions, 28 deletions

diff --git a/tests/oauth2/draft25/test_client.py b/tests/oauth2/draft25/test_client.py
index 63e2f92..5741a78 100644
--- a/tests/oauth2/draft25/test_client.py
+++ b/tests/oauth2/draft25/test_client.py
@@ -37,8 +37,8 @@ class ClientTest(TestCase):
         client = Client(self.client_id, access_token=self.access_token)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers)
-        self.assertEqual(uri, self.uri)
-        self.assertEqual(body, self.body)
+        self.assertURLEqual(uri, self.uri)
+        self.assertFormBodyEqual(body, self.body)
         self.assertEqual(headers, self.bearer_header)
 
         # Setting default placements of tokens
@@ -46,46 +46,46 @@ class ClientTest(TestCase):
                 default_token_placement=AUTH_HEADER)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers)
-        self.assertEqual(uri, self.uri)
-        self.assertEqual(body, self.body)
+        self.assertURLEqual(uri, self.uri)
+        self.assertFormBodyEqual(body, self.body)
         self.assertEqual(headers, self.bearer_header)
 
         client = Client(self.client_id, access_token=self.access_token,
                 default_token_placement=URI_QUERY)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers)
-        self.assertEqual(uri, self.bearer_query)
-        self.assertEqual(body, self.body)
+        self.assertURLEqual(uri, self.bearer_query)
+        self.assertFormBodyEqual(body, self.body)
         self.assertEqual(headers, self.headers)
 
         client = Client(self.client_id, access_token=self.access_token,
                 default_token_placement=BODY)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers)
-        self.assertEqual(uri, self.uri)
-        self.assertEqual(body, self.bearer_body)
+        self.assertURLEqual(uri, self.uri)
+        self.assertFormBodyEqual(body, self.bearer_body)
         self.assertEqual(headers, self.headers)
 
         # Asking for specific placement in the add_token method
         client = Client(self.client_id, access_token=self.access_token)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers, token_placement=AUTH_HEADER)
-        self.assertEqual(uri, self.uri)
-        self.assertEqual(body, self.body)
+        self.assertURLEqual(uri, self.uri)
+        self.assertFormBodyEqual(body, self.body)
         self.assertEqual(headers, self.bearer_header)
 
         client = Client(self.client_id, access_token=self.access_token)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers, token_placement=URI_QUERY)
-        self.assertEqual(uri, self.bearer_query)
-        self.assertEqual(body, self.body)
+        self.assertURLEqual(uri, self.bearer_query)
+        self.assertFormBodyEqual(body, self.body)
         self.assertEqual(headers, self.headers)
 
         client = Client(self.client_id, access_token=self.access_token)
         uri, headers, body = client.add_token(self.uri, body=self.body,
                 headers=self.headers, token_placement=BODY)
-        self.assertEqual(uri, self.uri)
-        self.assertEqual(body, self.bearer_body)
+        self.assertURLEqual(uri, self.uri)
+        self.assertFormBodyEqual(body, self.bearer_body)
         self.assertEqual(headers, self.headers)
 
         # Invalid token placement
@@ -146,19 +146,19 @@ class WebApplicationClientTest(TestCase):
 
         # Basic, no extra arguments
         uri = client.prepare_request_uri(self.uri)
-        self.assertEqual(uri, self.uri_id)
+        self.assertURLEqual(uri, self.uri_id)
 
         # With redirection uri
         uri = client.prepare_request_uri(self.uri, redirect_uri=self.redirect_uri)
-        self.assertEqual(uri, self.uri_redirect)
+        self.assertURLEqual(uri, self.uri_redirect)
 
         # With scope
         uri = client.prepare_request_uri(self.uri, scope=self.scope)
-        self.assertEqual(uri, self.uri_scope)
+        self.assertURLEqual(uri, self.uri_scope)
 
         # With state
         uri = client.prepare_request_uri(self.uri, state=self.state)
-        self.assertEqual(uri, self.uri_state)
+        self.assertURLEqual(uri, self.uri_state)
 
         # With extra parameters through kwargs, checking using len since order
         # of dict items is undefined
@@ -170,15 +170,15 @@ class WebApplicationClientTest(TestCase):
 
         # Basic, no extra arguments
         body = client.prepare_request_body(body=self.body)
-        self.assertEqual(body, self.body_code)
+        self.assertFormBodyEqual(body, self.body_code)
 
         rclient = WebApplicationClient(self.client_id)
         body = rclient.prepare_request_body(code=self.code, body=self.body)
-        self.assertEqual(body, self.body_code)
+        self.assertFormBodyEqual(body, self.body_code)
 
         # With redirection uri
         body = client.prepare_request_body(body=self.body, redirect_uri=self.redirect_uri)
-        self.assertEqual(body, self.body_redirect)
+        self.assertFormBodyEqual(body, self.body_redirect)
 
         # With extra parameters, checked using length since order of
         # dict items is undefined
@@ -248,19 +248,19 @@ class UserAgentClientTest(TestCase):
 
         # Basic, no extra arguments
         uri = client.prepare_request_uri(self.uri)
-        self.assertEqual(uri, self.uri_id)
+        self.assertURLEqual(uri, self.uri_id)
 
         # With redirection uri
         uri = client.prepare_request_uri(self.uri, redirect_uri=self.redirect_uri)
-        self.assertEqual(uri, self.uri_redirect)
+        self.assertURLEqual(uri, self.uri_redirect)
 
         # With scope
         uri = client.prepare_request_uri(self.uri, scope=self.scope)
-        self.assertEqual(uri, self.uri_scope)
+        self.assertURLEqual(uri, self.uri_scope)
 
         # With state
         uri = client.prepare_request_uri(self.uri, state=self.state)
-        self.assertEqual(uri, self.uri_state)
+        self.assertURLEqual(uri, self.uri_state)
 
         # With extra parameters through kwargs, checking using len since order
         # of dict items is undefined
@@ -318,7 +318,7 @@ class PasswordCredentialsClientTest(TestCase):
 
         # Basic, no extra arguments
         body = client.prepare_request_body(body=self.body)
-        self.assertEqual(body, self.body_up)
+        self.assertFormBodyEqual(body, self.body_up)
 
         # With extra parameters, checked using length since order of
         # dict items is undefined
@@ -372,11 +372,11 @@ class ClientCredentialsClientTest(TestCase):
 
         # Basic, no extra arguments
         body = client.prepare_request_body(body=self.body)
-        self.assertEqual(body, self.body_up)
+        self.assertFormBodyEqual(body, self.body_up)
 
         rclient = ClientCredentialsClient(self.client_id)
         body = rclient.prepare_request_body(body=self.body)
-        self.assertEqual(body, self.body_up)
+        self.assertFormBodyEqual(body, self.body_up)
 
         # With extra parameters, checked using length since order of
         # dict items is undefined