envutil.rb: file_assertion

* test/ruby/envutil.rb (Test::Unit::Assertions#file_assertion):
  rewrite file assertions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 12 deletions

diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 76cf615d5b..e13c98c44a 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -120,7 +120,7 @@ class TestFileExhaustive < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       prefix = File.join(dir, "...a")
       Dir.mkdir(prefix)
-      assert_file(:exist?, prefix)
+      file_assertion.exist?(prefix)
 
       assert_nothing_raised { File.stat(prefix) }
 
@@ -170,9 +170,9 @@ class TestFileExhaustive < Test::Unit::TestCase
   end
 
   def test_exist_p
-    assert_file(:exist?, @dir)
-    assert_file(:exist?, @file)
-    assert_file_not(:exist?, @nofile)
+    file_assertion.exist?(@dir)
+    file_assertion.exist?(@file)
+    file_assertion.not_exist?(@nofile)
   end
 
   def test_readable_p
@@ -399,8 +399,8 @@ class TestFileExhaustive < Test::Unit::TestCase
 
   def test_rename
     assert_equal(0, File.rename(@file, @nofile))
-    assert_file_not(:exist?, @file)
-    assert_file(:exist?, @nofile)
+    file_assertion.not_exist?(@file)
+    file_assertion.exist?(@nofile)
     assert_equal(0, File.rename(@nofile, @file))
     assert_raise(Errno::ENOENT) { File.rename(@nofile, @file) }
   end
@@ -787,21 +787,21 @@ class TestFileExhaustive < Test::Unit::TestCase
 
   def test_truncate
     assert_equal(0, File.truncate(@file, 1))
-    assert_file(:exist?, @file)
+    file_assertion.exist?(@file)
     assert_equal(1, File.size(@file))
     assert_equal(0, File.truncate(@file, 0))
-    assert_file(:exist?, @file)
-    assert_file(:zero?, @file)
+    file_assertion.exist?(@file)
+    file_assertion.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))
-    assert_file(:exist?, @file)
+    file_assertion.exist?(@file)
     assert_equal(2, File.size(@file))
     assert_equal(0, f.truncate(0))
-    assert_file(:exist?, @file)
-    assert_file(:zero?, @file)
+    file_assertion.exist?(@file)
+    file_assertion.zero?(@file)
     f.close
     make_file("foo", @file)