diff options
| author | xibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-24 14:43:05 +0000 |
|---|---|---|
| committer | xibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-24 14:43:05 +0000 |
| commit | 0f6375be69ecbeb5a98596d61ba196979e1dbe08 (patch) | |
| tree | 15f0ad0e9367435081322b627f4108262c1daef6 /test/cgi | |
| parent | 3c419de10b113aceea7db10eb0d4521086696bc9 (diff) | |
* test/cgi/test_cgi_multipart.rb : revert last change.
( deprecated is assert_raises. )
* test/cgi/test_cgi_core.rb : ditto.
* test/cgi/test_cgi_header.rb : ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/cgi')
| -rwxr-xr-x | test/cgi/test_cgi_core.rb | 8 | ||||
| -rwxr-xr-x | test/cgi/test_cgi_header.rb | 2 | ||||
| -rwxr-xr-x | test/cgi/test_cgi_multipart.rb | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/cgi/test_cgi_core.rb b/test/cgi/test_cgi_core.rb index 1298ae792d..9e6e61819a 100755 --- a/test/cgi/test_cgi_core.rb +++ b/test/cgi/test_cgi_core.rb @@ -122,7 +122,7 @@ class CGICoreTest < Test::Unit::TestCase assert_equal({"str"=>"\xBE\xBE\xB9\xBE".force_encoding("ASCII-8BIT")},hash) $stdin.rewind - assert_raises(CGI::InvalidEncoding) do + assert_raise(CGI::InvalidEncoding) do cgi = CGI.new(:accept_charset=>"UTF-8") end @@ -148,7 +148,7 @@ class CGICoreTest < Test::Unit::TestCase } ENV.update(@environ) cgi = CGI.new - refute_nil(cgi.cookies) + assert_not_equal(nil,cgi.cookies) [ ['_session_id', ['12345'], ], ['name1', ['val1', 'val2'], ], ].each do |key, expected| @@ -169,7 +169,7 @@ class CGICoreTest < Test::Unit::TestCase 'CONTENT_LENGTH' => (64 * 1024 * 1024).to_s } ENV.update(@environ) - ex = assert_raises(StandardError) do + ex = assert_raise(StandardError) do cgi = CGI.new end assert_equal("too large post data.", ex.message) @@ -323,7 +323,7 @@ class CGICoreTest < Test::Unit::TestCase ENV.update(@environ) ## no htmltype cgi = CGI.new - assert_raises(NoMethodError) do cgi.doctype end + assert_raise(NoMethodError) do cgi.doctype end ## html3 cgi = CGI.new('html3') expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">' diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb index 7c131f867c..58f82ba3bc 100755 --- a/test/cgi/test_cgi_header.rb +++ b/test/cgi/test_cgi_header.rb @@ -76,7 +76,7 @@ class CGIHeaderTest < Test::Unit::TestCase else expected = NoMethodError # for Ruby1.8 end - ex = assert_raises(expected) do + ex = assert_raise(expected) do cgi.header(nil) end end diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb index c4ec833f84..18eb741d77 100755 --- a/test/cgi/test_cgi_multipart.rb +++ b/test/cgi/test_cgi_multipart.rb @@ -213,7 +213,7 @@ class CGIMultipartTest < Test::Unit::TestCase ] original = _set_const(CGI, :MAX_MULTIPART_LENGTH, 2 * 1024) begin - ex = assert_raises(StandardError) do + ex = assert_raise(StandardError) do _test_multipart() end assert_equal("too large multipart data.", ex.message) @@ -232,7 +232,7 @@ class CGIMultipartTest < Test::Unit::TestCase 500.times { @data << item } #original = _set_const(CGI, :MAX_MULTIPART_COUNT, 128) begin - ex = assert_raises(StandardError) do + ex = assert_raise(StandardError) do _test_multipart() end assert_equal("too many parameters.", ex.message) @@ -253,7 +253,7 @@ class CGIMultipartTest < Test::Unit::TestCase #p input2 input2 end - ex = assert_raises(EOFError) do + ex = assert_raise(EOFError) do cgi = CGI.new end assert_equal("bad boundary end of body part", ex.message) @@ -264,7 +264,7 @@ class CGIMultipartTest < Test::Unit::TestCase #p input2 input2 end - ex = assert_raises(EOFError) do + ex = assert_raise(EOFError) do cgi = CGI.new end assert_equal("bad content body", ex.message) |