X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=examples%2Ftests.py;h=51c4183e9ef12b9f1771275c3121681cf38c4607;hp=1ed9e0426bdf2938c56744ec82085c214ccb0787;hb=baba34a193fe7d304d86003b19f36ed638c7ec80;hpb=312b199746611fa2a25b7ff57c399459f17e38e7

diff --git a/examples/tests.py b/examples/tests.py
index 1ed9e04..51c4183 100644
--- a/examples/tests.py
+++ b/examples/tests.py
@@ -1,21 +1,35 @@
 # -*- coding: utf-8 -*-
 # 
 # django-ldapdb
-# Copyright (C) 2009-2010 Bolloré telecom
+# Copyright (c) 2009-2010, Bolloré telecom
+# All rights reserved.
+# 
 # See AUTHORS file for a full list of contributors.
 # 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+# 
+#     1. Redistributions of source code must retain the above copyright notice, 
+#        this list of conditions and the following disclaimer.
+#     
+#     2. Redistributions in binary form must reproduce the above copyright 
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
 # 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+#     3. Neither the name of Bolloré telecom nor the names of its contributors
+#        may be used to endorse or promote products derived from this software
+#        without specific prior written permission.
 # 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 from django.test import TestCase
@@ -68,13 +82,25 @@ class GroupTestCase(BaseTestCase):
         g.usernames = ['wizuser', 'baruser']
         g.save()
 
-    def test_filter(self):
+    def test_count(self):
+        # empty query
+        qs = LdapGroup.objects.none()
+        self.assertEquals(qs.count(), 0)
+
         qs = LdapGroup.objects.none()
         self.assertEquals(len(qs), 0)
 
+        # all query
+        qs = LdapGroup.objects.all()
+        self.assertEquals(qs.count(), 3)
+
         qs = LdapGroup.objects.all()
         self.assertEquals(len(qs), 3)
 
+    def test_filter(self):
+        qs = LdapGroup.objects.filter(name='foogroup')
+        self.assertEquals(qs.count(), 1)
+
         qs = LdapGroup.objects.filter(name='foogroup')
         self.assertEquals(len(qs), 1)
 
@@ -85,6 +111,9 @@ class GroupTestCase(BaseTestCase):
         self.assertEquals(g.usernames, ['foouser', 'baruser'])
 
         # try to filter non-existent entries
+        qs = LdapGroup.objects.filter(name='does_not_exist')
+        self.assertEquals(qs.count(), 0)
+
         qs = LdapGroup.objects.filter(name='does_not_exist')
         self.assertEquals(len(qs), 0)
 
@@ -141,22 +170,35 @@ class GroupTestCase(BaseTestCase):
         self.assertEquals(objs[1].gid, 1001)
         self.assertEquals(objs[2].gid, 1002)
 
+        # limit only
         qs = LdapGroup.objects.all()
         objs = qs[:2]
-        for o in objs:
-            return 
-        print objs
+        self.assertEquals(objs.count(), 2)
+
+        objs = qs[:2]
         self.assertEquals(len(objs), 2)
         self.assertEquals(objs[0].gid, 1000)
         self.assertEquals(objs[1].gid, 1001)
-        return
 
+        # offset only
         qs = LdapGroup.objects.all()
+        objs = qs[1:]
+        self.assertEquals(objs.count(), 2)
+
         objs = qs[1:]
         self.assertEquals(len(objs), 2)
         self.assertEquals(objs[0].gid, 1001)
         self.assertEquals(objs[1].gid, 1002)
 
+        # offset and limit
+        qs = LdapGroup.objects.all()
+        objs = qs[1:2]
+        self.assertEquals(objs.count(), 1)
+
+        objs = qs[1:2]
+        self.assertEquals(len(objs), 1)
+        self.assertEquals(objs[0].gid, 1001)
+
     def test_update(self):
         g = LdapGroup.objects.get(name='foogroup')