From c5d4ee4a39df0f11a6ba98a8f5f19c9b64144baa Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Dec 2003 10:29:00 +0000
Subject: * ext/stringio/stringio.c (strio_read): set EOF flag at short read.  
 [ruby-dev:22223], [ruby-dev:22224]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/ut_eof.rb | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

(limited to 'test')

diff --git a/test/ruby/ut_eof.rb b/test/ruby/ut_eof.rb
index efb9f77d83..d4b0b6db39 100644
--- a/test/ruby/ut_eof.rb
+++ b/test/ruby/ut_eof.rb
@@ -6,13 +6,13 @@ module TestEOF
       assert_equal("", f.read(0))
       assert_equal("", f.read(0))
       assert_equal("", f.read)
-      assert_equal(nil, f.read(0))
-      assert_equal(nil, f.read(0))
+      assert_nil(f.read(0))
+      assert_nil(f.read(0))
     }
     open_file("") {|f|
-      assert_equal(nil, f.read(1))
-      assert_equal(nil, f.read)
-      assert_equal(nil, f.read(1))
+      assert_nil(f.read(1))
+      assert_nil(f.read)
+      assert_nil(f.read(1))
     }
   end
 
@@ -20,9 +20,9 @@ module TestEOF
     return unless respond_to? :open_file_rw
     open_file_rw("") {|f|
       assert_equal("", f.read)
-      assert_equal(nil, f.read)
+      assert_nil(f.read)
       assert_equal(0, f.syswrite(""))
-      assert_equal(nil, f.read)
+      assert_nil(f.read)
     }
   end
 
@@ -33,24 +33,33 @@ module TestEOF
       assert_equal("" , f.read(0))
       assert_equal("" , f.read(0))
       assert_equal("", f.read)
-      assert_equal(nil, f.read(0))
-      assert_equal(nil, f.read(0))
+      assert_nil(f.read(0))
+      assert_nil(f.read(0))
     }
     open_file("a") {|f|
       assert_equal("a", f.read(1))
-      assert_equal(nil, f.read(1))
+      assert_nil(f.read(1))
     }
     open_file("a") {|f|
       assert_equal("a", f.read(2))
-      assert_equal(nil, f.read(1))
-      assert_equal(nil, f.read)
-      assert_equal(nil, f.read(1))
+      assert_nil(f.read(1))
+      assert_nil(f.read)
+      assert_nil(f.read(1))
     }
     open_file("a") {|f|
       assert_equal("a", f.read)
-      assert_equal(nil, f.read(1))
-      assert_equal(nil, f.read)
-      assert_equal(nil, f.read(1))
+      assert_nil(f.read(1))
+      assert_nil(f.read)
+      assert_nil(f.read(1))
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read(2))
+      assert_nil(f.read)
+      assert_nil(f.read)
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read)
+      assert_nil(f.read(0))
     }
   end
 
@@ -67,19 +76,19 @@ module TestEOF
         assert_equal(10, f.pos)
         assert_equal("", f.read(0))
         assert_equal("", f.read)
-        assert_equal(nil, f.read(0))
-        assert_equal(nil, f.read)
+        assert_nil(f.read(0))
+        assert_nil(f.read)
       }
     end
 
     def test_eof_1_seek
       open_file_seek("a", 10) {|f|
         assert_equal("", f.read)
-        assert_equal(nil, f.read)
+        assert_nil(f.read)
       }
       open_file_seek("a", 1) {|f|
         assert_equal("", f.read)
-        assert_equal(nil, f.read)
+        assert_nil(f.read)
       }
     end
   end
-- 
cgit v1.2.3