Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(Merge 3.2) Issue #12016: Add test_errorhandle() to TestBase_Mapping of 

test_multibytecodec_support. Improve also error message of the
test_errorhandle() of TestBase.
This commit is contained in:
Victor Stinner 2011-06-03 23:45:03 +02:00
parent 2bc6c2ec2f f5048a4075
commit ab5fcc00a7
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Lib/test/test_multibytecodec_support.py
View File

@ -58,11 +58,16 @@ class TestBase:
result = func(source, scheme)[0] result = func(source, scheme)[0]
if func is self.decode: if func is self.decode:
self.assertTrue(type(result) is str, type(result)) self.assertTrue(type(result) is str, type(result))
self.assertEqual(result, expected,
'%a.decode(%r, %r)=%a != %a'
% (source, self.encoding, scheme, result,
expected))
else: else:
self.assertTrue(type(result) is bytes, type(result)) self.assertTrue(type(result) is bytes, type(result))
self.assertEqual(result, expected, self.assertEqual(result, expected,
'%a.decode(%r)=%a != %a' '%a.encode(%r, %r)=%a != %a'
% (source, self.encoding, result, expected)) % (source, self.encoding, scheme, result,
expected))
else: else:
self.assertRaises(UnicodeError, func, source, scheme) self.assertRaises(UnicodeError, func, source, scheme)
@ -279,6 +284,7 @@ class TestBase_Mapping(unittest.TestCase):
pass_enctest = [] pass_enctest = []
pass_dectest = [] pass_dectest = []
supmaps = [] supmaps = []
codectests = []
def __init__(self, *args, **kw): def __init__(self, *args, **kw):
unittest.TestCase.__init__(self, *args, **kw) unittest.TestCase.__init__(self, *args, **kw)
@ -348,6 +354,30 @@ class TestBase_Mapping(unittest.TestCase):
if (csetch, unich) not in self.pass_dectest: if (csetch, unich) not in self.pass_dectest:
self.assertEqual(str(csetch, self.encoding), unich) self.assertEqual(str(csetch, self.encoding), unich)
def test_errorhandle(self):
for source, scheme, expected in self.codectests:
if isinstance(source, bytes):
func = source.decode
else:
func = source.encode
if expected:
if isinstance(source, bytes):
result = func(self.encoding, scheme)
self.assertTrue(type(result) is str, type(result))
self.assertEqual(result, expected,
'%a.decode(%r, %r)=%a != %a'
% (source, self.encoding, scheme, result,
expected))
else:
result = func(self.encoding, scheme)
self.assertTrue(type(result) is bytes, type(result))
self.assertEqual(result, expected,
'%a.encode(%r, %r)=%a != %a'
% (source, self.encoding, scheme, result,
expected))
else:
self.assertRaises(UnicodeError, func, self.encoding, scheme)
def load_teststring(name): def load_teststring(name):
dir = os.path.join(os.path.dirname(__file__), 'cjkencodings') dir = os.path.join(os.path.dirname(__file__), 'cjkencodings')
with open(os.path.join(dir, name + '.txt'), 'rb') as f: with open(os.path.join(dir, name + '.txt'), 'rb') as f: