* 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, 14 deletions

diff --git a/test/ruby/test_clone.rb b/test/ruby/test_clone.rb
index 64dba41c21..612636c046 100644
--- a/test/ruby/test_clone.rb
+++ b/test/ruby/test_clone.rb
@@ -8,7 +8,7 @@ class TestClone < Test::Unit::TestCase
   module M003; include M002; end
   module M002; include M001; end
   module M003; include M002; end
-    
+
   def test_clone
     foo = Object.new
     def foo.test
@@ -18,18 +18,13 @@ class TestClone < Test::Unit::TestCase
     def bar.test2
       "test2"
     end
-    
-    assert_equal(bar.test2, "test2")
-    assert_equal(bar.test, "test")
-    assert_equal(foo.test, "test")  
-    
-    begin
-      foo.test2
-      assert false
-    rescue NoMethodError
-      assert true
-    end
-    
-    assert_equal(M003.ancestors, [M003, M002, M001])
+
+    assert_equal("test2", bar.test2)
+    assert_equal("test", bar.test)
+    assert_equal("test", foo.test)
+
+    assert_raises(NoMethodError) {foo.test2}
+
+    assert_equal([M003, M002, M001], M003.ancestors)
   end
 end