* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@4516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb
index 999457f917..e53778f75f 100644
--- a/test/ruby/test_defined.rb
+++ b/test/ruby/test_defined.rb
@@ -22,20 +22,20 @@ class TestDefined < Test::Unit::TestCase
     $x = nil
 
     assert(defined?($x))		# global variable
-    assert_equal(defined?($x), 'global-variable')# returns description
-    
+    assert_equal('global-variable', defined?($x))# returns description
+
     foo=5
     assert(defined?(foo))		# local variable
-    
+
     assert(defined?(::Array))		# constant	!! Array -> ::Array
     assert(defined?(Object.new))	# method
     assert(!defined?(Object.print))	# private method
     assert(defined?(1 == 2))		# operator expression
-    
+
     f = Foo.new
-    assert_equal(defined?(f.foo), nil)
+    assert_nil(defined?(f.foo))
     f.bar(f) { |v| assert(v) }
-    
+
     assert(defined_test)		# not iterator
     assert(!defined_test{})	# called as iterator
   end