summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/rss/dot.pngbin0 -> 111 bytes
-rw-r--r--test/rss/rss-assertions.rb16
-rw-r--r--test/rss/test_atom.rb17
4 files changed, 16 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 100a673..ae5f613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 28 21:32:17 2008 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rss/: use PNG instead of zlib as binary data.
+
Mon Jul 28 21:24:33 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* thread_win32.[ch] (cond_every_entry, rb_thread_cond_struct): reverted
diff --git a/test/rss/dot.png b/test/rss/dot.png
new file mode 100644
index 0000000..9c6960f
--- /dev/null
+++ b/test/rss/dot.png
Binary files differ
diff --git a/test/rss/rss-assertions.rb b/test/rss/rss-assertions.rb
index f396e9a..12e53f7 100644
--- a/test/rss/rss-assertions.rb
+++ b/test/rss/rss-assertions.rb
@@ -557,20 +557,16 @@ 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!
+ png_file = File.join(File.dirname(__FILE__), "dot.png")
+ png = File.open(png_file, "rb") do |file|
+ file.read.force_encoding("binary")
end
- base64_content = [Zlib::Deflate.deflate(text)].pack("m").delete("\n")
+ base64_content = [png].pack("m").delete("\n")
[false, true].each do |with_space|
xml_content = base64_content
@@ -591,7 +587,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 1f65008..71e0f44 100644
--- a/test/rss/test_atom.rb
+++ b/test/rss/test_atom.rb
@@ -641,24 +641,19 @@ 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!
+ type = "image/png"
+ png_file = File.join(File.dirname(__FILE__), "dot.png")
+ original_content = File.open(png_file, "rb") do |file|
+ file.read.force_encoding("binary")
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},
- [original_content].pack("m").delete("\n"), xml)
+ [original_content].pack("m").delete("\n"),
+ xml)
end
end