1 files changed, 34 insertions, 3 deletions

diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index d509a9bfe2..0b3b5591e3 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -260,6 +260,19 @@ class TestIO < Test::Unit::TestCase
     }
   end
 
+  def test_codepoints
+    make_tempfile {|t|
+      bug2959 = '[ruby-core:28650]'
+      a = ""
+      File.open(t, 'rt') {|f|
+        assert_warn(/deprecated/) {
+          f.codepoints {|c| a << c}
+        }
+      }
+      assert_equal("foo\nbar\nbaz\n", a, bug2959)
+    }
+  end
+
   def test_rubydev33072
     t = make_tempfile
     path = t.path
@@ -1303,21 +1316,28 @@ class TestIO < Test::Unit::TestCase
   end
 
   def test_lines
+    verbose, $VERBOSE = $VERBOSE, nil
     pipe(proc do |w|
       w.puts "foo"
       w.puts "bar"
       w.puts "baz"
       w.close
     end, proc do |r|
-      e = r.lines
+      e = nil
+      assert_warn(/deprecated/) {
+        e = r.lines
+      }
       assert_equal("foo\n", e.next)
       assert_equal("bar\n", e.next)
       assert_equal("baz\n", e.next)
       assert_raise(StopIteration) { e.next }
     end)
+  ensure
+    $VERBOSE = verbose
   end
 
   def test_bytes
+    verbose, $VERBOSE = $VERBOSE, nil
     pipe(proc do |w|
       w.binmode
       w.puts "foo"
@@ -1325,27 +1345,38 @@ class TestIO < Test::Unit::TestCase
       w.puts "baz"
       w.close
     end, proc do |r|
-      e = r.bytes
+      e = nil
+      assert_warn(/deprecated/) {
+        e = r.bytes
+      }
       (%w(f o o) + ["\n"] + %w(b a r) + ["\n"] + %w(b a z) + ["\n"]).each do |c|
         assert_equal(c.ord, e.next)
       end
       assert_raise(StopIteration) { e.next }
     end)
+  ensure
+    $VERBOSE = verbose
   end
 
   def test_chars
+    verbose, $VERBOSE = $VERBOSE, nil
     pipe(proc do |w|
       w.puts "foo"
       w.puts "bar"
       w.puts "baz"
       w.close
     end, proc do |r|
-      e = r.chars
+      e = nil
+      assert_warn(/deprecated/) {
+        e = r.chars
+      }
       (%w(f o o) + ["\n"] + %w(b a r) + ["\n"] + %w(b a z) + ["\n"]).each do |c|
         assert_equal(c, e.next)
       end
       assert_raise(StopIteration) { e.next }
     end)
+  ensure
+    $VERBOSE = verbose
   end
 
   def test_readbyte