X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=examples%2Ftests.py;h=e96ad90e9a41346bfa104f86bd528b7aeecc6caa;hp=70d53e3840a76f177475a994f5a785c1c740b0d6;hb=5581ef499d94127504e076f540e71ef412fd88df;hpb=9c88ec7a692ff145e42b06d332cdf614efa33c99

diff --git a/examples/tests.py b/examples/tests.py
index 70d53e3..e96ad90 100644
--- a/examples/tests.py
+++ b/examples/tests.py
@@ -62,12 +62,18 @@ class GroupTestCase(BaseTestCase):
         g.usernames = ['zoouser', 'baruser']
         g.save()
 
+        g = LdapGroup()
+        g.name = "wizgroup"
+        g.gid = 1002
+        g.usernames = ['wizuser', 'baruser']
+        g.save()
+
     def test_filter(self):
         qs = LdapGroup.objects.none()
         self.assertEquals(len(qs), 0)
 
         qs = LdapGroup.objects.all()
-        self.assertEquals(len(qs), 2)
+        self.assertEquals(len(qs), 3)
 
         qs = LdapGroup.objects.filter(name='foogroup')
         self.assertEquals(len(qs), 1)
@@ -78,6 +84,7 @@ class GroupTestCase(BaseTestCase):
         self.assertEquals(g.gid, 1000)
         self.assertEquals(g.usernames, ['foouser', 'baruser'])
 
+        # try to filter non-existent entries
         qs = LdapGroup.objects.filter(name='does_not_exist')
         self.assertEquals(len(qs), 0)
 
@@ -88,8 +95,44 @@ class GroupTestCase(BaseTestCase):
         self.assertEquals(g.gid, 1000)
         self.assertEquals(g.usernames, ['foouser', 'baruser'])
 
+        # try to get a non-existent entry
         self.assertRaises(LdapGroup.DoesNotExist, LdapGroup.objects.get, name='does_not_exist')
 
+    def test_order_by(self):
+        # ascending name 
+        qs = LdapGroup.objects.order_by('name')
+        self.assertEquals(len(qs), 3)
+        self.assertEquals(qs[0].name, 'bargroup')
+        self.assertEquals(qs[1].name, 'foogroup')
+        self.assertEquals(qs[2].name, 'wizgroup')
+
+        # descending name 
+        qs = LdapGroup.objects.order_by('-name')
+        self.assertEquals(len(qs), 3)
+        self.assertEquals(qs[0].name, 'wizgroup')
+        self.assertEquals(qs[1].name, 'foogroup')
+        self.assertEquals(qs[2].name, 'bargroup')
+
+        # ascending gid
+        qs = LdapGroup.objects.order_by('gid')
+        self.assertEquals(len(qs), 3)
+        self.assertEquals(qs[0].gid, 1000)
+        self.assertEquals(qs[1].gid, 1001)
+        self.assertEquals(qs[2].gid, 1002)
+
+        # descending gid
+        qs = LdapGroup.objects.order_by('-gid')
+        self.assertEquals(len(qs), 3)
+        self.assertEquals(qs[0].gid, 1002)
+        self.assertEquals(qs[1].gid, 1001)
+        self.assertEquals(qs[2].gid, 1000)
+
+    def test_bulk_delete(self):
+        LdapGroup.objects.all().delete()
+
+        qs = LdapGroup.objects.all()
+        self.assertEquals(len(qs), 0)
+
     def test_update(self):
         g = LdapGroup.objects.get(name='foogroup')
 
@@ -107,7 +150,7 @@ class GroupTestCase(BaseTestCase):
         g.delete()
 
         qs = LdapGroup.objects.all()
-        self.assertEquals(len(qs), 1)
+        self.assertEquals(len(qs), 2)
 
 class UserTestCase(BaseTestCase):
     def setUp(self):
@@ -217,6 +260,10 @@ class AdminTestCase(BaseTestCase):
         self.assertContains(response, "foogroup")
         self.assertContains(response, "1000")
 
+    def test_group_delete(self):
+        response = self.client.post('/admin/examples/ldapgroup/foogroup/delete/', {'yes': 'post'})
+        self.assertRedirects(response, '/admin/examples/ldapgroup/')
+
     def test_group_search(self):
         response = self.client.get('/admin/examples/ldapgroup/?q=foo')
         self.assertContains(response, "Ldap groups")
@@ -245,3 +292,8 @@ class AdminTestCase(BaseTestCase):
         response = self.client.get('/admin/examples/ldapuser/foouser/')
         self.assertContains(response, "foouser")
         self.assertContains(response, "2000")
+
+    def test_user_delete(self):
+        response = self.client.post('/admin/examples/ldapuser/foouser/delete/', {'yes': 'post'})
+        self.assertRedirects(response, '/admin/examples/ldapuser/')
+