From 1a0b7d0fb6e05704c94d7916aebbaca7c288a86f Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 26 Aug 2007 17:22:26 +0000 Subject: * io.c (rb_io_each_byte): caused infinite loop. [ruby-dev:31652] * io.c (rb_io_getc): should return nil at EOF, not EOFError. * lib/delegate.rb (SimpleDelegator::__setobj__): use raise argument to specify backtrace. * test/ruby/test_fnmatch.rb (TestFnmatch::bracket_test): String#include? no longer works for Fixnum. use #chr. [ruby-dev:31652] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_fnmatch.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/ruby/test_fnmatch.rb') diff --git a/test/ruby/test_fnmatch.rb b/test/ruby/test_fnmatch.rb index 7e378b911d..aad848d09f 100644 --- a/test/ruby/test_fnmatch.rb +++ b/test/ruby/test_fnmatch.rb @@ -4,9 +4,9 @@ class TestFnmatch < Test::Unit::TestCase def bracket_test(s, t) # `s' should start with neither '!' nor '^' 0x21.upto(0x7E) do |i| - assert_equal(t.include?(i), File.fnmatch("[#{s}]", i.chr, File::FNM_DOTMATCH)) - assert_equal(t.include?(i), !File.fnmatch("[^#{s}]", i.chr, File::FNM_DOTMATCH)) - assert_equal(t.include?(i), !File.fnmatch("[!#{s}]", i.chr, File::FNM_DOTMATCH)) + assert_equal(t.include?(i.chr), File.fnmatch("[#{s}]", i.chr, File::FNM_DOTMATCH)) + assert_equal(t.include?(i.chr), !File.fnmatch("[^#{s}]", i.chr, File::FNM_DOTMATCH)) + assert_equal(t.include?(i.chr), !File.fnmatch("[!#{s}]", i.chr, File::FNM_DOTMATCH)) end end def test_fnmatch -- cgit v1.2.3