From 571b2e17b2775e40b3fe309d29dda611524625cf Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 26 Sep 2008 09:57:33 +0000
Subject: * test/pathname/test_pathname.rb: Fix use of deprecated methods.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/pathname/test_pathname.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'test/pathname')

diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index da12383bdd..fbe344552e 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -257,17 +257,17 @@ class TestPathname < Test::Unit::TestCase
   defassert(:relative_path_from, "a", "a", "b/..")
   defassert(:relative_path_from, "b/c", "b/c", "b/..")
 
-  def self.defassert_raise(name, exc, *args)
+  def self.defassert_raises(name, exc, *args)
     define_assertion(name) {
       message = "#{name}(#{args.map {|a| a.inspect }.join(', ')})"
-      assert_raise(exc, message) { self.send(name, *args) }
+      assert_raises(exc, message) { self.send(name, *args) }
     }
   end
 
-  defassert_raise(:relative_path_from, ArgumentError, "/", ".")
-  defassert_raise(:relative_path_from, ArgumentError, ".", "/")
-  defassert_raise(:relative_path_from, ArgumentError, "a", "..")
-  defassert_raise(:relative_path_from, ArgumentError, ".", "..")
+  defassert_raises(:relative_path_from, ArgumentError, "/", ".")
+  defassert_raises(:relative_path_from, ArgumentError, ".", "/")
+  defassert_raises(:relative_path_from, ArgumentError, "a", "..")
+  defassert_raises(:relative_path_from, ArgumentError, ".", "..")
 
   def realpath(path)
     Pathname.new(path).realpath.to_s
@@ -282,9 +282,9 @@ class TestPathname < Test::Unit::TestCase
     end
     Dir.mktmpdir('rubytest-pathname') {|dir|
       File.symlink("not-exist-target", "#{dir}/not-exist")
-      assert_raise(Errno::ENOENT) { realpath("#{dir}/not-exist") }
+      assert_raises(Errno::ENOENT) { realpath("#{dir}/not-exist") }
       File.symlink("loop", "#{dir}/loop")
-      assert_raise(Errno::ELOOP) { realpath("#{dir}/loop") }
+      assert_raises(Errno::ELOOP) { realpath("#{dir}/loop") }
     }
   end
 
@@ -314,7 +314,7 @@ class TestPathname < Test::Unit::TestCase
   end
 
   def test_initialize_nul
-    assert_raise(ArgumentError) { Pathname.new("a\0") }
+    assert_raises(ArgumentError) { Pathname.new("a\0") }
   end
 
   class AnotherStringLike # :nodoc:
@@ -409,7 +409,7 @@ class TestPathname < Test::Unit::TestCase
   end
 
   def test_null_character
-    assert_raise(ArgumentError) { Pathname.new("\0") }
+    assert_raises(ArgumentError) { Pathname.new("\0") }
   end
 
   def test_taint
@@ -462,8 +462,8 @@ class TestPathname < Test::Unit::TestCase
     str = "a"
     obj = Pathname.new(str)
     assert_equal(str, obj.to_s)
-    assert_not_same(str, obj.to_s)
-    assert_not_same(obj.to_s, obj.to_s)
+    refute_same(str, obj.to_s)
+    refute_same(obj.to_s, obj.to_s)
   end
 
   def test_kernel_open
-- 
cgit v1.2.3