X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Ftests.py;h=de13b9d97303357a4583617475cafd04d9e8cd21;hb=ab216ac000ca0b6aeea64d9ce112395bbb7962d5;hp=1e328ec5ffecf6ddf947896704cf1b21986c3759;hpb=45c9e99629c4af8f559b64ee57c3527af628032c;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/tests.py b/ldapdb/tests.py
index 1e328ec..de13b9d 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,9 @@
 from django.test import TestCase
 from django.db.models.sql.where import Constraint, AND, OR
 
-from ldapdb.models.fields import CharField
-from ldapdb.models.query import WhereNode, escape_ldap_filter
+from ldapdb import escape_ldap_filter
+from ldapdb.models.fields import CharField, IntegerField, ListField
+from ldapdb.models.query import WhereNode
 
 class WhereTestCase(TestCase):
     def test_escape(self):
@@ -32,41 +33,53 @@ 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_single(self):
+    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", None), 'in', ["foo", "bar"]), AND)
+        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", None), 'contains', "test"), AND)
+        where.add((Constraint("cn", "cn", CharField()), 'contains', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=*test*)")
 
-    def test_escaped(self):
+    def test_integer_field(self):
         where = WhereNode()
-        where.add((Constraint("cn", "cn", None), 'exact', "(test)"), AND)
-        self.assertEquals(where.as_sql(), "(cn=\\28test\\29)")
+        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", 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))")