[Python-checkins] python/dist/src/Lib/test test_zlib.py,1.24,1.25
nascheme at users.sourceforge.net
nascheme at users.sourceforge.net
Sat Jun 5 15:02:54 EDT 2004
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22205/Lib/test
Modified Files:
test_zlib.py
Log Message:
Remove lots of magic constants.
Index: test_zlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zlib.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** test_zlib.py 31 Aug 2003 04:35:24 -0000 1.24
--- test_zlib.py 5 Jun 2004 19:02:52 -0000 1.25
***************
*** 64,68 ****
def test_badcompressobj(self):
# verify failure on building compress object with bad params
! self.assertRaises(ValueError, zlib.compressobj, 1, 8, 0)
def test_baddecompressobj(self):
--- 64,68 ----
def test_badcompressobj(self):
# verify failure on building compress object with bad params
! self.assertRaises(ValueError, zlib.compressobj, 1, zlib.DEFLATED, 0)
def test_baddecompressobj(self):
***************
*** 105,113 ****
# use compress object in straightforward manner, decompress w/ object
data = hamlet_scene
! co = zlib.compressobj(8, 8, -15)
x1 = co.compress(data)
x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work
! dco = zlib.decompressobj(-15)
y1 = dco.decompress(x1 + x2)
y2 = dco.flush()
--- 105,113 ----
# use compress object in straightforward manner, decompress w/ object
data = hamlet_scene
! co = zlib.compressobj()
x1 = co.compress(data)
x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work
! dco = zlib.decompressobj()
y1 = dco.decompress(x1 + x2)
y2 = dco.flush()
***************
*** 117,133 ****
# straightforward compress/decompress objects, more compression
data = hamlet_scene * 8 * 16
! co = zlib.compressobj(8, 8, -15)
x1 = co.compress(data)
x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work
! dco = zlib.decompressobj(-15)
y1 = dco.decompress(x1 + x2)
y2 = dco.flush()
self.assertEqual(data, y1 + y2)
def test_compressincremental(self):
# compress object in steps, decompress object as one-shot
data = hamlet_scene * 8 * 16
! co = zlib.compressobj(2, 8, -12, 9, 1)
bufs = []
for i in range(0, len(data), 256):
--- 117,148 ----
# straightforward compress/decompress objects, more compression
data = hamlet_scene * 8 * 16
! co = zlib.compressobj(zlib.Z_BEST_COMPRESSION, zlib.DEFLATED)
x1 = co.compress(data)
x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work
! dco = zlib.decompressobj()
y1 = dco.decompress(x1 + x2)
y2 = dco.flush()
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):
# compress object in steps, decompress object as one-shot
data = hamlet_scene * 8 * 16
! co = zlib.compressobj()
bufs = []
for i in range(0, len(data), 256):
***************
*** 136,140 ****
combuf = ''.join(bufs)
! dco = zlib.decompressobj(-15)
y1 = dco.decompress(''.join(bufs))
y2 = dco.flush()
--- 151,155 ----
combuf = ''.join(bufs)
! dco = zlib.decompressobj()
y1 = dco.decompress(''.join(bufs))
y2 = dco.flush()
***************
*** 144,148 ****
# compress object in steps, decompress object in steps
data = hamlet_scene * 8 * 16
! co = zlib.compressobj(2, 8, -12, 9, 1)
bufs = []
for i in range(0, len(data), 256):
--- 159,163 ----
# compress object in steps, decompress object in steps
data = hamlet_scene * 8 * 16
! co = zlib.compressobj()
bufs = []
for i in range(0, len(data), 256):
***************
*** 151,157 ****
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf, -12, -5))
! dco = zlib.decompressobj(-12)
bufs = []
for i in range(0, len(combuf), 128):
--- 166,172 ----
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf))
! dco = zlib.decompressobj()
bufs = []
for i in range(0, len(combuf), 128):
***************
*** 172,176 ****
for reps in sizes:
data = source * reps
! co = zlib.compressobj(2, 8, -12, 9, 1)
bufs = []
for i in range(0, len(data), cx):
--- 187,191 ----
for reps in sizes:
data = source * reps
! co = zlib.compressobj()
bufs = []
for i in range(0, len(data), cx):
***************
*** 179,185 ****
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf, -12, -5))
! dco = zlib.decompressobj(-12)
bufs = []
for i in range(0, len(combuf), dcx):
--- 194,200 ----
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf))
! dco = zlib.decompressobj()
bufs = []
for i in range(0, len(combuf), dcx):
***************
*** 209,213 ****
# Check a decompression object with max_length specified
data = source * reps
! co = zlib.compressobj(2, 8, -12, 9, 1)
bufs = []
for i in range(0, len(data), cx):
--- 224,228 ----
# Check a decompression object with max_length specified
data = source * reps
! co = zlib.compressobj()
bufs = []
for i in range(0, len(data), cx):
***************
*** 215,222 ****
bufs.append(co.flush())
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf, -12, -5),
'compressed data failure')
! dco = zlib.decompressobj(-12)
bufs = []
cb = combuf
--- 230,237 ----
bufs.append(co.flush())
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf),
'compressed data failure')
! dco = zlib.decompressobj()
bufs = []
cb = combuf
***************
*** 245,249 ****
# Check a decompression object with max_length specified
data = hamlet_scene * 8 * 16
! co = zlib.compressobj(2, 8, -12, 9, 1)
bufs = []
for i in range(0, len(data), 256):
--- 260,264 ----
# Check a decompression object with max_length specified
data = hamlet_scene * 8 * 16
! co = zlib.compressobj()
bufs = []
for i in range(0, len(data), 256):
***************
*** 251,258 ****
bufs.append(co.flush())
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf, -12, -5),
'compressed data failure')
! dco = zlib.decompressobj(-12)
bufs = []
cb = combuf
--- 266,273 ----
bufs.append(co.flush())
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf),
'compressed data failure')
! dco = zlib.decompressobj()
bufs = []
cb = combuf
***************
*** 272,276 ****
# with an equivalent. This works and other fails on (eg) 2.2.2
data = hamlet_scene * 8 * 16
! co = zlib.compressobj(2, 8, -12, 9, 1)
bufs = []
for i in range(0, len(data), 256):
--- 287,291 ----
# with an equivalent. This works and other fails on (eg) 2.2.2
data = hamlet_scene * 8 * 16
! co = zlib.compressobj()
bufs = []
for i in range(0, len(data), 256):
***************
*** 278,285 ****
bufs.append(co.flush())
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf, -12, -5),
'compressed data mismatch')
! dco = zlib.decompressobj(-12)
bufs = []
cb = combuf
--- 293,300 ----
bufs.append(co.flush())
combuf = ''.join(bufs)
! self.assertEqual(data, zlib.decompress(combuf),
'compressed data mismatch')
! dco = zlib.decompressobj()
bufs = []
cb = combuf
***************
*** 303,307 ****
def test_maxlenmisc(self):
# Misc tests of max_length
! dco = zlib.decompressobj(-12)
self.assertRaises(ValueError, dco.decompress, "", -1)
self.assertEqual('', dco.unconsumed_tail)
--- 318,322 ----
def test_maxlenmisc(self):
# Misc tests of max_length
! dco = zlib.decompressobj()
self.assertRaises(ValueError, dco.decompress, "", -1)
self.assertEqual('', dco.unconsumed_tail)
More information about the Python-checkins
mailing list