X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Ftests.py;h=124f628e39b4f52da07d3e243da41249fda2ab58;hb=d550eee66cb832f9d906d67b22967f802f41615f;hp=806c764b95dd56a6fe545ba1dfeb33261a993d36;hpb=85099b38b796976f9a9f3a86f094e37548fd47f8;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/tests.py b/ldapdb/tests.py
index 806c764..124f628 100644
--- a/ldapdb/tests.py
+++ b/ldapdb/tests.py
@@ -21,31 +21,57 @@
 from django.test import TestCase
 from django.db.models.sql.where import Constraint, AND, OR
 
+from ldapdb.models.query import escape_ldap_filter
+from ldapdb.models.fields import CharField, IntegerField, ListField
 from ldapdb.models.query import WhereNode
 
 class WhereTestCase(TestCase):
-    def test_single(self):
+    def test_escape(self):
+        self.assertEquals(escape_ldap_filter('foo*bar'), 'foo\\2abar')
+        self.assertEquals(escape_ldap_filter('foo(bar'), 'foo\\28bar')
+        self.assertEquals(escape_ldap_filter('foo)bar'), 'foo\\29bar')
+        self.assertEquals(escape_ldap_filter('foo\\bar'), 'foo\\5cbar')
+        self.assertEquals(escape_ldap_filter('foo\\bar*wiz'), 'foo\\5cbar\\2awiz')
+
+    def test_char_field(self):
         where = WhereNode()
-        where.add((Constraint("cn", "cn", None), 'exact', "test"), AND)
+        where.add((Constraint("cn", "cn", CharField()), 'exact', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=test)")
 
         where = WhereNode()
-        where.add((Constraint("cn", "cn", None), 'startswith', "test"), AND)
+        where.add((Constraint("cn", "cn", CharField()), 'exact', "(test)"), AND)
+        self.assertEquals(where.as_sql(), "(cn=\\28test\\29)")
+
+        where = WhereNode()
+        where.add((Constraint("cn", "cn", CharField()), 'startswith', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=test*)")
 
         where = WhereNode()
-        where.add((Constraint("cn", "cn", None), 'endswith', "test"), AND)
+        where.add((Constraint("cn", "cn", CharField()), 'endswith', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=*test)")
 
+        where = WhereNode()
+        where.add((Constraint("cn", "cn", CharField()), 'in', ["foo", "bar"]), AND)
+        self.assertEquals(where.as_sql(), "(|(cn=foo)(cn=bar))")
+
+        where = WhereNode()
+        where.add((Constraint("cn", "cn", CharField()), 'contains', "test"), AND)
+        self.assertEquals(where.as_sql(), "(cn=*test*)")
+
+    def test_integer_field(self):
+        where = WhereNode()
+        where.add((Constraint("uid", "uid", CharField()), 'exact', 1), AND)
+        self.assertEquals(where.as_sql(), "(uid=1)")
+
     def test_and(self):
         where = WhereNode()
-        where.add((Constraint("cn", "cn", None), 'exact', "foo"), AND)
-        where.add((Constraint("givenName", "givenName", None), 'exact', "bar"), AND)
+        where.add((Constraint("cn", "cn", CharField()), 'exact', "foo"), AND)
+        where.add((Constraint("givenName", "givenName", CharField()), 'exact', "bar"), AND)
         self.assertEquals(where.as_sql(), "(&(cn=foo)(givenName=bar))")
 
     def test_or(self):
         where = WhereNode()
-        where.add((Constraint("cn", "cn", None), 'exact', "foo"), AND)
-        where.add((Constraint("givenName", "givenName", None), 'exact', "bar"), OR)
+        where.add((Constraint("cn", "cn", CharField()), 'exact', "foo"), AND)
+        where.add((Constraint("givenName", "givenName", CharField()), 'exact', "bar"), OR)
         self.assertEquals(where.as_sql(), "(|(cn=foo)(givenName=bar))")