Merge branch 'master' into i110/inspect-recursion

1 files changed, 8 insertions, 13 deletions

diff --git a/mrbgems/mruby-io/test/file_test.rb b/mrbgems/mruby-io/test/file_test.rb
index 2c831f0d5..2134c6a75 100644
--- a/mrbgems/mruby-io/test/file_test.rb
+++ b/mrbgems/mruby-io/test/file_test.rb
@@ -1,9 +1,7 @@
 ##
 # FileTest
 
-assert('FileTest TEST SETUP') do
-  MRubyIOTestUtil.io_test_setup
-end
+MRubyIOTestUtil.io_test_setup
 
 assert("FileTest.directory?") do
   dir = MRubyIOTestUtil.mkdtemp("mruby-io-test.XXXXXX")
@@ -22,9 +20,8 @@ assert("FileTest.exist?") do
   assert_equal true,  FileTest.exist?(io), "io obj - exist"
   io.close
   assert_equal true, io.closed?
-  assert_raise IOError do
-    FileTest.exist?(io)
-  end
+  assert_raise(IOError) { FileTest.exist?(io) }
+  assert_raise(TypeError) { File.exist?($mrbtest_io_rfname.to_sym) }
 end
 
 assert("FileTest.file?") do
@@ -67,11 +64,11 @@ assert("FileTest.size?") do
   assert_raise IOError do
     FileTest.size?(fp1)
   end
+  assert_true fp1.closed?
   assert_raise IOError do
     FileTest.size?(fp2)
   end
-
-  fp1.closed? && fp2.closed?
+  assert_true fp2.closed?
 end
 
 assert("FileTest.socket?") do
@@ -105,13 +102,11 @@ assert("FileTest.zero?") do
   assert_raise IOError do
     FileTest.zero?(fp1)
   end
+  assert_true fp1.closed?
   assert_raise IOError do
     FileTest.zero?(fp2)
   end
-
-  fp1.closed? && fp2.closed?
+  assert_true fp2.closed?
 end
 
-assert('FileTest TEST CLEANUP') do
-  assert_nil MRubyIOTestUtil.io_test_cleanup
-end
+MRubyIOTestUtil.io_test_cleanup