From e3826c77745a251b4f2cdd82f9e1b352f3b13bec Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 3 Jun 2011 23:56:43 +0200 Subject: [PATCH] Issue #12016: Add test_errorhandle() to TestBase_Mapping of test_multibytecodec_support. Improve also error message of the test_errorhandle() of TestBase. --- Lib/test/test_multibytecodec_support.py | 42 ++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py index 7d3159df47..52a2e50372 100644 --- a/Lib/test/test_multibytecodec_support.py +++ b/Lib/test/test_multibytecodec_support.py @@ -44,15 +44,24 @@ class TestBase: def test_errorhandle(self): for source, scheme, expected in self.codectests: - if type(source) == type(''): + if isinstance(source, bytes): func = self.decode else: func = self.encode if expected: result = func(source, scheme)[0] - self.assertEqual(result, expected, - '%r.decode(%r)=%r != %r' - % (source, self.encoding, result, expected)) + if func is self.decode: + self.assertTrue(type(result) is unicode, type(result)) + self.assertEqual(result, expected, + '%r.decode(%r, %r)=%r != %r' + % (source, self.encoding, scheme, result, + expected)) + else: + self.assertTrue(type(result) is bytes, type(result)) + self.assertEqual(result, expected, + '%r.encode(%r, %r)=%r != %r' + % (source, self.encoding, scheme, result, + expected)) else: self.assertRaises(UnicodeError, func, source, scheme) @@ -253,6 +262,7 @@ class TestBase_Mapping(unittest.TestCase): pass_enctest = [] pass_dectest = [] supmaps = [] + codectests = [] def __init__(self, *args, **kw): unittest.TestCase.__init__(self, *args, **kw) @@ -331,6 +341,30 @@ class TestBase_Mapping(unittest.TestCase): self.fail('Decoding failed while testing %s -> %s: %s' % ( repr(csetch), repr(unich), exc.reason)) + 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 unicode, type(result)) + self.assertEqual(result, expected, + '%r.decode(%r, %r)=%r != %r' + % (source, self.encoding, scheme, result, + expected)) + else: + result = func(self.encoding, scheme) + self.assertTrue(type(result) is bytes, type(result)) + self.assertEqual(result, expected, + '%r.encode(%r, %r)=%r != %r' + % (source, self.encoding, scheme, result, + expected)) + else: + self.assertRaises(UnicodeError, func, self.encoding, scheme) + def load_teststring(name): dir = os.path.join(os.path.dirname(__file__), 'cjkencodings') with open(os.path.join(dir, name + '.txt'), 'rb') as f: -- 2.50.1