diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 18:17:59 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 18:17:59 +0000 |
commit | 202ac43838852cfb15a163e46861e0b49b66926b (patch) | |
tree | bc24428981760f434932564e1f44be8c88824356 /test/rss | |
parent | 88655573fcf6d8bc57bdd4441222ee54ecf66ef5 (diff) |
merge revision(s) 18246:
* test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rss')
-rw-r--r-- | test/rss/dot.png | bin | 0 -> 111 bytes | |||
-rw-r--r-- | test/rss/rss-assertions.rb | 16 | ||||
-rw-r--r-- | test/rss/test_atom.rb | 17 |
3 files changed, 10 insertions, 23 deletions
diff --git a/test/rss/dot.png b/test/rss/dot.png Binary files differnew file mode 100644 index 0000000000..9c6960fa2f --- /dev/null +++ b/test/rss/dot.png diff --git a/test/rss/rss-assertions.rb b/test/rss/rss-assertions.rb index 41e6cd62c5..0d0d2cbe4f 100644 --- a/test/rss/rss-assertions.rb +++ b/test/rss/rss-assertions.rb @@ -557,20 +557,14 @@ EOA 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 @@ EOA 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) diff --git a/test/rss/test_atom.rb b/test/rss/test_atom.rb index c442c753b2..d573b923cc 100644 --- a/test/rss/test_atom.rb +++ b/test/rss/test_atom.rb @@ -641,24 +641,17 @@ module RSS def assert_atom_content_inline_other_base64_to_s(target_class) _wrap_assertion do - require "zlib" - - text = "" - char = "a" - 100.times do |i| - text << char - char.succ! - end - - type = "application/zip" - original_content = Zlib::Deflate.deflate(text) + type = "image/png" + png_file = File.join(File.dirname(__FILE__), "dot.png") + original_content = File.open(png_file, "rb") {|file| file.read} 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 |