diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-28 13:41:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-28 13:41:03 +0000 |
commit | 73dae42f511b359a1c649b253a3558cc129db91e (patch) | |
tree | 953b079ce51ba850c0f9127a47aac3d0c2cb0859 /test/zlib | |
parent | bb40ff921676511a54c171a83dc3f3afe8b617f3 (diff) |
merges r30772,r30773 and r30776 from trunk into ruby_1_9_2.
--
* ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_new_shared
because gz->z.input is hidden string. [ruby-core:35057]
--
e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
--
* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
before rb_str_resurrect.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/zlib')
-rw-r--r-- | test/zlib/test_zlib.rb | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index 6b13cf6026..5432ce2c1a 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -86,7 +86,7 @@ if defined? Zlib def test_adler z = Zlib::Deflate.new z << "foo" - s = z.finish + z.finish assert_equal(0x02820145, z.adler) end @@ -95,7 +95,7 @@ if defined? Zlib assert_equal(false, z.finished?) z << "foo" assert_equal(false, z.finished?) - s = z.finish + z.finish assert_equal(true, z.finished?) z.close assert_raise(Zlib::Error) { z.finished? } @@ -459,12 +459,40 @@ if defined? Zlib t.close Zlib::GzipWriter.open(t.path) {|gz| gz.print("foobar") } - f = Zlib::GzipReader.open(t.path) - assert_equal("foo", f.read(3)) - f.unused - assert_equal("bar", f.read) - f.unused - f.close + Zlib::GzipReader.open(t.path) do |f| + assert_equal(nil, f.unused) + assert_equal("foo", f.read(3)) + assert_equal(nil, f.unused) + assert_equal("bar", f.read) + assert_equal(nil, f.unused) + end + end + + def test_unused2 + zio = StringIO.new + + io = Zlib::GzipWriter.new zio + io.write 'aaaa' + io.finish + + io = Zlib::GzipWriter.new zio + io.write 'bbbb' + io.finish + + zio.rewind + + io = Zlib::GzipReader.new zio + assert_equal('aaaa', io.read) + unused = io.unused + assert_equal(24, unused.bytesize) + io.finish + + zio.pos -= unused.length + + io = Zlib::GzipReader.new zio + assert_equal('bbbb', io.read) + assert_equal(nil, io.unused) + io.finish end def test_read |