Skip to content

C
cpython
Commit 94afd3e7 authored by Neil Schemenauer's avatar Neil Schemenauer
Browse files
Options

Remove lots of magic constants.

parent 1b50b43b
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 23 deletions
Lib/test/test_zlib.py
View file @ 94afd3e7
...@@ -63,7 +63,7 @@ class ExceptionTestCase(unittest.TestCase): ...@@ -63,7 +63,7 @@ class ExceptionTestCase(unittest.TestCase):
def test_badcompressobj(self): def test_badcompressobj(self):
# verify failure on building compress object with bad params # verify failure on building compress object with bad params
self.assertRaises(ValueError, zlib.compressobj, 1, 8, 0) self.assertRaises(ValueError, zlib.compressobj, 1, zlib.DEFLATED, 0)
def test_baddecompressobj(self): def test_baddecompressobj(self):
# verify failure on building decompress object with bad params # verify failure on building decompress object with bad params
...@@ -104,11 +104,11 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -104,11 +104,11 @@ class CompressObjectTestCase(unittest.TestCase):
def test_pairsmall(self): def test_pairsmall(self):
# use compress object in straightforward manner, decompress w/ object # use compress object in straightforward manner, decompress w/ object
data = hamlet_scene data = hamlet_scene
co = zlib.compressobj(8, 8, -15) co = zlib.compressobj()
x1 = co.compress(data) x1 = co.compress(data)
x2 = co.flush() x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work self.assertRaises(zlib.error, co.flush) # second flush should not work
dco = zlib.decompressobj(-15) dco = zlib.decompressobj()
y1 = dco.decompress(x1 + x2) y1 = dco.decompress(x1 + x2)
y2 = dco.flush() y2 = dco.flush()
self.assertEqual(data, y1 + y2) self.assertEqual(data, y1 + y2)
...@@ -116,26 +116,41 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -116,26 +116,41 @@ class CompressObjectTestCase(unittest.TestCase):
def test_pair(self): def test_pair(self):
# straightforward compress/decompress objects, more compression # straightforward compress/decompress objects, more compression
data = hamlet_scene * 8 * 16 data = hamlet_scene * 8 * 16
co = zlib.compressobj(8, 8, -15) co = zlib.compressobj(zlib.Z_BEST_COMPRESSION, zlib.DEFLATED)
x1 = co.compress(data) x1 = co.compress(data)
x2 = co.flush() x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work self.assertRaises(zlib.error, co.flush) # second flush should not work
dco = zlib.decompressobj(-15) dco = zlib.decompressobj()
y1 = dco.decompress(x1 + x2) y1 = dco.decompress(x1 + x2)
y2 = dco.flush() y2 = dco.flush()
self.assertEqual(data, y1 + y2) self.assertEqual(data, y1 + y2)
def test_compressoptions(self):
# specify lots of options to compressobj()
level = 2
method = zlib.DEFLATED
wbits = -12
memlevel = 9
strategy = zlib.Z_FILTERED
co = zlib.compressobj(level, method, wbits, memlevel, strategy)
x1 = co.compress(hamlet_scene)
x2 = co.flush()
dco = zlib.decompressobj(wbits)
y1 = dco.decompress(x1 + x2)
y2 = dco.flush()
self.assertEqual(hamlet_scene, y1 + y2)
def test_compressincremental(self): def test_compressincremental(self):
# compress object in steps, decompress object as one-shot # compress object in steps, decompress object as one-shot
data = hamlet_scene * 8 * 16 data = hamlet_scene * 8 * 16
co = zlib.compressobj(2, 8, -12, 9, 1) co = zlib.compressobj()
bufs = [] bufs = []
for i in range(0, len(data), 256): for i in range(0, len(data), 256):
bufs.append(co.compress(data[i:i+256])) bufs.append(co.compress(data[i:i+256]))
bufs.append(co.flush()) bufs.append(co.flush())
combuf = ''.join(bufs) combuf = ''.join(bufs)
dco = zlib.decompressobj(-15) dco = zlib.decompressobj()
y1 = dco.decompress(''.join(bufs)) y1 = dco.decompress(''.join(bufs))
y2 = dco.flush() y2 = dco.flush()
self.assertEqual(data, y1 + y2) self.assertEqual(data, y1 + y2)
...@@ -143,16 +158,16 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -143,16 +158,16 @@ class CompressObjectTestCase(unittest.TestCase):
def test_decompressincremental(self): def test_decompressincremental(self):
# compress object in steps, decompress object in steps # compress object in steps, decompress object in steps
data = hamlet_scene * 8 * 16 data = hamlet_scene * 8 * 16
co = zlib.compressobj(2, 8, -12, 9, 1) co = zlib.compressobj()
bufs = [] bufs = []
for i in range(0, len(data), 256): for i in range(0, len(data), 256):
bufs.append(co.compress(data[i:i+256])) bufs.append(co.compress(data[i:i+256]))
bufs.append(co.flush()) bufs.append(co.flush())
combuf = ''.join(bufs) combuf = ''.join(bufs)
self.assertEqual(data, zlib.decompress(combuf, -12, -5)) self.assertEqual(data, zlib.decompress(combuf))
dco = zlib.decompressobj(-12) dco = zlib.decompressobj()
bufs = [] bufs = []
for i in range(0, len(combuf), 128): for i in range(0, len(combuf), 128):
bufs.append(dco.decompress(combuf[i:i+128])) bufs.append(dco.decompress(combuf[i:i+128]))
...@@ -171,16 +186,16 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -171,16 +186,16 @@ class CompressObjectTestCase(unittest.TestCase):
source = source or hamlet_scene source = source or hamlet_scene
for reps in sizes: for reps in sizes:
data = source * reps data = source * reps
co = zlib.compressobj(2, 8, -12, 9, 1) co = zlib.compressobj()
bufs = [] bufs = []
for i in range(0, len(data), cx): for i in range(0, len(data), cx):
bufs.append(co.compress(data[i:i+cx])) bufs.append(co.compress(data[i:i+cx]))
bufs.append(co.flush()) bufs.append(co.flush())
combuf = ''.join(bufs) combuf = ''.join(bufs)
self.assertEqual(data, zlib.decompress(combuf, -12, -5)) self.assertEqual(data, zlib.decompress(combuf))
dco = zlib.decompressobj(-12) dco = zlib.decompressobj()
bufs = [] bufs = []
for i in range(0, len(combuf), dcx): for i in range(0, len(combuf), dcx):
bufs.append(dco.decompress(combuf[i:i+dcx])) bufs.append(dco.decompress(combuf[i:i+dcx]))
...@@ -208,16 +223,16 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -208,16 +223,16 @@ class CompressObjectTestCase(unittest.TestCase):
for reps in sizes: for reps in sizes:
# Check a decompression object with max_length specified # Check a decompression object with max_length specified
data = source * reps data = source * reps
co = zlib.compressobj(2, 8, -12, 9, 1) co = zlib.compressobj()
bufs = [] bufs = []
for i in range(0, len(data), cx): for i in range(0, len(data), cx):
bufs.append(co.compress(data[i:i+cx])) bufs.append(co.compress(data[i:i+cx]))
bufs.append(co.flush()) bufs.append(co.flush())
combuf = ''.join(bufs) combuf = ''.join(bufs)
self.assertEqual(data, zlib.decompress(combuf, -12, -5), self.assertEqual(data, zlib.decompress(combuf),
'compressed data failure') 'compressed data failure')
dco = zlib.decompressobj(-12) dco = zlib.decompressobj()
bufs = [] bufs = []
cb = combuf cb = combuf
while cb: while cb:
...@@ -244,16 +259,16 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -244,16 +259,16 @@ class CompressObjectTestCase(unittest.TestCase):
def test_decompressmaxlen(self): def test_decompressmaxlen(self):
# Check a decompression object with max_length specified # Check a decompression object with max_length specified
data = hamlet_scene * 8 * 16 data = hamlet_scene * 8 * 16
co = zlib.compressobj(2, 8, -12, 9, 1) co = zlib.compressobj()
bufs = [] bufs = []
for i in range(0, len(data), 256): for i in range(0, len(data), 256):
bufs.append(co.compress(data[i:i+256])) bufs.append(co.compress(data[i:i+256]))
bufs.append(co.flush()) bufs.append(co.flush())
combuf = ''.join(bufs) combuf = ''.join(bufs)
self.assertEqual(data, zlib.decompress(combuf, -12, -5), self.assertEqual(data, zlib.decompress(combuf),
'compressed data failure') 'compressed data failure')
dco = zlib.decompressobj(-12) dco = zlib.decompressobj()
bufs = [] bufs = []
cb = combuf cb = combuf
while cb: while cb:
...@@ -271,16 +286,16 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -271,16 +286,16 @@ class CompressObjectTestCase(unittest.TestCase):
# identical to test_decompressmaxlen except flush is replaced # identical to test_decompressmaxlen except flush is replaced
# with an equivalent. This works and other fails on (eg) 2.2.2 # with an equivalent. This works and other fails on (eg) 2.2.2
data = hamlet_scene * 8 * 16 data = hamlet_scene * 8 * 16
co = zlib.compressobj(2, 8, -12, 9, 1) co = zlib.compressobj()
bufs = [] bufs = []
for i in range(0, len(data), 256): for i in range(0, len(data), 256):
bufs.append(co.compress(data[i:i+256])) bufs.append(co.compress(data[i:i+256]))
bufs.append(co.flush()) bufs.append(co.flush())
combuf = ''.join(bufs) combuf = ''.join(bufs)
self.assertEqual(data, zlib.decompress(combuf, -12, -5), self.assertEqual(data, zlib.decompress(combuf),
'compressed data mismatch') 'compressed data mismatch')
dco = zlib.decompressobj(-12) dco = zlib.decompressobj()
bufs = [] bufs = []
cb = combuf cb = combuf
while cb: while cb:
...@@ -302,7 +317,7 @@ class CompressObjectTestCase(unittest.TestCase): ...@@ -302,7 +317,7 @@ class CompressObjectTestCase(unittest.TestCase):
def test_maxlenmisc(self): def test_maxlenmisc(self):
# Misc tests of max_length # Misc tests of max_length
dco = zlib.decompressobj(-12) dco = zlib.decompressobj()
self.assertRaises(ValueError, dco.decompress, "", -1) self.assertRaises(ValueError, dco.decompress, "", -1)
self.assertEqual('', dco.unconsumed_tail) self.assertEqual('', dco.unconsumed_tail)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7