mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
12eee69294
commit
0c15b3a222
3 changed files with 23 additions and 2 deletions
|
@ -1,13 +1,15 @@
|
|||
Tue Nov 18 18:09:37 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Tue Nov 18 18:23:05 2003 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
|
||||
|
||||
* ext/stringio/stringio.c (strio_read): behave as IO at empty string.
|
||||
[ruby-dev:21939]
|
||||
[ruby-dev:21939], [ruby-dev:21941]
|
||||
|
||||
* ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
|
||||
|
||||
* ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
|
||||
clear EOF flag.
|
||||
|
||||
* test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
|
||||
|
||||
Tue Nov 18 14:06:35 2003 Minero Aoki <aamine@loveruby.net>
|
||||
|
||||
* lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
|
||||
|
|
|
@ -849,6 +849,9 @@ strio_read(argc, argv, self)
|
|||
ptr->flags |= STRIO_EOF;
|
||||
return Qnil;
|
||||
}
|
||||
else if (ptr->flags & STRIO_EOF) {
|
||||
return Qnil;
|
||||
}
|
||||
break;
|
||||
}
|
||||
/* fall through */
|
||||
|
@ -856,6 +859,7 @@ strio_read(argc, argv, self)
|
|||
len = RSTRING(ptr->string)->len - ptr->pos;
|
||||
if (len == 0 && ptr->pos == RSTRING(ptr->string)->len) {
|
||||
if (ptr->flags & STRIO_EOF) return Qnil;
|
||||
ptr->flags |= STRIO_EOF;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
|
15
test/stringio/test_stringio.rb
Normal file
15
test/stringio/test_stringio.rb
Normal file
|
@ -0,0 +1,15 @@
|
|||
require 'test/unit'
|
||||
require 'stringio'
|
||||
|
||||
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))
|
||||
end
|
||||
end
|
Loading…
Reference in a new issue