openstack
/
oslo.serialization
Code Issues Proposed changes

Fix parameters of assertEqual are misplaced 

Many assertEqual sentences don't follow assertEqual(expected, actual),
These misplaces have 2 impacts:
1, giving confusing messages when some tests failed.
2, mislead other developers, new test modules may follow these wrong pattern.

This patch fix all of them.

Change-Id: Ice3148685b81bf906672b91159fbb29bd618abb0
Closes-Bug: #1604213
This commit is contained in:
yanheven 2016-07-23 19:38:43 +08:00
parent aa0e48021a
commit 5ae04325e6
3 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
oslo_serialization/tests/test_base64.py
View File

@ -20,37 +20,37 @@ from oslotest import base as test_base
class Base64Tests(test_base.BaseTestCase):
def test_encode_as_bytes(self):
self.assertEqual(base64.encode_as_bytes(b'text'),
b'dGV4dA==')
self.assertEqual(base64.encode_as_bytes(u'text'),
b'dGV4dA==')
self.assertEqual(base64.encode_as_bytes(u'e:\xe9'),
b'ZTrDqQ==')
self.assertEqual(base64.encode_as_bytes(u'e:\xe9', encoding='latin1'),
b'ZTrp')
self.assertEqual(b'dGV4dA==',
base64.encode_as_bytes(b'text'))
self.assertEqual(b'dGV4dA==',
base64.encode_as_bytes(u'text'))
self.assertEqual(b'ZTrDqQ==',
base64.encode_as_bytes(u'e:\xe9'))
self.assertEqual(b'ZTrp',
base64.encode_as_bytes(u'e:\xe9', encoding='latin1'))
def test_encode_as_text(self):
self.assertEqual(base64.encode_as_text(b'text'),
u'dGV4dA==')
self.assertEqual(base64.encode_as_text(u'text'),
u'dGV4dA==')
self.assertEqual(base64.encode_as_text(u'e:\xe9'),
u'ZTrDqQ==')
self.assertEqual(base64.encode_as_text(u'e:\xe9', encoding='latin1'),
u'ZTrp')
self.assertEqual(u'dGV4dA==',
base64.encode_as_text(b'text'))
self.assertEqual(u'dGV4dA==',
base64.encode_as_text(u'text'))
self.assertEqual(u'ZTrDqQ==',
base64.encode_as_text(u'e:\xe9'))
self.assertEqual(u'ZTrp',
base64.encode_as_text(u'e:\xe9', encoding='latin1'))
def test_decode_as_bytes(self):
self.assertEqual(base64.decode_as_bytes(b'dGV4dA=='),
b'text')
self.assertEqual(base64.decode_as_bytes(u'dGV4dA=='),
b'text')
self.assertEqual(b'text',
base64.decode_as_bytes(b'dGV4dA=='))
self.assertEqual(b'text',
base64.decode_as_bytes(u'dGV4dA=='))
def test_decode_as_text(self):
self.assertEqual(base64.decode_as_text(b'dGV4dA=='),
u'text')
self.assertEqual(base64.decode_as_text(u'dGV4dA=='),
u'text')
self.assertEqual(base64.decode_as_text(u'ZTrDqQ=='),
u'e:\xe9')
self.assertEqual(base64.decode_as_text(u'ZTrp', encoding='latin1'),
u'e:\xe9')
self.assertEqual(u'text',
base64.decode_as_text(b'dGV4dA=='))
self.assertEqual(u'text',
base64.decode_as_text(u'dGV4dA=='))
self.assertEqual(u'e:\xe9',
base64.decode_as_text(u'ZTrDqQ=='))
self.assertEqual(u'e:\xe9',
base64.decode_as_text(u'ZTrp', encoding='latin1'))

52
oslo_serialization/tests/test_jsonutils.py
View File

@ -114,35 +114,35 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
self.trans_fixture = self.useFixture(fixture.Translation())
def test_list(self):
self.assertEqual(jsonutils.to_primitive([1, 2, 3]), [1, 2, 3])
self.assertEqual([1, 2, 3], jsonutils.to_primitive([1, 2, 3]))
def test_empty_list(self):
self.assertEqual(jsonutils.to_primitive([]), [])
self.assertEqual([], jsonutils.to_primitive([]))
def test_tuple(self):
self.assertEqual(jsonutils.to_primitive((1, 2, 3)), [1, 2, 3])
self.assertEqual([1, 2, 3], jsonutils.to_primitive((1, 2, 3)))
def test_dict(self):
self.assertEqual(jsonutils.to_primitive(dict(a=1, b=2, c=3)),
dict(a=1, b=2, c=3))
self.assertEqual(dict(a=1, b=2, c=3),
jsonutils.to_primitive(dict(a=1, b=2, c=3)))
def test_empty_dict(self):
self.assertEqual(jsonutils.to_primitive({}), {})
self.assertEqual({}, jsonutils.to_primitive({}))
def test_datetime(self):
x = datetime.datetime(1920, 2, 3, 4, 5, 6, 7)
self.assertEqual(jsonutils.to_primitive(x),
'1920-02-03T04:05:06.000007')
self.assertEqual('1920-02-03T04:05:06.000007',
jsonutils.to_primitive(x))
def test_datetime_preserve(self):
x = datetime.datetime(1920, 2, 3, 4, 5, 6, 7)
self.assertEqual(jsonutils.to_primitive(x, convert_datetime=False), x)
self.assertEqual(x, jsonutils.to_primitive(x, convert_datetime=False))
def test_DateTime(self):
x = xmlrpclib.DateTime()
x.decode("19710203T04:05:06")
self.assertEqual(jsonutils.to_primitive(x),
'1971-02-03T04:05:06.000000')
self.assertEqual('1971-02-03T04:05:06.000000',
jsonutils.to_primitive(x))
def test_iter(self):
class IterClass(object):
@ -161,7 +161,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
__next__ = next
x = IterClass()
self.assertEqual(jsonutils.to_primitive(x), [1, 2, 3, 4, 5])
self.assertEqual([1, 2, 3, 4, 5], jsonutils.to_primitive(x))
def test_iteritems(self):
class IterItemsClass(object):
@ -174,7 +174,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
x = IterItemsClass()
p = jsonutils.to_primitive(x)
self.assertEqual(p, {'a': 1, 'b': 2, 'c': 3})
self.assertEqual({'a': 1, 'b': 2, 'c': 3}, p)
def test_iteritems_with_cycle(self):
class IterItemsClass(object):
@ -205,7 +205,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
x = ItemsClass()
p = jsonutils.to_primitive(x)
self.assertEqual(p, {'a': 1, 'b': 2, 'c': 3})
self.assertEqual({'a': 1, 'b': 2, 'c': 3}, p)
def test_precedence_items_iteritems(self):
class ItemsIterItemsClass(object):
@ -218,7 +218,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
x = ItemsIterItemsClass()
p = jsonutils.to_primitive(x)
# Prefer iteritems over items
self.assertEqual(p, {'iteritems': 'iteritems'})
self.assertEqual({'iteritems': 'iteritems'}, p)
def test_mapping(self):
# Make sure collections.Mapping is converted to a dict
@ -238,7 +238,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
x = MappingClass()
p = jsonutils.to_primitive(x)
self.assertEqual(p, {'a': 1, 'b': 2, 'c': 3})
self.assertEqual({'a': 1, 'b': 2, 'c': 3}, p)
def test_instance(self):
class MysteryClass(object):
@ -248,24 +248,24 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
self.b = 1
x = MysteryClass()
self.assertEqual(jsonutils.to_primitive(x, convert_instances=True),
dict(b=1))
self.assertEqual(dict(b=1),
jsonutils.to_primitive(x, convert_instances=True))
self.assertEqual(jsonutils.to_primitive(x), x)
self.assertEqual(x, jsonutils.to_primitive(x))
def test_typeerror(self):
x = bytearray # Class, not instance
if six.PY3:
self.assertEqual(jsonutils.to_primitive(x), u"<class 'bytearray'>")
self.assertEqual(u"<class 'bytearray'>", jsonutils.to_primitive(x))
else:
self.assertEqual(jsonutils.to_primitive(x), u"<type 'bytearray'>")
self.assertEqual(u"<type 'bytearray'>", jsonutils.to_primitive(x))
def test_nasties(self):
def foo():
pass
x = [datetime, foo, dir]
ret = jsonutils.to_primitive(x)
self.assertEqual(len(ret), 3)
self.assertEqual(3, len(ret))
self.assertTrue(ret[0].startswith(u"<module 'datetime' from ") or
ret[0].startswith(u"<module 'datetime' (built-in)"))
if six.PY3:
@ -274,7 +274,7 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
))
else:
self.assertTrue(ret[1].startswith('<function foo at 0x'))
self.assertEqual(ret[2], '<built-in function dir>')
self.assertEqual('<built-in function dir>', ret[2])
def test_depth(self):
class LevelsGenerator(object):
@ -294,13 +294,13 @@ class ToPrimitiveTestCase(test_base.BaseTestCase):
json_l4 = {0: {0: {0: {0: None}}}}
ret = jsonutils.to_primitive(l4_obj, max_depth=2)
self.assertEqual(ret, json_l2)
self.assertEqual(json_l2, ret)
ret = jsonutils.to_primitive(l4_obj, max_depth=3)
self.assertEqual(ret, json_l3)
self.assertEqual(json_l3, ret)
ret = jsonutils.to_primitive(l4_obj, max_depth=4)
self.assertEqual(ret, json_l4)
self.assertEqual(json_l4, ret)
def test_ipaddr_using_netaddr(self):
thing = {'ip_addr': netaddr.IPAddress('1.2.3.4')}

28
oslo_serialization/tests/test_msgpackutils.py
View File

@ -66,10 +66,10 @@ def _dumps_loads(obj):
class MsgPackUtilsTest(test_base.BaseTestCase):
def test_list(self):
self.assertEqual(_dumps_loads([1, 2, 3]), [1, 2, 3])
self.assertEqual([1, 2, 3], _dumps_loads([1, 2, 3]))
def test_empty_list(self):
self.assertEqual(_dumps_loads([]), [])
self.assertEqual([], _dumps_loads([]))
def test_tuple(self):
# Seems like we do lose whether it was a tuple or not...
@ -77,14 +77,14 @@ class MsgPackUtilsTest(test_base.BaseTestCase):
# Maybe fixed someday:
#
# https://github.com/msgpack/msgpack-python/issues/98
self.assertEqual(_dumps_loads((1, 2, 3)), [1, 2, 3])
self.assertEqual([1, 2, 3], _dumps_loads((1, 2, 3)))
def test_dict(self):
self.assertEqual(_dumps_loads(dict(a=1, b=2, c=3)),
dict(a=1, b=2, c=3))
self.assertEqual(dict(a=1, b=2, c=3),
_dumps_loads(dict(a=1, b=2, c=3)))
def test_empty_dict(self):
self.assertEqual(_dumps_loads({}), {})
self.assertEqual({}, _dumps_loads({}))
def test_complex_dict(self):
src = {
@ -99,7 +99,7 @@ class MsgPackUtilsTest(test_base.BaseTestCase):
'ddd': b'bbb',
'today': datetime.date.today(),
}
self.assertEqual(_dumps_loads(src), src)
self.assertEqual(src, _dumps_loads(src))
def test_itercount(self):
it = itertools.count(1)
@ -118,29 +118,29 @@ class MsgPackUtilsTest(test_base.BaseTestCase):
self.assertEqual(six.next(it), six.next(it2))
def test_set(self):
self.assertEqual(_dumps_loads(set([1, 2])), set([1, 2]))
self.assertEqual(set([1, 2]), _dumps_loads(set([1, 2])))
def test_empty_set(self):
self.assertEqual(_dumps_loads(set([])), set([]))
self.assertEqual(set([]), _dumps_loads(set([])))
def test_frozenset(self):
self.assertEqual(_dumps_loads(frozenset([1, 2])), frozenset([1, 2]))
self.assertEqual(frozenset([1, 2]), _dumps_loads(frozenset([1, 2])))
def test_empty_frozenset(self):
self.assertEqual(_dumps_loads(frozenset([])), frozenset([]))
self.assertEqual(frozenset([]), _dumps_loads(frozenset([])))
def test_datetime_preserve(self):
x = datetime.datetime(1920, 2, 3, 4, 5, 6, 7)
self.assertEqual(_dumps_loads(x), x)
self.assertEqual(x, _dumps_loads(x))
def test_datetime(self):
x = xmlrpclib.DateTime()
x.decode("19710203T04:05:06")
self.assertEqual(_dumps_loads(x), x)
self.assertEqual(x, _dumps_loads(x))
def test_ipaddr(self):
thing = {'ip_addr': netaddr.IPAddress('1.2.3.4')}
self.assertEqual(_dumps_loads(thing), thing)
self.assertEqual(thing, _dumps_loads(thing))
def test_today(self):
today = datetime.date.today()