X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Ftests.py;h=cf8bc8019beef9efbd9be597ad85ebc60038f975;hb=82901736cde9aae9fbe8b6acc0aad2141ecd9583;hp=fdcba594b9e1a56ac18067c45a42b017006bc1fd;hpb=c92a7be6f574fceac92e13b5805aebdbc31c281e;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/tests.py b/ldapdb/tests.py
index fdcba59..cf8bc80 100644
--- a/ldapdb/tests.py
+++ b/ldapdb/tests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # 
 # django-ldapdb
-# Copyright (C) 2009 Bolloré telecom
+# Copyright (C) 2009-2010 Bolloré telecom
 # See AUTHORS file for a full list of contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -21,8 +21,8 @@
 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
+from ldapdb import escape_ldap_filter
+from ldapdb.models.fields import CharField, IntegerField, ListField
 from ldapdb.models.query import WhereNode
 
 class WhereTestCase(TestCase):
@@ -33,46 +33,82 @@ 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)")
+        self.assertEquals(where.as_sql(), ("(cn=test)", []))
 
+        where = WhereNode()
+        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*)")
+        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)")
+        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*)")
+        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)
-        self.assertEquals(where.as_sql(), "(uid=1)")
+        where.add((Constraint("uid", "uid", IntegerField()), 'exact', 1), AND)
+        self.assertEquals(where.as_sql(), ("(uid=1)", []))
 
-    def test_escaped(self):
         where = WhereNode()
-        where.add((Constraint("cn", "cn", CharField()), 'exact', "(test)"), AND)
-        self.assertEquals(where.as_sql(), "(cn=\\28test\\29)")
+        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_list_field_contains(self):
+        where = WhereNode()
+        where.add((Constraint("memberUid", "memberUid", ListField()), 'contains', 'foouser'), AND)
+        self.assertEquals(where.as_sql(), ("(memberUid=foouser)", []))
+
+        where = WhereNode()
+        where.add((Constraint("memberUid", "memberUid", ListField()), 'contains', '(foouser)'), AND)
+        self.assertEquals(where.as_sql(), ("(memberUid=\\28foouser\\29)", []))
 
     def test_and(self):
         where = WhereNode()
         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))")
+        self.assertEquals(where.as_sql(), ("(&(cn=foo)(givenName=bar))", []))
 
     def test_or(self):
         where = WhereNode()
         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))")
+        self.assertEquals(where.as_sql(), ("(|(cn=foo)(givenName=bar))", []))