Minor nitpicking.

This commit is contained in:
Jannis Leidel 2010-01-15 22:30:09 +01:00
parent 407d9f26c5
commit d4891f6b34
2 changed files with 15 additions and 19 deletions

View file

@ -128,7 +128,7 @@ class PermissionDescriptor(object):
if obj:
return ContentType.objects.get_for_model(obj)
else:
raise Exception("Dude, impossible arguments to PermissionDescriptor.get_content_type!")
raise Exception("Invalid arguments given to PermissionDescriptor.get_content_type")
def __get__(self, instance, owner):
if instance is None:

View file

@ -13,15 +13,14 @@ class UserPermission(permissions.BasePermission):
authority.register(User, UserPermission)
class BehaviourTest(TestCase):
'''
"""
self.user will be given:
- django permission add_user (test_add)
- authority to delete_user which is him (test_delete)
This permissions are given in the test case and not in the fixture, for
later reference.
'''
"""
fixtures = ['tests.json',]
def setUp(self):
@ -55,22 +54,21 @@ class BehaviourTest(TestCase):
self.assertTrue(self.check.delete_user(self.user))
class AssignBehaviourTest(TestCase):
'''
"""
self.user will be given:
- permission add_user (test_add),
- permission delete_user for him (test_delete),
- all existing codenames permissions: a/b/c/d (test_all),
'''
"""
fixtures = ['tests.json',]
def setUp(self):
self.user = User.objects.get(username='jezdez')
self.check = UserPermission(self.user)
def test_add(self):
result = self.check.assign(check='add_user')
self.assertTrue(isinstance(result[0], DjangoPermission))
self.assertTrue(self.check.add_user())
@ -80,7 +78,7 @@ class AssignBehaviourTest(TestCase):
self.assertTrue(isinstance(result[0], Permission))
self.assertFalse(self.check.delete_user())
self.assertTrue(self.check.delete_user(self.user))
def test_all(self):
result = self.check.assign(content_object=self.user)
self.assertTrue(isinstance(result, list))
@ -90,21 +88,20 @@ class AssignBehaviourTest(TestCase):
self.assertTrue(self.check.change_user(self.user))
class GenericAssignBehaviourTest(TestCase):
'''
"""
self.user will be given:
- permission add (test_add),
- permission delete for him (test_delete),
'''
"""
fixtures = ['tests.json',]
def setUp(self):
self.user = User.objects.get(username='jezdez')
self.check = UserPermission(self.user)
def test_add(self):
result = self.check.assign(check='add', generic=True)
self.assertTrue(isinstance(result[0], DjangoPermission))
self.assertTrue(self.check.add_user())
@ -116,16 +113,15 @@ class GenericAssignBehaviourTest(TestCase):
self.assertTrue(self.check.delete_user(self.user))
class AssignExceptionsTest(TestCase):
'''
"""
Tests that exceptions are thrown if assign() was called with inconsistent arguments.
'''
"""
fixtures = ['tests.json',]
def setUp(self):
self.user = User.objects.get(username='jezdez')
self.check = UserPermission(self.user)
def test_unsaved_model(self):
try:
self.check.assign(content_object=User())