* 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, 7 insertions, 18 deletions

diff --git a/test/ruby/test_call.rb b/test/ruby/test_call.rb
index c92b8b0ae..7694d5196 100644
--- a/test/ruby/test_call.rb
+++ b/test/ruby/test_call.rb
@@ -10,23 +10,12 @@ class TestCall < Test::Unit::TestCase
   end
 
   def test_call
-    begin
-      aaa()				# need at least 1 arg
-      assert(false)
-    rescue
-      assert(true)
-    end
-    
-    begin
-      aaa				# no arg given (exception raised)
-      assert(false)
-    rescue
-      assert(true)
-    end
-    
-    assert_equal(aaa(1), [1, 100])
-    assert_equal(aaa(1, 2), [1, 2])
-    assert_equal(aaa(1, 2, 3, 4), [1, 2, 3, 4])
-    assert_equal(aaa(1, *[2, 3, 4]), [1, 2, 3, 4])
+    assert_raises(ArgumentError) {aaa()}
+    assert_raises(ArgumentError) {aaa}
+
+    assert_equal([1, 100], aaa(1))
+    assert_equal([1, 2], aaa(1, 2))
+    assert_equal([1, 2, 3, 4], aaa(1, 2, 3, 4))
+    assert_equal([1, 2, 3, 4], aaa(1, *[2, 3, 4]))
   end
 end