From 5fa0da6490460be463dda0351d988b4d107941ae Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 23 Dec 2009 00:14:48 +0000 Subject: * test/cgi: check by Encoding. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/cgi/test_cgi_util.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/cgi/test_cgi_util.rb') diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb index 3a891d617..479df6815 100644 --- a/test/cgi/test_cgi_util.rb +++ b/test/cgi/test_cgi_util.rb @@ -9,7 +9,7 @@ class CGIUtilTest < Test::Unit::TestCase def setup ENV['REQUEST_METHOD'] = 'GET' @str1="&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93" - @str1.force_encoding("UTF-8") if RUBY_VERSION>="1.9" + @str1.force_encoding("UTF-8") if defined?(::Encoding) end def teardown @@ -21,12 +21,12 @@ class CGIUtilTest < Test::Unit::TestCase def test_cgi_escape assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI::escape(@str1)) - assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI::escape(@str1).ascii_only?) if RUBY_VERSION>="1.9" + assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI::escape(@str1).ascii_only?) if defined?(::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 RUBY_VERSION>="1.9" + 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) end def test_cgi_pretty -- cgit