--- a/contrib/python-zstandard/tests/test_data_structures_fuzzing.py Thu Apr 04 15:24:03 2019 -0700
+++ b/contrib/python-zstandard/tests/test_data_structures_fuzzing.py Thu Apr 04 17:34:43 2019 -0700
@@ -24,8 +24,8 @@
max_value=zstd.HASHLOG_MAX)
s_searchlog = strategies.integers(min_value=zstd.SEARCHLOG_MIN,
max_value=zstd.SEARCHLOG_MAX)
-s_searchlength = strategies.integers(min_value=zstd.SEARCHLENGTH_MIN,
- max_value=zstd.SEARCHLENGTH_MAX)
+s_minmatch = strategies.integers(min_value=zstd.MINMATCH_MIN,
+ max_value=zstd.MINMATCH_MAX)
s_targetlength = strategies.integers(min_value=zstd.TARGETLENGTH_MIN,
max_value=zstd.TARGETLENGTH_MAX)
s_strategy = strategies.sampled_from((zstd.STRATEGY_FAST,
@@ -35,41 +35,42 @@
zstd.STRATEGY_LAZY2,
zstd.STRATEGY_BTLAZY2,
zstd.STRATEGY_BTOPT,
- zstd.STRATEGY_BTULTRA))
+ zstd.STRATEGY_BTULTRA,
+ zstd.STRATEGY_BTULTRA2))
@make_cffi
@unittest.skipUnless('ZSTD_SLOW_TESTS' in os.environ, 'ZSTD_SLOW_TESTS not set')
class TestCompressionParametersHypothesis(unittest.TestCase):
@hypothesis.given(s_windowlog, s_chainlog, s_hashlog, s_searchlog,
- s_searchlength, s_targetlength, s_strategy)
+ s_minmatch, s_targetlength, s_strategy)
def test_valid_init(self, windowlog, chainlog, hashlog, searchlog,
- searchlength, targetlength, strategy):
+ minmatch, targetlength, strategy):
zstd.ZstdCompressionParameters(window_log=windowlog,
chain_log=chainlog,
hash_log=hashlog,
search_log=searchlog,
- min_match=searchlength,
+ min_match=minmatch,
target_length=targetlength,
- compression_strategy=strategy)
+ strategy=strategy)
@hypothesis.given(s_windowlog, s_chainlog, s_hashlog, s_searchlog,
- s_searchlength, s_targetlength, s_strategy)
+ s_minmatch, s_targetlength, s_strategy)
def test_estimated_compression_context_size(self, windowlog, chainlog,
hashlog, searchlog,
- searchlength, targetlength,
+ minmatch, targetlength,
strategy):
- if searchlength == zstd.SEARCHLENGTH_MIN and strategy in (zstd.STRATEGY_FAST, zstd.STRATEGY_GREEDY):
- searchlength += 1
- elif searchlength == zstd.SEARCHLENGTH_MAX and strategy != zstd.STRATEGY_FAST:
- searchlength -= 1
+ if minmatch == zstd.MINMATCH_MIN and strategy in (zstd.STRATEGY_FAST, zstd.STRATEGY_GREEDY):
+ minmatch += 1
+ elif minmatch == zstd.MINMATCH_MAX and strategy != zstd.STRATEGY_FAST:
+ minmatch -= 1
p = zstd.ZstdCompressionParameters(window_log=windowlog,
chain_log=chainlog,
hash_log=hashlog,
search_log=searchlog,
- min_match=searchlength,
+ min_match=minmatch,
target_length=targetlength,
- compression_strategy=strategy)
+ strategy=strategy)
size = p.estimated_compression_context_size()