X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Ftests.py;h=f9c4b1674a3df4a74143d75268d79b19fd3d76a3;hb=29c4b4ac0569ebb0877aa9b32211dc91afb248c5;hp=4b6f7f15216ea28b36d1fee8165bc9421552c245;hpb=23a36d706cedeed4d02d0f97b46669403ce5b943;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/tests.py b/ldapdb/tests.py
index 4b6f7f1..f9c4b16 100644
--- a/ldapdb/tests.py
+++ b/ldapdb/tests.py
@@ -21,7 +21,7 @@
 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 import escape_ldap_filter
 from ldapdb.models.fields import CharField, IntegerField, ListField
 from ldapdb.models.query import WhereNode
 
@@ -33,7 +33,7 @@ class WhereTestCase(TestCase):
         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):
+    def test_char_field_exact(self):
         where = WhereNode()
         where.add((Constraint("cn", "cn", CharField()), 'exact', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=test)")
@@ -42,27 +42,55 @@ class WhereTestCase(TestCase):
         where.add((Constraint("cn", "cn", CharField()), 'exact', "(test)"), AND)
         self.assertEquals(where.as_sql(), "(cn=\\28test\\29)")
 
+    def test_char_field_in(self):
+        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()), 'in', ["(foo)", "(bar)"]), AND)
+        self.assertEquals(where.as_sql(), "(|(cn=\\28foo\\29)(cn=\\28bar\\29))")
+
+    def test_char_field_startswith(self):
         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", CharField()), 'startswith', "te*st"), AND)
+        self.assertEquals(where.as_sql(), "(cn=te\\2ast*)")
+
+    def test_char_field_endswith(self):
         where = WhereNode()
         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.add((Constraint("cn", "cn", CharField()), 'endswith', "te*st"), AND)
+        self.assertEquals(where.as_sql(), "(cn=*te\\2ast)")
 
+    def test_char_field_contains(self):
         where = WhereNode()
         where.add((Constraint("cn", "cn", CharField()), 'contains', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=*test*)")
 
+        where = WhereNode()
+        where.add((Constraint("cn", "cn", CharField()), 'contains', "te*st"), AND)
+        self.assertEquals(where.as_sql(), "(cn=*te\\2ast*)")
+
     def test_integer_field(self):
         where = WhereNode()
-        where.add((Constraint("uid", "uid", CharField()), 'exact', 1), AND)
+        where.add((Constraint("uid", "uid", IntegerField()), 'exact', 1), AND)
         self.assertEquals(where.as_sql(), "(uid=1)")
 
+        where = WhereNode()
+        where.add((Constraint("uid", "uid", IntegerField()), 'gte', 1), AND)
+        self.assertEquals(where.as_sql(), "(uid>=1)")
+
+        where = WhereNode()
+        where.add((Constraint("uid", "uid", IntegerField()), 'lte', 1), AND)
+        self.assertEquals(where.as_sql(), "(uid<=1)")
+
     def test_and(self):
         where = WhereNode()
         where.add((Constraint("cn", "cn", CharField()), 'exact', "foo"), AND)