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

diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb
index 9ad5bd4338..dfacceb629 100644
--- a/test/ruby/test_const.rb
+++ b/test/ruby/test_const.rb
@@ -5,31 +5,31 @@ $KCODE = 'none'
 class TestConst < Test::Unit::TestCase
   TEST1 = 1
   TEST2 = 2
-    
+
   module Const
     TEST3 = 3
     TEST4 = 4
   end
-    
+
   module Const2
     TEST3 = 6
     TEST4 = 8
   end
-    
+
   def test_const
     self.class.class_eval {
       include Const
     }
-    assert_equal([TEST1,TEST2,TEST3,TEST4], [1,2,3,4])
-    
+    assert_equal([1,2,3,4], [TEST1,TEST2,TEST3,TEST4])
+
     self.class.class_eval {
       include Const2
     }
     STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE
-    assert_equal([TEST1,TEST2,TEST3,TEST4], [1,2,6,8])
-    
-    assert_equal((String <=> Object), -1)
-    assert_equal((Object <=> String), 1)
-    assert_equal((Array <=> String), nil)
+    assert_equal([1,2,6,8], [TEST1,TEST2,TEST3,TEST4])
+
+    assert_equal(-1, (String <=> Object))
+    assert_equal(1, (Object <=> String))
+    assert_equal(nil, (Array <=> String))
   end
 end