[test] split expect_dict to two functions

pull/8/head
Qijiang Fan 9 years ago committed by Sergey M․
parent 93bc7ef165
commit 40c931de4b

@ -89,81 +89,78 @@ def gettestcases(include_onlymatching=False):
md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest() md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
def expect_dict(self, got_dict, expected_dict): def expect_value(self, got, expected, field):
for info_field, expected in expected_dict.items(): if isinstance(expected, compat_str) and expected.startswith('re:'):
if isinstance(expected, compat_str) and expected.startswith('re:'): match_str = expected[len('re:'):]
got = got_dict.get(info_field) match_rex = re.compile(match_str)
match_str = expected[len('re:'):]
match_rex = re.compile(match_str) self.assertTrue(
isinstance(got, compat_str),
self.assertTrue( 'Expected a %s object, but got %s for field %s' % (
isinstance(got, compat_str), compat_str.__name__, type(got).__name__, field))
'Expected a %s object, but got %s for field %s' % ( self.assertTrue(
compat_str.__name__, type(got).__name__, info_field)) match_rex.match(got),
self.assertTrue( 'field %s (value: %r) should match %r' % (field, got, match_str))
match_rex.match(got), elif isinstance(expected, compat_str) and expected.startswith('startswith:'):
'field %s (value: %r) should match %r' % (info_field, got, match_str)) start_str = expected[len('startswith:'):]
elif isinstance(expected, compat_str) and expected.startswith('startswith:'): self.assertTrue(
got = got_dict.get(info_field) isinstance(got, compat_str),
start_str = expected[len('startswith:'):] 'Expected a %s object, but got %s for field %s' % (
self.assertTrue( compat_str.__name__, type(got).__name__, field))
isinstance(got, compat_str), self.assertTrue(
'Expected a %s object, but got %s for field %s' % ( got.startswith(start_str),
compat_str.__name__, type(got).__name__, info_field)) 'field %s (value: %r) should start with %r' % (field, got, start_str))
self.assertTrue( elif isinstance(expected, compat_str) and expected.startswith('contains:'):
got.startswith(start_str), contains_str = expected[len('contains:'):]
'field %s (value: %r) should start with %r' % (info_field, got, start_str)) self.assertTrue(
elif isinstance(expected, compat_str) and expected.startswith('contains:'): isinstance(got, compat_str),
got = got_dict.get(info_field) 'Expected a %s object, but got %s for field %s' % (
contains_str = expected[len('contains:'):] compat_str.__name__, type(got).__name__, field))
self.assertTrue( self.assertTrue(
isinstance(got, compat_str), contains_str in got,
'Expected a %s object, but got %s for field %s' % ( 'field %s (value: %r) should contain %r' % (field, got, contains_str))
compat_str.__name__, type(got).__name__, info_field)) elif isinstance(expected, type):
self.assertTrue(isinstance(got, expected),
'Expected type %r for field %s, but got value %r of type %r' % (expected, field, got, type(got)))
elif isinstance(expected, dict) and isinstance(got, dict):
expect_dict(self, got, expected)
elif isinstance(expected, list) and isinstance(got, list):
self.assertEqual(len(expected), len(got),
'Expect a list of length %d, but got a list of length %d' % (
len(expected), len(got)))
_id = 0
for i, j in zip(got, expected):
_type_i = type(i)
_type_j = type(j)
self.assertEqual(_type_j, _type_i,
'Type doesn\'t match at element %d of the list in field %s, expect %s, got %s' % (
_id, field, _type_j, _type_i))
expect_value(self, i, j, field)
_id += 1
else:
if isinstance(expected, compat_str) and expected.startswith('md5:'):
got = 'md5:' + md5(got)
elif isinstance(expected, compat_str) and expected.startswith('mincount:'):
self.assertTrue( self.assertTrue(
contains_str in got, isinstance(got, (list, dict)),
'field %s (value: %r) should contain %r' % (info_field, got, contains_str)) 'Expected field %s to be a list or a dict, but it is of type %s' % (
elif isinstance(expected, type): field, type(got).__name__))
got = got_dict.get(info_field) expected_num = int(expected.partition(':')[2])
self.assertTrue(isinstance(got, expected), assertGreaterEqual(
'Expected type %r for field %s, but got value %r of type %r' % (expected, info_field, got, type(got))) self, len(got), expected_num,
elif isinstance(expected, dict) and isinstance(got_dict.get(info_field, None), dict): 'Expected %d items in field %s, but only got %d' % (
expect_dict(self, got_dict.get(info_field), expected) expected_num, field, len(got)
elif isinstance(expected, list) and isinstance(got_dict.get(info_field, None), list):
got = got_dict.get(info_field, None)
self.assertEqual(len(expected), len(got),
'Expect a list of length %d, but got a list of length %d' % (
len(expected), len(got)))
_id = 0
for i, j in zip(got, expected):
_type_i = type(i)
_type_j = type(j)
self.assertEqual(_type_j, _type_i,
'Type doesn\'t match at element %d of the list in field %s, expect %s, got %s' % (
_id, info_field, _type_j, _type_i))
expect_dict(self, {'_': i}, {'_': j})
_id += 1
else:
if isinstance(expected, compat_str) and expected.startswith('md5:'):
got = 'md5:' + md5(got_dict.get(info_field))
elif isinstance(expected, compat_str) and expected.startswith('mincount:'):
got = got_dict.get(info_field)
self.assertTrue(
isinstance(got, (list, dict)),
'Expected field %s to be a list or a dict, but it is of type %s' % (
info_field, type(got).__name__))
expected_num = int(expected.partition(':')[2])
assertGreaterEqual(
self, len(got), expected_num,
'Expected %d items in field %s, but only got %d' % (
expected_num, info_field, len(got)
)
) )
continue )
else: return
got = got_dict.get(info_field) self.assertEqual(expected, got,
self.assertEqual(expected, got, 'invalid value for field %s, expected %r, got %r' % (field, expected, got))
'invalid value for field %s, expected %r, got %r' % (info_field, expected, got))
def expect_dict(self, got_dict, expected_dict):
for info_field, expected in expected_dict.items():
got = got_dict.get(info_field)
expect_value(self, got, expected, info_field)
def expect_info_dict(self, got_dict, expected_dict): def expect_info_dict(self, got_dict, expected_dict):

Loading…
Cancel
Save