ruby-changes:7992

xibbar	2008-09-24 15:25:44 +0900 (Wed, 24 Sep 2008)

  New Revision: 19516

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

  Log:
    * test/cgi/test_cgi_multipart.rb : test for miniunit.
    * test/cgi/test_cgi_core.rb      : ditto.
    * test/cgi/test_cgi_header.rb    : ditto.

  Modified files:
    trunk/ChangeLog
    trunk/test/cgi/test_cgi_core.rb
    trunk/test/cgi/test_cgi_header.rb
    trunk/test/cgi/test_cgi_multipart.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19515)
+++ ChangeLog	(revision 19516)
@@ -1,3 +1,9 @@
+Wed Sep 24 15:13:04 2008  Takeyuki Fujioka  <xibbar@r...>
+
+	* test/cgi/test_cgi_multipart.rb : test for miniunit.
+	* test/cgi/test_cgi_core.rb      : ditto.
+	* test/cgi/test_cgi_header.rb    : ditto.
+
 Wed Sep 24 14:38:29 2008  NAKAMURA Usaku  <usa@r...>
 
 	* lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
Index: test/cgi/test_cgi_multipart.rb
===================================================================
--- test/cgi/test_cgi_multipart.rb	(revision 19515)
+++ test/cgi/test_cgi_multipart.rb	(revision 19516)
@@ -213,7 +213,7 @@
     ]
     original = _set_const(CGI, :MAX_MULTIPART_LENGTH, 2 * 1024)
     begin
-      ex = assert_raise(StandardError) do
+      ex = assert_raises(StandardError) do
         _test_multipart()
       end
       assert_equal("too large multipart data.", ex.message)
@@ -232,7 +232,7 @@
     500.times { @data << item }
     #original = _set_const(CGI, :MAX_MULTIPART_COUNT, 128)
     begin
-      ex = assert_raise(StandardError) do
+      ex = assert_raises(StandardError) do
         _test_multipart()
       end
       assert_equal("too many parameters.", ex.message)
@@ -253,7 +253,7 @@
       #p input2
       input2
     end
-    ex = assert_raise(EOFError) do
+    ex = assert_raises(EOFError) do
       cgi = CGI.new
     end
     assert_equal("bad boundary end of body part", ex.message)
@@ -264,7 +264,7 @@
       #p input2
       input2
     end
-    ex = assert_raise(EOFError) do
+    ex = assert_raises(EOFError) do
       cgi = CGI.new
     end
     assert_equal("bad content body", ex.message)
Index: test/cgi/test_cgi_core.rb
===================================================================
--- test/cgi/test_cgi_core.rb	(revision 19515)
+++ test/cgi/test_cgi_core.rb	(revision 19516)
@@ -110,7 +110,7 @@
     }
     ENV.update(@environ)
     cgi = CGI.new
-    assert_not_nil(cgi.cookies)
+    refute_nil(cgi.cookies)
     [ ['_session_id', ['12345'],        ],
       ['name1',       ['val1', 'val2'], ],
     ].each do |key, expected|
@@ -131,7 +131,7 @@
       'CONTENT_LENGTH'  => (64 * 1024 * 1024).to_s
     }
     ENV.update(@environ)
-    ex = assert_raise(StandardError) do
+    ex = assert_raises(StandardError) do
       cgi = CGI.new
     end
     assert_equal("too large post data.", ex.message)
@@ -285,7 +285,7 @@
     ENV.update(@environ)
     ## no htmltype
     cgi = CGI.new
-    assert_raise(NoMethodError) do cgi.doctype end
+    assert_raises(NoMethodError) do cgi.doctype end
     ## html3
     cgi = CGI.new('html3')
     expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
Index: test/cgi/test_cgi_header.rb
===================================================================
--- test/cgi/test_cgi_header.rb	(revision 19515)
+++ test/cgi/test_cgi_header.rb	(revision 19516)
@@ -76,7 +76,7 @@
     else
       expected = NoMethodError   # for Ruby1.8
     end
-    ex = assert_raise(expected) do
+    ex = assert_raises(expected) do
       cgi.header(nil)
     end
   end

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