Skip to content

Commit

Permalink
avoid deprecated method alias unittest.TestCase.assertEquals
Browse files Browse the repository at this point in the history
  • Loading branch information
stroeder committed Sep 4, 2017
1 parent cdc169a commit c6d61e2
Show file tree
Hide file tree
Showing 8 changed files with 226 additions and 225 deletions.
3 changes: 2 additions & 1 deletion CHANGES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Lib/

Tests/
* added sub-module for testing class ldap.cidict.cidict
* avoid deprecated method alias unittest.TestCase.assertEquals

----------------------------------------------------------------
Released 2.4.41 2017-07-12
Expand Down Expand Up @@ -1475,4 +1476,4 @@ Released 2.0.0pre02 2002-02-01
----------------------------------------------------------------
Released 1.10alpha3 2000-09-19

$Id: CHANGES,v 1.456 2017/08/16 13:29:05 stroeder Exp $
$Id: CHANGES,v 1.457 2017/09/04 07:47:29 stroeder Exp $
218 changes: 109 additions & 109 deletions Tests/t_cext.py
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions Tests/t_cidict.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
See https://www.python-ldap.org/ for details.
$Id: t_cidict.py,v 1.2 2017/08/15 16:14:04 stroeder Exp $
$Id: t_cidict.py,v 1.3 2017/09/04 07:47:29 stroeder Exp $
"""

# from Python's standard lib
Expand All @@ -23,26 +23,26 @@ def test_cidict(self):
"""
test function is_dn()
"""
self.assertEquals(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
self.assertEqual(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
data = {
'AbCDeF':123,
}
cix = ldap.cidict.cidict(data)
self.assertEquals(cix["ABCDEF"], 123)
self.assertEquals(cix.get("ABCDEF", None), 123)
self.assertEquals(cix.get("not existent", None), None)
self.assertEqual(cix["ABCDEF"], 123)
self.assertEqual(cix.get("ABCDEF", None), 123)
self.assertEqual(cix.get("not existent", None), None)
cix["xYZ"] = 987
self.assertEquals(cix["XyZ"], 987)
self.assertEquals(cix.get("xyz", None), 987)
self.assertEqual(cix["XyZ"], 987)
self.assertEqual(cix.get("xyz", None), 987)
cix_keys = cix.keys()
cix_keys.sort()
self.assertEquals(cix_keys, ['AbCDeF','xYZ'])
self.assertEqual(cix_keys, ['AbCDeF','xYZ'])
cix_items = cix.items()
cix_items.sort()
self.assertEquals(cix_items, [('AbCDeF',123), ('xYZ',987)])
self.assertEqual(cix_items, [('AbCDeF',123), ('xYZ',987)])
del cix["abcdEF"]
self.assertEquals(cix._keys.has_key("abcdef"), False)
self.assertEquals(cix._keys.has_key("AbCDef"), False)
self.assertEqual(cix._keys.has_key("abcdef"), False)
self.assertEqual(cix._keys.has_key("AbCDef"), False)


if __name__ == '__main__':
Expand Down
16 changes: 8 additions & 8 deletions Tests/t_ldap_dn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
See https://www.python-ldap.org/ for details.
$Id: t_ldap_dn.py,v 1.5 2017/08/15 16:21:59 stroeder Exp $
$Id: t_ldap_dn.py,v 1.6 2017/09/04 07:47:29 stroeder Exp $
"""

# from Python's standard lib
Expand All @@ -23,13 +23,13 @@ def test_is_dn(self):
"""
test function is_dn()
"""
self.assertEquals(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
self.assertEquals(ldap.dn.is_dn('-cn=foobar,ou=ae-dir'), False)
self.assertEquals(ldap.dn.is_dn(';cn=foobar,ou=ae-dir'), False)
self.assertEquals(ldap.dn.is_dn(',cn=foobar,ou=ae-dir'), False)
self.assertEquals(ldap.dn.is_dn('cn=foobar,ou=ae-dir,'), False)
self.assertEquals(ldap.dn.is_dn('uid=xkcd,cn=foobar,ou=ae-dir'), True)
self.assertEquals(
self.assertEqual(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
self.assertEqual(ldap.dn.is_dn('-cn=foobar,ou=ae-dir'), False)
self.assertEqual(ldap.dn.is_dn(';cn=foobar,ou=ae-dir'), False)
self.assertEqual(ldap.dn.is_dn(',cn=foobar,ou=ae-dir'), False)
self.assertEqual(ldap.dn.is_dn('cn=foobar,ou=ae-dir,'), False)
self.assertEqual(ldap.dn.is_dn('uid=xkcd,cn=foobar,ou=ae-dir'), True)
self.assertEqual(
ldap.dn.is_dn(
'cn=\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x84\xc3\x96\xc3\x9c.o=\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x84\xc3\x96\xc3\x9c\xc3\x9f'
),
Expand Down
12 changes: 6 additions & 6 deletions Tests/t_ldap_filter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
See https://www.python-ldap.org/ for details.
$Id: t_ldap_filter.py,v 1.4 2017/08/15 16:21:59 stroeder Exp $
$Id: t_ldap_filter.py,v 1.5 2017/09/04 07:47:29 stroeder Exp $
"""

# from Python's standard lib
Expand All @@ -23,15 +23,15 @@ def test_escape_filter_chars_mode0(self):
"""
test function escape_filter_chars() with escape_mode=0
"""
self.assertEquals(
self.assertEqual(
escape_filter_chars(r'foobar'),
'foobar'
)
self.assertEquals(
self.assertEqual(
escape_filter_chars(r'foo\bar'),
r'foo\5cbar'
)
self.assertEquals(
self.assertEqual(
escape_filter_chars(
r'foo\bar',
escape_mode=0
Expand All @@ -43,7 +43,7 @@ def test_escape_filter_chars_mode1(self):
"""
test function escape_filter_chars() with escape_mode=1
"""
self.assertEquals(
self.assertEqual(
escape_filter_chars(
'\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x84\xc3\x96\xc3\x9c\xc3\x9f',
escape_mode=1
Expand All @@ -55,7 +55,7 @@ def test_escape_filter_chars_mode2(self):
"""
test function escape_filter_chars() with escape_mode=2
"""
self.assertEquals(
self.assertEqual(
escape_filter_chars(
'foobar',
escape_mode=2
Expand Down
18 changes: 9 additions & 9 deletions Tests/t_ldap_functions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
See https://www.python-ldap.org/ for details.
$Id: t_ldap_functions.py,v 1.3 2017/08/15 16:21:59 stroeder Exp $
$Id: t_ldap_functions.py,v 1.4 2017/09/04 07:47:29 stroeder Exp $
"""

# from Python's standard lib
Expand All @@ -25,45 +25,45 @@ def test_ldap_strf_secs(self):
"""
test function ldap_strf_secs()
"""
self.assertEquals(ldap.strf_secs(0), '19700101000000Z')
self.assertEquals(ldap.strf_secs(1466947067), '20160626131747Z')
self.assertEqual(ldap.strf_secs(0), '19700101000000Z')
self.assertEqual(ldap.strf_secs(1466947067), '20160626131747Z')

def test_ldap_strp_secs(self):
"""
test function ldap_strp_secs()
"""
self.assertEquals(ldap.strp_secs('19700101000000Z'), 0)
self.assertEquals(ldap.strp_secs('20160626131747Z'), 1466947067)
self.assertEqual(ldap.strp_secs('19700101000000Z'), 0)
self.assertEqual(ldap.strp_secs('20160626131747Z'), 1466947067)

def test_escape_str(self):
"""
test function escape_string_tmpl()
"""
self.assertEquals(
self.assertEqual(
ldap.escape_str(
escape_filter_chars,
'(&(objectClass=aeUser)(uid=%s))',
'foo'
),
'(&(objectClass=aeUser)(uid=foo))'
)
self.assertEquals(
self.assertEqual(
ldap.escape_str(
escape_filter_chars,
'(&(objectClass=aeUser)(uid=%s))',
'foo)bar'
),
'(&(objectClass=aeUser)(uid=foo\\29bar))'
)
self.assertEquals(
self.assertEqual(
ldap.escape_str(
escape_dn_chars,
'uid=%s',
'foo=bar'
),
'uid=foo\\=bar'
)
self.assertEquals(
self.assertEqual(
ldap.escape_str(
escape_dn_chars,
'uid=%s,cn=%s,cn=%s,dc=example,dc=com',
Expand Down
8 changes: 4 additions & 4 deletions Tests/t_ldapobject.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
See https://www.python-ldap.org/ for details.
$Id: t_ldapobject.py,v 1.8 2017/08/15 16:21:59 stroeder Exp $
$Id: t_ldapobject.py,v 1.9 2017/09/04 07:47:29 stroeder Exp $
"""

import os
Expand Down Expand Up @@ -88,7 +88,7 @@ def test_search_subtree(self):
attrlist=['*'],
)
result.sort()
self.assertEquals(
self.assertEqual(
result,
[
(
Expand Down Expand Up @@ -118,7 +118,7 @@ def test_search_onelevel(self):
['*'],
)
result.sort()
self.assertEquals(
self.assertEqual(
result,
[
(
Expand All @@ -144,7 +144,7 @@ def test_search_oneattr(self):
['cn'],
)
result.sort()
self.assertEquals(
self.assertEqual(
result,
[('cn=Foo4,ou=Container,'+self.server.suffix, {'cn': ['Foo4']})]
)
Expand Down
Loading

0 comments on commit c6d61e2

Please sign in to comment.