From: jlaine Date: Mon, 24 May 2010 19:49:40 +0000 (+0000) Subject: fix tests X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=3a2264a2aa93a43c1409541b81d56fc98973f384;p=matthijs%2Fupstream%2Fdjango-ldapdb.git fix tests git-svn-id: https://svn.bolloretelecom.eu/opensource/django-ldapdb/trunk@879 e071eeec-0327-468d-9b6a-08194a12b294 --- diff --git a/ldapdb/tests.py b/ldapdb/tests.py index d2aba73..cf8bc80 100644 --- a/ldapdb/tests.py +++ b/ldapdb/tests.py @@ -36,79 +36,79 @@ class WhereTestCase(TestCase): 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)") + 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))") + 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))") + 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*)") + 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()), 'endswith', "te*st"), AND) - self.assertEquals(where.as_sql(), "(cn=*te\\2ast)") + 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*)") + self.assertEquals(where.as_sql(), ("(cn=*te\\2ast*)", [])) def test_integer_field(self): where = WhereNode() where.add((Constraint("uid", "uid", IntegerField()), 'exact', 1), AND) - self.assertEquals(where.as_sql(), "(uid=1)") + 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)") + 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)") + 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)") + 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)") + 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))", []))