1 files changed, 8 insertions, 10 deletions
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index c4095428e1..c8bc747a58 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -14,15 +14,9 @@ class TestFile < Test::Unit::TestCase
     r = File.open(filename, "r")
     begin
       if /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM
-	begin
-	  File.unlink(filename)
-	  assert(false)
-	rescue Errno::EACCES
-	  assert(true)
-	end
+        assert_raise(Errno::EACCES) {File.unlink(filename)}
       else
-	File.unlink(filename)
-	assert(true)
+	assert_nothing_raised {File.unlink(filename)}
       end
     ensure
       r.close
@@ -43,7 +37,11 @@ class TestFile < Test::Unit::TestCase
 
   def test_fnmatch
     # from [ruby-dev:22815] and [ruby-dev:22819]
-    assert(true, File.fnmatch('\[1\]' , '[1]'))
-    assert(true, File.fnmatch('*?', 'a'))
+    assert(File.fnmatch('\[1\]' , '[1]'))
+    assert(File.fnmatch('*?', 'a'))
+    assert(File.fnmatch('*/', 'a/'))
+    assert(File.fnmatch('\[1\]' , '[1]', File::FNM_PATHNAME))
+    assert(File.fnmatch('*?', 'a', File::FNM_PATHNAME))
+    assert(File.fnmatch('*/', 'a/', File::FNM_PATHNAME))
   end
 end