* lib/optparse.rb (OptionParser#order, #permute, #parse): allow an

  array as argument.

* test/ruby/test_*.rb: moved invariants to left side in
  assert_equal, and use assert_nil, assert_raises and so on.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 8 deletions

diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index eabeedc38..61240cd65 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -9,18 +9,16 @@ class TestSignal < Test::Unit::TestCase
       trap "SIGINT", proc{|sig| $x = 2}
       Process.kill "SIGINT", $$
       sleep 0.1
-      assert_equal($x, 2)
-    
+      assert_equal(2, $x)
+
       trap "SIGINT", proc{raise "Interrupt"}
-    
-      x = false
-      begin
+
+      x = assert_raises(RuntimeError) do
         Process.kill "SIGINT", $$
         sleep 0.1
-      rescue
-        x = $!
       end
-      assert(x && /Interrupt/ =~ x.message)
+      assert(x)
+      assert_match(/Interrupt/, x.message)
     end
   end
 end