projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
partially fix tests
[matthijs/upstream/django-ldapdb.git]
/
examples
/
tests.py
diff --git
a/examples/tests.py
b/examples/tests.py
index 60f2abc8f26cb2141742df5ccc4a426eccaca506..1b4a42ca4ec11f514a2328c6adaabfd7c78a2874 100644
(file)
--- a/
examples/tests.py
+++ b/
examples/tests.py
@@
-37,6
+37,7
@@
from django.test import TestCase
import ldap
import ldapdb
import ldap
import ldapdb
+from ldapdb.backends.ldap.compiler import query_as_ldap
from examples.models import LdapUser, LdapGroup
class BaseTestCase(TestCase):
from examples.models import LdapUser, LdapGroup
class BaseTestCase(TestCase):
@@
-101,35
+102,35
@@
class GroupTestCase(BaseTestCase):
def test_ldap_filter(self):
# single filter
qs = LdapGroup.objects.filter(name='foogroup')
def test_ldap_filter(self):
# single filter
qs = LdapGroup.objects.filter(name='foogroup')
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(cn=foogroup))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(cn=foogroup))')
qs = LdapGroup.objects.filter(Q(name='foogroup'))
qs = LdapGroup.objects.filter(Q(name='foogroup'))
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(cn=foogroup))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(cn=foogroup))')
# AND filter
qs = LdapGroup.objects.filter(gid=1000, name='foogroup')
# AND filter
qs = LdapGroup.objects.filter(gid=1000, name='foogroup')
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
qs = LdapGroup.objects.filter(Q(gid=1000) & Q(name='foogroup'))
qs = LdapGroup.objects.filter(Q(gid=1000) & Q(name='foogroup'))
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(&(gidNumber=1000)(cn=foogroup)))')
# OR filter
qs = LdapGroup.objects.filter(Q(gid=1000) | Q(name='foogroup'))
# OR filter
qs = LdapGroup.objects.filter(Q(gid=1000) | Q(name='foogroup'))
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(|(gidNumber=1000)(cn=foogroup)))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(|(gidNumber=1000)(cn=foogroup)))')
# single exclusion
qs = LdapGroup.objects.exclude(name='foogroup')
# single exclusion
qs = LdapGroup.objects.exclude(name='foogroup')
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
qs = LdapGroup.objects.filter(~Q(name='foogroup'))
qs = LdapGroup.objects.filter(~Q(name='foogroup'))
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(!(cn=foogroup)))')
# multiple exclusion
qs = LdapGroup.objects.exclude(name='foogroup', gid=1000)
# multiple exclusion
qs = LdapGroup.objects.exclude(name='foogroup', gid=1000)
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(!(&(gidNumber=1000)(cn=foogroup))))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(!(&(gidNumber=1000)(cn=foogroup))))')
qs = LdapGroup.objects.filter(name='foogroup').exclude(gid=1000)
qs = LdapGroup.objects.filter(name='foogroup').exclude(gid=1000)
- self.assertEquals(q
s.query._ldap_filter(
), '(&(objectClass=posixGroup)(&(cn=foogroup)(!(gidNumber=1000))))')
+ self.assertEquals(q
uery_as_ldap(qs.query
), '(&(objectClass=posixGroup)(&(cn=foogroup)(!(gidNumber=1000))))')
def test_filter(self):
qs = LdapGroup.objects.filter(name='foogroup')
def test_filter(self):
qs = LdapGroup.objects.filter(name='foogroup')