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

diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb
index 9faee72add..55452beb70 100644
--- a/test/ruby/test_path.rb
+++ b/test/ruby/test_path.rb
@@ -4,45 +4,45 @@ $KCODE = 'none'
 
 class TestPath < Test::Unit::TestCase
   def test_path
-    assert_equal(File.basename("a"), "a")
-    assert_equal(File.basename("a/b"), "b")
-    assert_equal(File.basename("a/b/"), "b")
-    assert_equal(File.basename("/"), "/")
-    assert_equal(File.basename("//"), "/")
-    assert_equal(File.basename("///"), "/")
-    assert_equal(File.basename("a/b////"), "b")
-    assert_equal(File.basename("a.rb", ".rb"), "a")
-    assert_equal(File.basename("a.rb///", ".rb"), "a")
-    assert_equal(File.basename("a.rb///", ".*"), "a")
-    assert_equal(File.basename("a.rb///", ".c"), "a.rb")
-    assert_equal(File.dirname("a"), ".")
-    assert_equal(File.dirname("/"), "/")
-    assert_equal(File.dirname("/a"), "/")
-    assert_equal(File.dirname("a/b"), "a")
-    assert_equal(File.dirname("a/b/c"), "a/b")
-    assert_equal(File.dirname("/a/b/c"), "/a/b")
-    assert_equal(File.dirname("/a/b/"), "/a")
-    assert_equal(File.dirname("/a/b///"), "/a")
+    assert_equal("a", File.basename("a"))
+    assert_equal("b", File.basename("a/b"))
+    assert_equal("b", File.basename("a/b/"))
+    assert_equal("/", File.basename("/"))
+    assert_equal("/", File.basename("//"))
+    assert_equal("/", File.basename("///"))
+    assert_equal("b", File.basename("a/b////"))
+    assert_equal("a", File.basename("a.rb", ".rb"))
+    assert_equal("a", File.basename("a.rb///", ".rb"))
+    assert_equal("a", File.basename("a.rb///", ".*"))
+    assert_equal("a.rb", File.basename("a.rb///", ".c"))
+    assert_equal(".", File.dirname("a"))
+    assert_equal("/", File.dirname("/"))
+    assert_equal("/", File.dirname("/a"))
+    assert_equal("a", File.dirname("a/b"))
+    assert_equal("a/b", File.dirname("a/b/c"))
+    assert_equal("/a/b", File.dirname("/a/b/c"))
+    assert_equal("/a", File.dirname("/a/b/"))
+    assert_equal("/a", File.dirname("/a/b///"))
     case Dir.pwd
     when %r'\A\w:'
-      assert(/\A\w:\/\z/ =~ File.expand_path(".", "/"))
-      assert(/\A\w:\/a\z/ =~ File.expand_path("a", "/"))
+      assert_match(/\A\w:\/\z/, File.expand_path(".", "/"))
+      assert_match(/\A\w:\/a\z/, File.expand_path("a", "/"))
       dosish = true
     when %r'\A//'
-      assert(%r'\A//[^/]+/[^/]+\z' =~ File.expand_path(".", "/"))
-      assert(%r'\A//[^/]+/[^/]+/a\z' =~ File.expand_path(".", "/"))
+      assert_match(%r'\A//[^/]+/[^/]+\z', File.expand_path(".", "/"))
+      assert_match(%r'\A//[^/]+/[^/]+/a\z', File.expand_path(".", "/"))
       dosish = true
     else
-      assert_equal(File.expand_path(".", "/"), "/")
-      assert_equal(File.expand_path("sub", "/"), "/sub")
+      assert_equal("/", File.expand_path(".", "/"))
+      assert_equal("/sub", File.expand_path("sub", "/"))
     end
     if dosish
-      assert_equal(File.expand_path("/", "//machine/share/sub"), "//machine/share")
-      assert_equal(File.expand_path("/dir", "//machine/share/sub"), "//machine/share/dir")
-      assert_equal(File.expand_path("/", "z:/sub"), "z:/")
-      assert_equal(File.expand_path("/dir", "z:/sub"), "z:/dir")
+      assert_equal("//machine/share", File.expand_path("/", "//machine/share/sub"))
+      assert_equal("//machine/share/dir", File.expand_path("/dir", "//machine/share/sub"))
+      assert_equal("z:/", File.expand_path("/", "z:/sub"))
+      assert_equal("z:/dir", File.expand_path("/dir", "z:/sub"))
     end
-    assert_equal(File.expand_path(".", "//"), "//")
-    assert_equal(File.expand_path("sub", "//"), "//sub")
+    assert_equal("//", File.expand_path(".", "//"))
+    assert_equal("//sub", File.expand_path("sub", "//"))
   end
 end