ruby-changes:25163
From: kazu <ko1@a...>
Date: Tue, 16 Oct 2012 13:02:18 +0900 (JST)
Subject: [ruby-changes:25163] kazu:r37215 (trunk): * test/ruby/envutil.rb (Test::Unit::Assertions#assert_file): rename from file_assertion.
kazu 2012-10-16 13:02:04 +0900 (Tue, 16 Oct 2012) New Revision: 37215 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37215 Log: * test/ruby/envutil.rb (Test::Unit::Assertions#assert_file): rename from file_assertion. Modified files: trunk/ChangeLog trunk/test/ruby/envutil.rb trunk/test/ruby/test_file.rb trunk/test/ruby/test_file_exhaustive.rb trunk/test/ruby/test_process.rb trunk/test/ruby/test_require.rb trunk/test/ruby/test_rubyoptions.rb trunk/test/ruby/test_whileuntil.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 37214) +++ ChangeLog (revision 37215) @@ -1,3 +1,8 @@ +Tue Oct 16 12:52:14 2012 Kazuhiro NISHIYAMA <zn@m...> + + * test/ruby/envutil.rb (Test::Unit::Assertions#assert_file): + rename from file_assertion. + Tue Oct 16 11:30:18 2012 Nobuyoshi Nakada <nobu@r...> * file.c (rb_file_join): hide the result under construction until Index: test/ruby/test_require.rb =================================================================== --- test/ruby/test_require.rb (revision 37214) +++ test/ruby/test_require.rb (revision 37215) @@ -109,7 +109,7 @@ Dir.mktmpdir do |tmp| req = File.join(tmp, "very_long_file_name.rb") File.write(req, "p :ok\n") - file_assertion.exist?(req) + assert_file.exist?(req) req[/.rb$/i] = "" assert_in_out_err(['--disable-gems'], <<-INPUT, %w(:ok), []) require "#{req}" Index: test/ruby/test_file_exhaustive.rb =================================================================== --- test/ruby/test_file_exhaustive.rb (revision 37214) +++ test/ruby/test_file_exhaustive.rb (revision 37215) @@ -120,7 +120,7 @@ Dir.mktmpdir do |dir| prefix = File.join(dir, "...a") Dir.mkdir(prefix) - file_assertion.exist?(prefix) + assert_file.exist?(prefix) assert_nothing_raised { File.stat(prefix) } @@ -170,9 +170,9 @@ end def test_exist_p - file_assertion.exist?(@dir) - file_assertion.exist?(@file) - file_assertion.not_exist?(@nofile) + assert_file.exist?(@dir) + assert_file.exist?(@file) + assert_file.not_exist?(@nofile) end def test_readable_p @@ -399,8 +399,8 @@ def test_rename assert_equal(0, File.rename(@file, @nofile)) - file_assertion.not_exist?(@file) - file_assertion.exist?(@nofile) + assert_file.not_exist?(@file) + assert_file.exist?(@nofile) assert_equal(0, File.rename(@nofile, @file)) assert_raise(Errno::ENOENT) { File.rename(@nofile, @file) } end @@ -809,21 +809,21 @@ def test_truncate assert_equal(0, File.truncate(@file, 1)) - file_assertion.exist?(@file) + assert_file.exist?(@file) assert_equal(1, File.size(@file)) assert_equal(0, File.truncate(@file, 0)) - file_assertion.exist?(@file) - file_assertion.zero?(@file) + assert_file.exist?(@file) + assert_file.zero?(@file) make_file("foo", @file) assert_raise(Errno::ENOENT) { File.truncate(@nofile, 0) } f = File.new(@file, "w") assert_equal(0, f.truncate(2)) - file_assertion.exist?(@file) + assert_file.exist?(@file) assert_equal(2, File.size(@file)) assert_equal(0, f.truncate(0)) - file_assertion.exist?(@file) - file_assertion.zero?(@file) + assert_file.exist?(@file) + assert_file.zero?(@file) f.close make_file("foo", @file) Index: test/ruby/test_file.rb =================================================================== --- test/ruby/test_file.rb (revision 37214) +++ test/ruby/test_file.rb (revision 37215) @@ -44,7 +44,7 @@ bug6487 = '[ruby-core:45203]' f = Tempfile.new(__method__.to_s) f.close - file_assertion.exist?(f.path) + assert_file.exist?(f.path) assert_nothing_raised(bug6487) {File.read(f.path, mode: 'r:utf-8')} assert_nothing_raised(bug6487) {File.read(f.path, mode: 'r:bom|utf-8')} f.close(true) @@ -356,7 +356,7 @@ assert_raise(ArgumentError) do open(path + "\0bar", "w") {} end - file_assertion.not_exist?(path) + assert_file.not_exist?(path) end end end Index: test/ruby/test_whileuntil.rb =================================================================== --- test/ruby/test_whileuntil.rb (revision 37214) +++ test/ruby/test_whileuntil.rb (revision 37215) @@ -69,7 +69,7 @@ tmp.close File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"` - file_assertion.not_exist?(tmpfilename) + assert_file.not_exist?(tmpfilename) } end Index: test/ruby/test_process.rb =================================================================== --- test/ruby/test_process.rb (revision 37214) +++ test/ruby/test_process.rb (revision 37215) @@ -403,8 +403,8 @@ with_tmpchdir {|d| Dir.mkdir "foo" system(*PWD, :chdir => "foo", :out => "open_chdir_test") - file_assertion.exist?("open_chdir_test") - file_assertion.not_exist?("foo/open_chdir_test") + assert_file.exist?("open_chdir_test") + assert_file.not_exist?("foo/open_chdir_test") assert_equal("#{d}/foo", File.read("open_chdir_test").chomp) } end Index: test/ruby/envutil.rb =================================================================== --- test/ruby/envutil.rb (revision 37214) +++ test/ruby/envutil.rb (revision 37215) @@ -225,11 +225,11 @@ assert(1.0/f == -Float::INFINITY, "#{f} is not -0.0") end - def file_assertion - FileAssertion + def assert_file + AssertFile end - class << (FileAssertion = Object.new) + class << (AssertFile = Object.new) include Assertions def assert_file_predicate(predicate, *args) if /\Anot_/ =~ predicate Index: test/ruby/test_rubyoptions.rb =================================================================== --- test/ruby/test_rubyoptions.rb (revision 37214) +++ test/ruby/test_rubyoptions.rb (revision 37215) @@ -388,7 +388,7 @@ rubybin = Regexp.quote(EnvUtil.rubybin) pat = Regexp.quote(notexist) bug1573 = '[ruby-core:23717]' - file_assertion.not_exist?(notexist) + assert_file.not_exist?(notexist) assert_in_out_err(["-r", notexist, "-ep"], "", [], /.* -- #{pat} \(LoadError\)/, bug1573) assert_in_out_err([notexist], "", [], /#{rubybin}:.* -- #{pat} \(LoadError\)/, bug1573) end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/