diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-10 03:51:25 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-10 03:51:25 +0000 |
commit | 1a853390ee08af1b8ff3d1882a8762155d151306 (patch) | |
tree | 8030dbf1de6795427da40016d6041c8a08a2bca5 /test/zlib | |
parent | 25f037377c9a537f624ba0f4d8e058fae84071db (diff) | |
download | ruby-1a853390ee08af1b8ff3d1882a8762155d151306.tar.gz |
* ext/zlib/zlib.c: Revert r36349. Added streaming support to inflate
processing. rb_block_given_p() is not callable without the GVL.
* ext/zlib/extconf.rb: ditto
* NEWS: ditto
* test/zlib/test_zlib.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/zlib')
-rw-r--r-- | test/zlib/test_zlib.rb | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index aa3486359c..61e24e4d44 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -39,62 +39,6 @@ if defined? Zlib assert_raise(Zlib::StreamError) { Zlib::Deflate.deflate("foo", 10000) } end - def test_deflate_chunked - original = '' - chunks = [] - r = Random.new 0 - - z = Zlib::Deflate.new - - 2.times do - input = r.bytes(20000) - original << input - z.deflate(input) do |chunk| - chunks << chunk - end - end - - assert_equal [16384, 16384], - chunks.map { |chunk| chunk.length } - - final = z.finish - - assert_equal 7253, final.length - - chunks << final - all = chunks.join - - inflated = Zlib.inflate all - - assert_equal original, inflated - end - - def test_deflate_chunked_break - chunks = [] - r = Random.new 0 - - z = Zlib::Deflate.new - - input = r.bytes(20000) - z.deflate(input) do |chunk| - chunks << chunk - break - end - - assert_equal [16384], chunks.map { |chunk| chunk.length } - - final = z.finish - - assert_equal 3632, final.length - - all = chunks.join - all << final - - original = Zlib.inflate all - - assert_equal input, original - end - def test_addstr z = Zlib::Deflate.new z << "foo" @@ -258,38 +202,6 @@ if defined? Zlib assert_equal "foofoofoo", out end - def test_finish_chunked - # zeros = Zlib::Deflate.deflate("0" * 100_000) - zeros = "x\234\355\3011\001\000\000\000\302\240J\353\237\316\032\036@" \ - "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\257\006\351\247BH" - - chunks = [] - - z = Zlib::Inflate.new - - z.inflate(zeros) do |chunk| - chunks << chunk - break - end - - z.finish do |chunk| - chunks << chunk - end - - assert_equal [16384, 16384, 16384, 16384, 16384, 16384, 1696], - chunks.map { |chunk| chunk.size } - - assert chunks.all? { |chunk| - chunk =~ /\A0+\z/ - } - end - def test_inflate s = Zlib::Deflate.deflate("foo") z = Zlib::Inflate.new @@ -319,58 +231,6 @@ if defined? Zlib assert_equal "\0", inflated end - def test_inflate_chunked - # s = Zlib::Deflate.deflate("0" * 100_000) - zeros = "x\234\355\3011\001\000\000\000\302\240J\353\237\316\032\036@" \ - "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\257\006\351\247BH" - - chunks = [] - - z = Zlib::Inflate.new - - z.inflate(zeros) do |chunk| - chunks << chunk - end - - assert_equal [16384, 16384, 16384, 16384, 16384, 16384, 1696], - chunks.map { |chunk| chunk.size } - - assert chunks.all? { |chunk| - chunk =~ /\A0+\z/ - } - end - - def test_inflate_chunked_break - # zeros = Zlib::Deflate.deflate("0" * 100_000) - zeros = "x\234\355\3011\001\000\000\000\302\240J\353\237\316\032\036@" \ - "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" \ - "\000\000\000\000\000\000\000\257\006\351\247BH" - - chunks = [] - - z = Zlib::Inflate.new - - z.inflate(zeros) do |chunk| - chunks << chunk - break - end - - out = z.inflate nil - - assert_equal 100_000 - chunks.first.length, out.length - end - def test_inflate_dictionary dictionary = "foo" @@ -1036,18 +896,5 @@ if defined? Zlib def test_deflate TestZlibDeflate.new(__name__).test_deflate end - - def test_deflate_stream - r = Random.new 0 - - deflated = '' - - Zlib.deflate(r.bytes(20000)) do |chunk| - deflated << chunk - end - - assert_equal 20016, deflated.length - end - end end |