broke up method into different tests, fixed import style

1 files changed, 25 insertions, 23 deletions

diff --git a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py
index 6a89c54..57c9af2 100644
--- a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py
+++ b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py
@@ -7,11 +7,7 @@ import mock
 from oauthlib.common import Request
 from oauthlib.oauth2.rfc6749.grant_types import RefreshTokenGrant
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
-from oauthlib.oauth2.rfc6749.errors import (UnsupportedGrantTypeError,
-                                            InvalidClientError,
-                                            InvalidRequestError,
-                                            InvalidGrantError,
-                                            InvalidScopeError)
+from oauthlib.oauth2.rfc6749 import errors
 
 
 class RefreshTokenGrantTest(TestCase):
@@ -78,40 +74,46 @@ class RefreshTokenGrantTest(TestCase):
         self.assertEqual(token['error'], 'invalid_client')
         self.assertEqual(status_code, 401)
 
-    def test_validate_token_request(self):
-        # ensure client_authentication_required() is properly called
+    def test_authentication_required(self):
+        """
+        ensure client_authentication_required() is properly called
+        """
         self.mock_validator.authenticate_client.return_value = False
         self.mock_validator.authenticate_client_id.return_value = False
         self.request.code = 'waffles'
-        self.assertRaises(InvalidClientError, self.auth.validate_token_request,
+        self.assertRaises(errors.InvalidClientError, self.auth.validate_token_request,
                           self.request)
-        args, _ = self.mock_validator.client_authentication_required.call_args_list[0]
-        self.assertEqual(args, (self.request,))
-        # fail with wrong grant type
+        self.mock_validator.client_authentication_required.assert_called_once_with(self.request)
+
+    def test_invalid_grant_type(self):
         self.request.grant_type = 'wrong_type'
-        self.assertRaises(UnsupportedGrantTypeError,
-                          self.auth.validate_token_request, self.request)
-        # fail for not providing a refresh token
-        self.request.grant_type = 'refresh_token'
-        del self.request.refresh_token
-        self.assertRaises(InvalidRequestError,
+        self.assertRaises(errors.UnsupportedGrantTypeError,
                           self.auth.validate_token_request, self.request)
-        # fail client_id authentication
+
+    def test_authenticate_client_id(self):
         self.mock_validator.client_authentication_required.return_value = False
         self.request.refresh_token = mock.MagicMock()
         self.mock_validator.authenticate_client_id.return_value = False
-        self.assertRaises(InvalidClientError,
+        self.assertRaises(errors.InvalidClientError,
                           self.auth.validate_token_request, self.request)
+
+    def test_invalid_refresh_token(self):
         # invalid refresh token
         self.mock_validator.authenticate_client_id.return_value = True
         self.mock_validator.validate_refresh_token.return_value = False
-        self.assertRaises(InvalidGrantError,
+        self.assertRaises(errors.InvalidGrantError,
                           self.auth.validate_token_request, self.request)
-        # fail scope error
+        # no token provided
+        del self.request.refresh_token
+        self.assertRaises(errors.InvalidRequestError,
+                          self.auth.validate_token_request, self.request)
+
+    def test_invalid_scope(self):
         self.mock_validator.validate_refresh_token.return_value = True
-        self.assertRaises(InvalidScopeError,
+        self.assertRaises(errors.InvalidScopeError,
                           self.auth.validate_token_request, self.request)
-        # all ok
+
+    def test_valid_token_request(self):
         self.request.scope = 'foo bar'
         self.mock_validator.get_original_scopes = mock.Mock()
         self.mock_validator.get_original_scopes.return_value = 'foo bar baz'