[Python-checkins] cpython (2.7): Issue #12016: Add test_errorhandle() to TestBase_Mapping of
victor.stinner
python-checkins at python.org
Fri Jun 3 23:58:06 CEST 2011
http://hg.python.org/cpython/rev/53912b58eee6
changeset: 70630:53912b58eee6
branch: 2.7
parent: 70627:685351d65592
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Fri Jun 03 23:56:43 2011 +0200
summary:
Issue #12016: Add test_errorhandle() to TestBase_Mapping of
test_multibytecodec_support. Improve also error message of the
test_errorhandle() of TestBase.
files:
Lib/test/test_multibytecodec_support.py | 42 +++++++++++-
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@ -44,15 +44,24 @@
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 @@
pass_enctest = []
pass_dectest = []
supmaps = []
+ codectests = []
def __init__(self, *args, **kw):
unittest.TestCase.__init__(self, *args, **kw)
@@ -331,6 +341,30 @@
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:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list