ruby-1.8.7-p74
ChangeLog
Fri Jan 2 03:08:47 2009 Kouhei Sutou <kou@...> * test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]
ソースコードの修正内容
Index: test/rss/rss-assertions.rb =================================================================== --- test/rss/rss-assertions.rb (.../v1_8_7_73) (revision 22262) +++ test/rss/rss-assertions.rb (.../v1_8_7_74) (revision 22262) @@ -557,20 +557,14 @@ def assert_atom_content_inline_other_text(generator) _wrap_assertion do - require "zlib" - - type = "application/zip" + type = "image/png" assert_parse(generator.call(<<-EOA), :nothing_raised) <content type="#{type}"/> EOA - text = "" - char = "a" - 100.times do |i| - text << char - char.succ! - end - base64_content = Base64.encode64(Zlib::Deflate.deflate(text)) + png_file = File.join(File.dirname(__FILE__), "dot.png") + png = File.open(png_file, "rb") {|file| file.read} + base64_content = [png].pack("m").delete("\n") [false, true].each do |with_space| xml_content = base64_content @@ -591,7 +585,7 @@ assert(content.inline_other_base64?) assert(!content.out_of_line?) assert(!content.have_xml_content?) - assert_equal(text, Zlib::Inflate.inflate(content.content)) + assert_equal(png, content.content) xml = REXML::Document.new(content.to_s).root assert_rexml_element([], {"type" => type}, base64_content, xml) Index: test/rss/dot.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/png Property changes on: test/rss/dot.png ___________________________________________________________________ Added: svn:mime-type + image/png Index: test/rss/test_atom.rb =================================================================== --- test/rss/test_atom.rb (.../v1_8_7_73) (revision 22262) +++ test/rss/test_atom.rb (.../v1_8_7_74) (revision 22262) @@ -641,24 +641,17 @@ def assert_atom_content_inline_other_base64_to_s(target_class) _wrap_assertion do - require "zlib" + type = "image/png" + png_file = File.join(File.dirname(__FILE__), "dot.png") + original_content = File.open(png_file, "rb") {|file| file.read} - text = "" - char = "a" - 100.times do |i| - text << char - char.succ! - end - - type = "application/zip" - original_content = Zlib::Deflate.deflate(text) - content = target_class.new content.type = type content.content = original_content xml = REXML::Document.new(content.to_s).root assert_rexml_element([], {"type" => type}, - Base64.encode64(original_content), xml) + [original_content].pack("m").delete("\n"), + xml) end end
修正の影響や注意点
特になし。