Skip to content

gh-111495: improve test coverage of codecs C API #126030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 6 commits into from
Nov 1, 2024
Merged

gh-111495: improve test coverage of codecs C API #126030

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e3fdfe
improve test coverage of codecs C API
picnixz Oct 27, 2024
03959c4
address Petr's review
picnixz Oct 29, 2024
b993a2e
Simplify tests
picnixz Oct 31, 2024
69d0643
Simplify tests
picnixz Oct 31, 2024
05f75b6
Update Lib/test/test_capi/test_codecs.py
picnixz Oct 31, 2024
c36232a
Update Lib/test/test_capi/test_codecs.py
picnixz Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address Petr's review
  • Loading branch information
@picnixz
picnixz committed Oct 29, 2024
commit 03959c4195f48d532b4221f61839932eb537ea49
73 changes: 31 additions & 42 deletions Lib/test/test_capi/test_codecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,37 +769,39 @@ def __init__(self, message, start, end, reason):

class CAPICodecErrors(unittest.TestCase):
@classmethod
def _generate_exceptions(cls, atomic_literal, factory, objlens):
for objlen in objlens:
obj = atomic_literal * objlen
def _generate_exception_args(cls):
for objlen in range(10):
m = 2 * max(2, objlen)
for start in range(-m, m):
for end in range(-m, m):
yield factory(obj, start, end)
yield objlen, start, end

@classmethod
def generate_encode_errors(cls, objlen, *objlens):
def factory(obj, start, end):
return UnsafeUnicodeEncodeError('utf-8', obj, start, end, 'reason')
return tuple(cls._generate_exceptions('0', factory, [objlen, *objlens]))
def generate_encode_errors(cls):
return tuple(
UnsafeUnicodeEncodeError('utf-8', '0' * objlen, start, end, 'why')
for objlen, start, end in cls._generate_exception_args()
)

@classmethod
def generate_decode_errors(cls, objlen, *objlens):
def factory(obj, start, end):
return UnsafeUnicodeDecodeError('utf-8', obj, start, end, 'reason')
return tuple(cls._generate_exceptions(b'0', factory, [objlen, *objlens]))
def generate_decode_errors(cls):
return tuple(
UnsafeUnicodeDecodeError('utf-8', b'0' * objlen, start, end, 'why')
for objlen, start, end in cls._generate_exception_args()
)

@classmethod
def generate_translate_errors(cls, objlen, *objlens):
def factory(obj, start, end):
return UnsafeUnicodeTranslateError(obj, start, end, 'reason')
return tuple(cls._generate_exceptions('0', factory, [objlen, *objlens]))
def generate_translate_errors(cls):
return tuple(
UnsafeUnicodeTranslateError('0' * objlen, start, end, 'why')
for objlen, start, end in cls._generate_exception_args()
)

@classmethod
def setUpClass(cls):
cls.unicode_encode_errors = cls.generate_encode_errors(0, 1, 5)
cls.unicode_decode_errors = cls.generate_decode_errors(0, 1, 5)
cls.unicode_translate_errors = cls.generate_translate_errors(0, 1, 5)
cls.unicode_encode_errors = cls.generate_encode_errors()
cls.unicode_decode_errors = cls.generate_decode_errors()
cls.unicode_translate_errors = cls.generate_translate_errors()
cls.all_unicode_errors = (
cls.unicode_encode_errors
+ cls.unicode_decode_errors
Expand Down Expand Up @@ -854,41 +856,25 @@ def test_codec_strict_errors_handler(self):

def test_codec_ignore_errors_handler(self):
handler = _testcapi.codec_ignore_errors
all_exceptions = self.all_unicode_errors
bad_exceptions = self.bad_unicode_errors
self.do_test_codec_errors_handler(handler, all_exceptions, bad_exceptions)
self.do_test_codec_errors_handler(handler, self.all_unicode_errors)

def test_codec_replace_errors_handler(self):
handler = _testcapi.codec_replace_errors
all_exceptions = self.all_unicode_errors
bad_exceptions = self.bad_unicode_errors
self.do_test_codec_errors_handler(handler, all_exceptions, bad_exceptions)
self.do_test_codec_errors_handler(handler, self.all_unicode_errors)

def test_codec_xmlcharrefreplace_errors_handler(self):
handler = _testcapi.codec_xmlcharrefreplace_errors
exceptions = self.unicode_encode_errors
bad_exceptions = (
self.bad_unicode_errors
+ tuple(e for e in self.all_unicode_errors if e not in exceptions)
)
self.do_test_codec_errors_handler(handler, exceptions, bad_exceptions)
self.do_test_codec_errors_handler(handler, self.unicode_encode_errors)

def test_codec_backslashreplace_errors_handler(self):
handler = _testcapi.codec_backslashreplace_errors
exceptions = self.all_unicode_errors
bad_exceptions = self.bad_unicode_errors
self.do_test_codec_errors_handler(handler, exceptions, bad_exceptions)
self.do_test_codec_errors_handler(handler, self.all_unicode_errors)

def test_codec_namereplace_errors_handler(self):
handler = _testlimitedcapi.codec_namereplace_errors
exceptions = self.unicode_encode_errors
bad_exceptions = (
self.bad_unicode_errors
+ tuple(e for e in self.all_unicode_errors if e not in exceptions)
)
self.do_test_codec_errors_handler(handler, exceptions, bad_exceptions)
self.do_test_codec_errors_handler(handler, self.unicode_encode_errors)

def do_test_codec_errors_handler(self, handler, exceptions, bad_exceptions):
def do_test_codec_errors_handler(self, handler, exceptions):
at_least_one = False
for exc in exceptions:
# See https://github.com/python/cpython/issues/123378 and related
Expand All @@ -903,7 +889,10 @@ def do_test_codec_errors_handler(self, handler, exceptions, bad_exceptions):

self.assertTrue(at_least_one, "all exceptions are crashing")

for bad_exc in bad_exceptions:
for bad_exc in (
self.bad_unicode_errors
+ tuple(e for e in self.all_unicode_errors if e not in exceptions)
):
with self.subTest('bad type', handler=handler, exc=bad_exc):
self.assertRaises(TypeError, handler, bad_exc)

Expand Down