Merge branch 'master' into i110/inspect-recursion

5 files changed, 79 insertions, 127 deletions

diff --git a/mrbgems/mruby-io/test/file.rb b/mrbgems/mruby-io/test/file.rb
index dc6fe369a..1535ebb44 100644
--- a/mrbgems/mruby-io/test/file.rb
+++ b/mrbgems/mruby-io/test/file.rb
@@ -1,16 +1,14 @@
 ##
-# IO Test
+# File Test
 
-assert('File', '15.2.21') do
-  File.class == Class
-end
+MRubyIOTestUtil.io_test_setup
 
-assert('File', '15.2.21.2') do
-  File.superclass == IO
+assert('File.class', '15.2.21') do
+  assert_equal Class, File.class
 end
 
-assert('File TEST SETUP') do
-  MRubyIOTestUtil.io_test_setup
+assert('File.superclass', '15.2.21.2') do
+  assert_equal IO, File.superclass
 end
 
 assert('File#initialize', '15.2.21.4.1') do
@@ -27,7 +25,7 @@ assert('File#path', '15.2.21.4.2') do
   assert_equal $mrbtest_io_rfname, io.path
   io.close
   assert_equal $mrbtest_io_rfname, io.path
-  io.closed?
+  assert_true io.closed?
 end
 
 assert('File.basename') do
@@ -35,6 +33,7 @@ assert('File.basename') do
   assert_equal 'a', File.basename('/a/')
   assert_equal 'b', File.basename('/a/b')
   assert_equal 'b', File.basename('../a/b')
+  assert_raise(ArgumentError) { File.basename("/a/b\0") }
 end
 
 assert('File.dirname') do
@@ -69,18 +68,15 @@ assert('File#flock') do
 end
 
 assert('File#mtime') do
-  unless Object.const_defined?(:Time)
-    skip "File#mtime require Time"
-  end
   begin
-    now = Time.now.to_i
-    mt = 0
-    File.open('mtime-test', 'w') do |f|
-      mt = f.mtime.to_i
+    File.open("#{$mrbtest_io_wfname}.mtime", 'w') do |f|
+      assert_equal Time, f.mtime.class
+      File.open("#{$mrbtest_io_wfname}.mtime", 'r') do |f2|
+        assert_equal true, f.mtime == f2.mtime
+      end
     end
-    assert_equal true, mt >= now
   ensure
-    File.delete('mtime-test')
+    File.delete("#{$mrbtest_io_wfname}.mtime")
   end
 end
 
@@ -111,6 +107,8 @@ assert('File.realpath') do
       MRubyIOTestUtil.rmdir dir
     end
   end
+
+  assert_raise(ArgumentError) { File.realpath("TO\0DO") }
 end
 
 assert("File.readlink") do
@@ -177,7 +175,6 @@ assert('File.path') do
   assert_equal "a/../b/./c", File.path("a/../b/./c")
   assert_raise(TypeError) { File.path(nil) }
   assert_raise(TypeError) { File.path(123) }
-
 end
 
 assert('File.symlink') do
@@ -200,14 +197,12 @@ assert('File.symlink') do
 end
 
 assert('File.chmod') do
-  File.open('chmod-test', 'w') {}
+  File.open("#{$mrbtest_io_wfname}.chmod-test", 'w') {}
   begin
-    assert_equal 1, File.chmod(0400, 'chmod-test')
+    assert_equal 1, File.chmod(0400, "#{$mrbtest_io_wfname}.chmod-test")
   ensure
-    File.delete('chmod-test')
+    File.delete("#{$mrbtest_io_wfname}.chmod-test")
   end
 end
 
-assert('File TEST CLEANUP') do
-  assert_nil MRubyIOTestUtil.io_test_cleanup
-end
+MRubyIOTestUtil.io_test_cleanup
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
diff --git a/mrbgems/mruby-io/test/gc_filedes.sh b/mrbgems/mruby-io/test/gc_filedes.sh
deleted file mode 100644
index 6e5d1bbf1..000000000
--- a/mrbgems/mruby-io/test/gc_filedes.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ulimit -n 20
-mruby -e '100.times { File.open "'$0'" }'
diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb
index e06b14996..1491a4cfe 100644
--- a/mrbgems/mruby-io/test/io.rb
+++ b/mrbgems/mruby-io/test/io.rb
@@ -1,57 +1,46 @@
 ##
 # IO Test
 
-unless Object.respond_to? :assert_nothing_raised
-  def assert_nothing_raised(*exp)
-    ret = true
-    if $mrbtest_assert
-      $mrbtest_assert_idx += 1
-      msg = exp.last.class == String ? exp.pop : ""
-      begin
-        yield
-      rescue Exception => e
-        msg = "#{msg} exception raised."
-        diff = "      Class: <#{e.class}>\n" +
-          "    Message: #{e.message}"
-        $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff])
-        ret = false
+MRubyIOTestUtil.io_test_setup
+$cr, $crlf, $cmd = MRubyIOTestUtil.win? ? [1, "\r\n", "cmd /c "] : [0, "\n", ""]
+
+def assert_io_open(meth)
+  assert do
+    fd = IO.sysopen($mrbtest_io_rfname)
+    assert_equal Fixnum, fd.class
+    io1 = IO.__send__(meth, fd)
+    begin
+      assert_equal IO, io1.class
+      assert_equal $mrbtest_io_msg, io1.read
+    ensure
+      io1.close
+    end
+
+    io2 = IO.__send__(meth, IO.sysopen($mrbtest_io_rfname))do |io|
+      if meth == :open
+        assert_equal $mrbtest_io_msg, io.read
+      else
+        flunk "IO.#{meth} does not take block"
       end
     end
-    ret
+    io2.close unless meth == :open
   end
 end
 
-assert('IO TEST SETUP') do
-  MRubyIOTestUtil.io_test_setup
-  $cr = MRubyIOTestUtil.win? ? 1 : 0  # "\n" include CR or not
-end
-
-assert('IO', '15.2.20') do
+assert('IO.class', '15.2.20') do
   assert_equal(Class, IO.class)
 end
 
-assert('IO', '15.2.20.2') do
+assert('IO.superclass', '15.2.20.2') do
   assert_equal(Object, IO.superclass)
 end
 
-assert('IO', '15.2.20.3') do
-  assert_include(IO.included_modules, Enumerable)
+assert('IO.ancestors', '15.2.20.3') do
+  assert_include(IO.ancestors, Enumerable)
 end
 
 assert('IO.open', '15.2.20.4.1') do
-  fd = IO.sysopen $mrbtest_io_rfname
-  assert_equal Fixnum, fd.class
-  io = IO.open fd
-  assert_equal IO, io.class
-  assert_equal $mrbtest_io_msg, io.read
-  io.close
-
-  fd = IO.sysopen $mrbtest_io_rfname
-  IO.open(fd) do |io|
-    assert_equal $mrbtest_io_msg, io.read
-  end
-
-  true
+  assert_io_open(:open)
 end
 
 assert('IO#close', '15.2.20.5.1') do
@@ -92,8 +81,6 @@ assert('IO#eof?', '15.2.20.5.6') do
   io.read
   assert_true io.eof?
   io.close
-
-  true
 end
 
 assert('IO#flush', '15.2.20.5.7') do
@@ -108,12 +95,11 @@ end
 
 assert('IO#getc', '15.2.20.5.8') do
   io = IO.new(IO.sysopen($mrbtest_io_rfname))
-  $mrbtest_io_msg.each_char { |ch|
+  $mrbtest_io_msg.split("").each { |ch|
     assert_equal ch, io.getc
   }
   assert_equal nil, io.getc
   io.close
-  true
 end
 
 #assert('IO#gets', '15.2.20.5.9') do
@@ -152,7 +138,7 @@ end
 assert('IO#readchar', '15.2.20.5.15') do
   # almost same as IO#getc
   IO.open(IO.sysopen($mrbtest_io_rfname)) do |io|
-    $mrbtest_io_msg.each_char { |ch|
+    $mrbtest_io_msg.split("").each { |ch|
       assert_equal ch, io.readchar
     }
     assert_raise(EOFError) do
@@ -199,8 +185,6 @@ assert('IO#write', '15.2.20.5.20') do
   io.rewind
   assert_equal "ab123fg", io.read
   io.close
-
-  true
 end
 
 assert('IO#<<') do
@@ -208,7 +192,6 @@ assert('IO#<<') do
   io << "" << ""
   assert_equal 0, io.pos
   io.close
-  true
 end
 
 assert('IO#dup for readable') do
@@ -228,7 +211,6 @@ assert('IO#dup for readable') do
   dup.close
   assert_false io.closed?
   io.close
-  true
 end
 
 assert('IO#dup for writable') do
@@ -241,25 +223,18 @@ assert('IO#dup for writable') do
   assert_equal "mruby", dup.sysread(5)
   dup.close
   io.close
-  true
 end
 
 assert('IO.for_fd') do
-  fd = IO.sysopen($mrbtest_io_rfname)
-  io = IO.for_fd(fd)
-    assert_equal $mrbtest_io_msg, io.read
-  io.close
-  true
+  assert_io_open(:for_fd)
 end
 
 assert('IO.new') do
-  io = IO.new(0)
-  io.close
-  true
+  assert_io_open(:new)
 end
 
 assert('IO gc check') do
-  100.times { IO.new(0) }
+  assert_nothing_raised { 100.times { IO.new(0) } }
 end
 
 assert('IO.sysopen("./nonexistent")') do
@@ -300,7 +275,6 @@ assert('IO.sysopen, IO#sysread') do
   io = IO.new fd, "w"
   assert_raise(IOError) { io.sysread(1) }
   io.close
-  true
 end
 
 assert('IO.sysopen, IO#syswrite') do
@@ -314,8 +288,6 @@ assert('IO.sysopen, IO#syswrite') do
   io = IO.new(IO.sysopen($mrbtest_io_rfname), "r")
   assert_raise(IOError) { io.syswrite("a") }
   io.close
-
-  true
 end
 
 assert('IO#_read_buf') do
@@ -339,20 +311,25 @@ assert('IO#_read_buf') do
   assert_equal true, io.eof
   assert_equal true, io.eof?
   io.close
-  io.closed?
 end
 
 assert('IO#isatty') do
   skip "isatty is not supported on this platform" if MRubyIOTestUtil.win?
-  f1 = File.open("/dev/tty")
-  f2 = File.open($mrbtest_io_rfname)
-
-  assert_true  f1.isatty
-  assert_false f2.isatty
-
-  f1.close
-  f2.close
-  true
+  begin
+    f = File.open("/dev/tty")
+  rescue RuntimeError => e
+    skip e.message
+  else
+    assert_true f.isatty
+  ensure
+    f&.close
+  end
+  begin
+    f = File.open($mrbtest_io_rfname)
+    assert_false f.isatty
+  ensure
+    f&.close
+  end
 end
 
 assert('IO#pos=, IO#seek') do
@@ -366,7 +343,6 @@ assert('IO#pos=, IO#seek') do
   assert_equal 0, io.seek(0)
   assert_equal 0, io.pos
   io.close
-  io.closed?
 end
 
 assert('IO#rewind') do
@@ -377,7 +353,6 @@ assert('IO#rewind') do
   assert_equal 0, io.rewind
   assert_equal 0, io.pos
   io.close
-  io.closed?
 end
 
 assert('IO#gets') do
@@ -426,7 +401,6 @@ assert('IO#gets') do
   assert_equal nil, io.gets, "gets third line; returns nil"
 
   io.close
-  io.closed?
 end
 
 assert('IO#gets - paragraph mode') do
@@ -437,7 +411,6 @@ assert('IO#gets - paragraph mode') do
   io.write "2" * 10 + "\n"
   assert_equal 34 + $cr * 4, io.pos
   io.close
-  assert_equal true, io.closed?
 
   fd = IO.sysopen $mrbtest_io_wfname
   io = IO.new fd
@@ -448,13 +421,12 @@ assert('IO#gets - paragraph mode') do
   text2 = io.gets("")
   assert_equal para2, text2
   io.close
-  io.closed?
 end
 
 assert('IO.popen') do
   begin
     $? = nil
-    io = IO.popen("echo mruby-io")
+    io = IO.popen("#{$cmd}echo mruby-io")
     assert_true io.close_on_exec?
     assert_equal Fixnum, io.pid.class
 
@@ -542,7 +514,6 @@ assert('IO#fileno') do
   assert_equal io.fileno, fd
   assert_equal io.to_i, fd
   io.close
-  io.closed?
 end
 
 assert('IO#close_on_exec') do
@@ -564,7 +535,6 @@ assert('IO#close_on_exec') do
   assert_equal(false, io.close_on_exec?)
 
   io.close
-  io.closed?
 
   begin
     r, w = IO.pipe
@@ -635,12 +605,10 @@ end
 
 assert('`cmd`') do
   begin
-    assert_equal `echo foo`, "foo\n"
+    assert_equal `#{$cmd}echo foo`, "foo#{$crlf}"
   rescue NotImplementedError => e
     skip e.message
   end
 end
 
-assert('IO TEST CLEANUP') do
-  assert_nil MRubyIOTestUtil.io_test_cleanup
-end
+MRubyIOTestUtil.io_test_cleanup
diff --git a/mrbgems/mruby-io/test/mruby_io_test.c b/mrbgems/mruby-io/test/mruby_io_test.c
index 71239a827..3312d6c7e 100644
--- a/mrbgems/mruby-io/test/mruby_io_test.c
+++ b/mrbgems/mruby-io/test/mruby_io_test.c
@@ -215,11 +215,9 @@ mrb_io_test_mkdtemp(mrb_state *mrb, mrb_value klass)
 static mrb_value
 mrb_io_test_rmdir(mrb_state *mrb, mrb_value klass)
 {
-  mrb_value str;
-  char *cp;
+  const char *cp;
 
-  mrb_get_args(mrb, "S", &str);
-  cp = mrb_str_to_cstr(mrb, str);
+  mrb_get_args(mrb, "z", &cp);
   if (rmdir(cp) == -1) {
     mrb_sys_fail(mrb, "rmdir");
   }