diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-02 02:40:33 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-02 02:40:33 +0000 |
commit | c6866f855206d2daa55324c3576ffaa7c4e95f85 (patch) | |
tree | 647130299b17a7528e6ae5abc9ac52c60d9e981e /test/pathname | |
parent | 179b7eaa6b377c97f006342dbbadf3310cc2c3d3 (diff) | |
download | ruby-c6866f855206d2daa55324c3576ffaa7c4e95f85.tar.gz |
Back out the previous change after miniunit import.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/pathname')
-rw-r--r-- | test/pathname/test_pathname.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index fbe344552e..da12383bdd 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_raises(name, exc, *args) + def self.defassert_raise(name, exc, *args) define_assertion(name) { message = "#{name}(#{args.map {|a| a.inspect }.join(', ')})" - assert_raises(exc, message) { self.send(name, *args) } + assert_raise(exc, message) { self.send(name, *args) } } end - 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, ".", "..") + 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, ".", "..") 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_raises(Errno::ENOENT) { realpath("#{dir}/not-exist") } + assert_raise(Errno::ENOENT) { realpath("#{dir}/not-exist") } File.symlink("loop", "#{dir}/loop") - assert_raises(Errno::ELOOP) { realpath("#{dir}/loop") } + assert_raise(Errno::ELOOP) { realpath("#{dir}/loop") } } end @@ -314,7 +314,7 @@ class TestPathname < Test::Unit::TestCase end def test_initialize_nul - assert_raises(ArgumentError) { Pathname.new("a\0") } + assert_raise(ArgumentError) { Pathname.new("a\0") } end class AnotherStringLike # :nodoc: @@ -409,7 +409,7 @@ class TestPathname < Test::Unit::TestCase end def test_null_character - assert_raises(ArgumentError) { Pathname.new("\0") } + assert_raise(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) - refute_same(str, obj.to_s) - refute_same(obj.to_s, obj.to_s) + assert_not_same(str, obj.to_s) + assert_not_same(obj.to_s, obj.to_s) end def test_kernel_open |