kou	2008-07-28 21:33:44 +0900 (Mon, 28 Jul 2008)

  New Revision: 18249

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18249

  Log:
    * test/rss/: use PNG instead of zlib as binary data.

  Added files:
    trunk/test/rss/dot.png
  Modified files:
    trunk/ChangeLog
    trunk/test/rss/rss-assertions.rb
    trunk/test/rss/test_atom.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18248)
+++ ChangeLog	(revision 18249)
@@ -1,3 +1,7 @@
+Mon Jul 28 21:32:17 2008  Kouhei Sutou  <kou@c...>
+
+	* test/rss/: use PNG instead of zlib as binary data.
+
 Mon Jul 28 21:24:33 2008  NAKAMURA Usaku  <usa@r...>
 
 	* thread_win32.[ch] (cond_every_entry, rb_thread_cond_struct): reverted
Index: test/rss/rss-assertions.rb
===================================================================
--- test/rss/rss-assertions.rb	(revision 18248)
+++ test/rss/rss-assertions.rb	(revision 18249)
@@ -557,20 +557,16 @@
 
     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 @@
           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
___________________________________________________________________
Name: svn:mime-type
   + image/png

Index: test/rss/test_atom.rb
===================================================================
--- test/rss/test_atom.rb	(revision 18248)
+++ test/rss/test_atom.rb	(revision 18249)
@@ -641,24 +641,19 @@
 
     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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/