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

diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 893bc3f1a1..2076f7bbac 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -5,13 +5,13 @@ $KCODE = 'none'
 class TestProc < Test::Unit::TestCase
   def test_proc
     $proc = proc{|i| i}
-    assert_equal($proc.call(2), 2)
-    assert_equal($proc.call(3), 3)
-    
+    assert_equal(2, $proc.call(2))
+    assert_equal(3, $proc.call(3))
+
     $proc = proc{|i| i*2}
-    assert_equal($proc.call(2), 4)
-    assert_equal($proc.call(3), 6)
-    
+    assert_equal(4, $proc.call(2))
+    assert_equal(6, $proc.call(3))
+
     proc{
       iii=5				# nested local variable
       $proc = proc{|i|
@@ -24,11 +24,11 @@ class TestProc < Test::Unit::TestCase
       assert(defined?(iii))
     }.call
     assert(!defined?(iii))		# out of scope
-    
+
     loop{iii=5; assert(eval("defined? iii")); break}
     loop {
       iii = 10
-      def dyna_var_check
+      def self.dyna_var_check
         loop {
           assert(!defined?(iii))
           break
@@ -40,6 +40,6 @@ class TestProc < Test::Unit::TestCase
     $x=0
     $proc.call(5)
     $proc2.call
-    assert_equal($x, 5)
+    assert_equal(5, $x)
   end
 end