From 4c9968c9d9775a442346b0bd6d53e4bd95f69c15 Mon Sep 17 00:00:00 2001 From: mrkn Date: Mon, 23 Jan 2012 01:09:06 +0000 Subject: [PATCH] * test/cgi/test_cgi_util.rb (test_cgi_escape_preserve_encoding): add a test for CGI::escape to preserve encoding. * test/cgi/test_cgi_util.rb (test_cgi_unescape_preserve_encoding): add a test for CGI::unescape to preserve encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ test/cgi/test_cgi_util.rb | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3aab9c9c37..912ad62e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 23 10:08:00 2012 Kenta Murata + + * test/cgi/test_cgi_util.rb (test_cgi_escape_preserve_encoding): + add a test for CGI::escape to preserve encoding. + + * test/cgi/test_cgi_util.rb (test_cgi_unescape_preserve_encoding): + add a test for CGI::unescape to preserve encoding. + Mon Jan 23 00:45:34 2012 Akinori MUSHA * misc/rdoc-mode.el (rdoc-imenu-create-index): Add imenu support diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb index f34703e9d8..a291d47f99 100644 --- a/test/cgi/test_cgi_util.rb +++ b/test/cgi/test_cgi_util.rb @@ -30,12 +30,24 @@ class CGIUtilTest < Test::Unit::TestCase end end + def test_cgi_escape_preserve_encoding + assert_equal(Encoding::US_ASCII, CGI::escape("\xC0<<".force_encoding("US-ASCII")).encoding) + assert_equal(Encoding::ASCII_8BIT, CGI::escape("\xC0<<".force_encoding("ASCII-8BIT")).encoding) + assert_equal(Encoding::UTF_8, CGI::escape("\xC0<<".force_encoding("UTF-8")).encoding) + end + def test_cgi_unescape assert_equal(@str1, CGI::unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93')) assert_equal(@str1.encoding, CGI::unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93').encoding) if defined?(::Encoding) assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2")) end + def test_cgi_unescape_preserve_encoding + assert_equal(Encoding::US_ASCII, CGI::unescape("%C0%3C%3C".force_encoding("US-ASCII")).encoding) + assert_equal(Encoding::ASCII_8BIT, CGI::unescape("%C0%3C%3C".force_encoding("ASCII-8BIT")).encoding) + assert_equal(Encoding::UTF_8, CGI::unescape("%C0%3C%3C".force_encoding("UTF-8")).encoding) + end + def test_cgi_pretty assert_equal("\n \n \n\n",CGI::pretty("")) assert_equal("\n\t\n\t\n\n",CGI::pretty("","\t"))