Skip to content

Commit

Permalink
fix test cases for realms
Browse files Browse the repository at this point in the history
  • Loading branch information
lepture committed Jul 3, 2013
1 parent 73ed8f4 commit 0b06627
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions tests/oauth1/rfc5849/endpoints/test_request_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ def setUp(self):
self.validator.get_client_secret.return_value = 'bar'
self.validator.get_default_realms.return_value = ['foo']
self.validator.timestamp_lifetime = 600
self.validator.check_realm.return_value = True
self.validator.check_realms.return_value = True
self.validator.validate_client_key.return_value = True
self.validator.validate_requested_realm.return_value = True
self.validator.validate_requested_realms.return_value = True
self.validator.validate_redirect_uri.return_value = True
self.validator.validate_timestamp_and_nonce.return_value = True
self.validator.dummy_client = 'dummy'
Expand All @@ -39,8 +39,8 @@ def test_check_redirect_uri(self):
self.assertEqual(s, 400)
self.assertIn('invalid_request', b)

def test_check_realm(self):
self.validator.check_realm.return_value = False
def test_check_realms(self):
self.validator.check_realms.return_value = False
u, h, b, s = self.endpoint.create_request_token_response(
self.uri, headers=self.headers)
self.assertEqual(s, 400)
Expand All @@ -52,8 +52,8 @@ def test_validate_client_key(self):
self.uri, headers=self.headers)
self.assertEqual(s, 401)

def test_validate_realm(self):
self.validator.validate_requested_realm.return_value = False
def test_validate_realms(self):
self.validator.validate_requested_realms.return_value = False
u, h, b, s = self.endpoint.create_request_token_response(
self.uri, headers=self.headers)
self.assertEqual(s, 401)
Expand Down
6 changes: 3 additions & 3 deletions tests/oauth1/rfc5849/endpoints/test_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def setUp(self):
self.validator.validate_client_key.return_value = True
self.validator.validate_access_token.return_value = True
self.validator.validate_timestamp_and_nonce.return_value = True
self.validator.validate_realm.return_value = True
self.validator.validate_realms.return_value = True
self.validator.dummy_client = 'dummy'
self.validator.dummy_secret = 'dummy'
self.validator.dummy_access_token = 'dummy'
Expand Down Expand Up @@ -57,8 +57,8 @@ def test_validate_access_token(self):
self.uri, headers=self.headers)
self.assertFalse(v)

def test_validate_realm(self):
self.validator.validate_realm.return_value = False
def test_validate_realms(self):
self.validator.validate_realms.return_value = False
v, r = self.endpoint.validate_protected_resource_request(
self.uri, headers=self.headers)
self.assertFalse(v)
Expand Down
10 changes: 5 additions & 5 deletions tests/oauth1/rfc5849/test_request_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ def test_not_implemented(self):
None, None, None, None)
self.assertRaises(NotImplementedError, v.validate_redirect_uri,
None, None, None)
self.assertRaises(NotImplementedError, v.validate_realm,
self.assertRaises(NotImplementedError, v.validate_realms,
None, None, None, None, None)
self.assertRaises(NotImplementedError, v.validate_requested_realm,
self.assertRaises(NotImplementedError, v.validate_requested_realms,
None, None, None)
self.assertRaises(NotImplementedError, v.validate_verifier,
None, None, None, None)
Expand All @@ -56,14 +56,14 @@ def test_check_length(self):
for valid in ('itsjustaboutlongenough',):
self.assertTrue(method(valid))

def test_check_realm(self):
def test_check_realms(self):
v = RequestValidator()
self.assertFalse(v.check_realm(['foo']))
self.assertFalse(v.check_realms(['foo']))

class FooRealmValidator(RequestValidator):
@property
def realms(self):
return ['foo']

v = FooRealmValidator()
self.assertTrue(v.check_realm(['foo']))
self.assertTrue(v.check_realms(['foo']))

0 comments on commit 0b06627

Please sign in to comment.