summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-01 18:17:59 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-01 18:17:59 (GMT)
commit202ac43838852cfb15a163e46861e0b49b66926b (patch)
treebc24428981760f434932564e1f44be8c88824356
parent88655573fcf6d8bc57bdd4441222ee54ecf66ef5 (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
-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
-rw-r--r--version.h14
5 files changed, 22 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 24d196f..3c00424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 2 03:08:47 2009 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]
+
Tue Nov 11 01:07:32 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* configure.in: fix SEGV on Mac OS X 10.5.3 with --enable-pthread.
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 41e6cd6..0d0d2cb 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 c442c75..d573b92 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
diff --git a/version.h b/version.h
index a61ebe8..fc27b81 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-11-11"
+#define RUBY_RELEASE_DATE "2009-01-02"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081111
-#define RUBY_PATCHLEVEL 73
+#define RUBY_RELEASE_CODE 20090102
+#define RUBY_PATCHLEVEL 74
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
-#define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_YEAR 2009
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 2
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
@@ -29,3 +29,5 @@ RUBY_EXTERN const char *ruby_copyright;
#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
+
+