refactor tests

[matthijs/upstream/django-ldapdb.git] / ldapdb / tests.py

diff --git a/ldapdb/tests.py b/ldapdb/tests.py
index e3f1410c2843cd4f1e4777a1518cae137d671a8b..124f628e39b4f52da07d3e243da41249fda2ab58 100644 (file)
--- a/ldapdb/tests.py
+++ b/ldapdb/tests.py
@@ -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, IntegerField
-from ldapdb.models.query import WhereNode, escape_ldap_filter
+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_escape(self):
@@ -37,6 +38,10 @@ class WhereTestCase(TestCase):
         where.add((Constraint("cn", "cn", CharField()), 'exact', "test"), AND)
         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)")
+
         where = WhereNode()
         where.add((Constraint("cn", "cn", CharField()), 'startswith', "test"), AND)
         self.assertEquals(where.as_sql(), "(cn=test*)")
@@ -58,11 +63,6 @@ class WhereTestCase(TestCase):
         where.add((Constraint("uid", "uid", CharField()), '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)")
-
     def test_and(self):
         where = WhereNode()
         where.add((Constraint("cn", "cn", CharField()), 'exact', "foo"), AND)