--- a/contrib/python-zstandard/tests/test_data_structures.py Thu Feb 09 21:44:32 2017 -0500
+++ b/contrib/python-zstandard/tests/test_data_structures.py Tue Feb 07 23:24:47 2017 -0800
@@ -13,6 +13,12 @@
import zstd
+from . common import (
+ make_cffi,
+)
+
+
+@make_cffi
class TestCompressionParameters(unittest.TestCase):
def test_init_bad_arg_type(self):
with self.assertRaises(TypeError):
@@ -42,7 +48,81 @@
p = zstd.get_compression_parameters(1)
self.assertIsInstance(p, zstd.CompressionParameters)
- self.assertEqual(p[0], 19)
+ self.assertEqual(p.window_log, 19)
+
+ def test_members(self):
+ p = zstd.CompressionParameters(10, 6, 7, 4, 5, 8, 1)
+ self.assertEqual(p.window_log, 10)
+ self.assertEqual(p.chain_log, 6)
+ self.assertEqual(p.hash_log, 7)
+ self.assertEqual(p.search_log, 4)
+ self.assertEqual(p.search_length, 5)
+ self.assertEqual(p.target_length, 8)
+ self.assertEqual(p.strategy, 1)
+
+
+@make_cffi
+class TestFrameParameters(unittest.TestCase):
+ def test_invalid_type(self):
+ with self.assertRaises(TypeError):
+ zstd.get_frame_parameters(None)
+
+ with self.assertRaises(TypeError):
+ zstd.get_frame_parameters(u'foobarbaz')
+
+ def test_invalid_input_sizes(self):
+ with self.assertRaisesRegexp(zstd.ZstdError, 'not enough data for frame'):
+ zstd.get_frame_parameters(b'')
+
+ with self.assertRaisesRegexp(zstd.ZstdError, 'not enough data for frame'):
+ zstd.get_frame_parameters(zstd.FRAME_HEADER)
+
+ def test_invalid_frame(self):
+ with self.assertRaisesRegexp(zstd.ZstdError, 'Unknown frame descriptor'):
+ zstd.get_frame_parameters(b'foobarbaz')
+
+ def test_attributes(self):
+ params = zstd.get_frame_parameters(zstd.FRAME_HEADER + b'\x00\x00')
+ self.assertEqual(params.content_size, 0)
+ self.assertEqual(params.window_size, 1024)
+ self.assertEqual(params.dict_id, 0)
+ self.assertFalse(params.has_checksum)
+
+ # Lowest 2 bits indicate a dictionary and length. Here, the dict id is 1 byte.
+ params = zstd.get_frame_parameters(zstd.FRAME_HEADER + b'\x01\x00\xff')
+ self.assertEqual(params.content_size, 0)
+ self.assertEqual(params.window_size, 1024)
+ self.assertEqual(params.dict_id, 255)
+ self.assertFalse(params.has_checksum)
+
+ # Lowest 3rd bit indicates if checksum is present.
+ params = zstd.get_frame_parameters(zstd.FRAME_HEADER + b'\x04\x00')
+ self.assertEqual(params.content_size, 0)
+ self.assertEqual(params.window_size, 1024)
+ self.assertEqual(params.dict_id, 0)
+ self.assertTrue(params.has_checksum)
+
+ # Upper 2 bits indicate content size.
+ params = zstd.get_frame_parameters(zstd.FRAME_HEADER + b'\x40\x00\xff\x00')
+ self.assertEqual(params.content_size, 511)
+ self.assertEqual(params.window_size, 1024)
+ self.assertEqual(params.dict_id, 0)
+ self.assertFalse(params.has_checksum)
+
+ # Window descriptor is 2nd byte after frame header.
+ params = zstd.get_frame_parameters(zstd.FRAME_HEADER + b'\x00\x40')
+ self.assertEqual(params.content_size, 0)
+ self.assertEqual(params.window_size, 262144)
+ self.assertEqual(params.dict_id, 0)
+ self.assertFalse(params.has_checksum)
+
+ # Set multiple things.
+ params = zstd.get_frame_parameters(zstd.FRAME_HEADER + b'\x45\x40\x0f\x10\x00')
+ self.assertEqual(params.content_size, 272)
+ self.assertEqual(params.window_size, 262144)
+ self.assertEqual(params.dict_id, 15)
+ self.assertTrue(params.has_checksum)
+
if hypothesis:
s_windowlog = strategies.integers(min_value=zstd.WINDOWLOG_MIN,
@@ -65,6 +145,8 @@
zstd.STRATEGY_BTLAZY2,
zstd.STRATEGY_BTOPT))
+
+ @make_cffi
class TestCompressionParametersHypothesis(unittest.TestCase):
@hypothesis.given(s_windowlog, s_chainlog, s_hashlog, s_searchlog,
s_searchlength, s_targetlength, s_strategy)
@@ -73,9 +155,6 @@
p = zstd.CompressionParameters(windowlog, chainlog, hashlog,
searchlog, searchlength,
targetlength, strategy)
- self.assertEqual(tuple(p),
- (windowlog, chainlog, hashlog, searchlog,
- searchlength, targetlength, strategy))
# Verify we can instantiate a compressor with the supplied values.
# ZSTD_checkCParams moves the goal posts on us from what's advertised