* ext/stringio/stringio.c (strio_read): follow IO#read.

* test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
  test/stringio/test_stringio.rb: add EOF test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 9 deletions

diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb
index 10390fc6da..3449e33e61 100644
--- a/test/stringio/test_stringio.rb
+++ b/test/stringio/test_stringio.rb
@@ -1,15 +1,14 @@
 require 'test/unit'
 require 'stringio'
+dir = File.expand_path(__FILE__)
+2.times {dir = File.dirname(dir)}
+$:.replace([File.join(dir, "ruby")] | $:)
+require 'ut_eof'
 
 class TestStringIO < Test::Unit::TestCase
-  def test_empty_file
-    f = StringIO.new("")
-    assert_equal("", f.read(0))
-    assert_equal("", f.read)
-    assert_equal(nil, f.read(0))
-    f = StringIO.new("")
-    assert_equal(nil, f.read(1))
-    assert_equal(nil, f.read)
-    assert_equal(nil, f.read(1))
+  include TestEOF
+  def open_file(content)
+    f = StringIO.new(content)
+    yield f
   end
 end