summaryrefslogtreecommitdiff
path: root/test/ruby/test_path.rb
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-05 11:28:27 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-05 11:28:27 +0000
commit65264eadbd3a8e1a3a96024e559a4a72d97c71e4 (patch)
treef76634ece5171d4b04d427a6a19a1d2d92ef47d8 /test/ruby/test_path.rb
parentd9f38cbee88fdbb06d8577496062918da39fdeab (diff)
* test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_path.rb')
-rw-r--r--test/ruby/test_path.rb54
1 files changed, 27 insertions, 27 deletions
diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb
index d13ec66d30..9faee72add 100644
--- a/test/ruby/test_path.rb
+++ b/test/ruby/test_path.rb
@@ -4,25 +4,25 @@ $KCODE = 'none'
class TestPath < Test::Unit::TestCase
def test_path
- assert(File.basename("a") == "a")
- assert(File.basename("a/b") == "b")
- assert(File.basename("a/b/") == "b")
- assert(File.basename("/") == "/")
- assert(File.basename("//") == "/")
- assert(File.basename("///") == "/")
- assert(File.basename("a/b////") == "b")
- assert(File.basename("a.rb", ".rb") == "a")
- assert(File.basename("a.rb///", ".rb") == "a")
- assert(File.basename("a.rb///", ".*") == "a")
- assert(File.basename("a.rb///", ".c") == "a.rb")
- assert(File.dirname("a") == ".")
- assert(File.dirname("/") == "/")
- assert(File.dirname("/a") == "/")
- assert(File.dirname("a/b") == "a")
- assert(File.dirname("a/b/c") == "a/b")
- assert(File.dirname("/a/b/c") == "/a/b")
- assert(File.dirname("/a/b/") == "/a")
- assert(File.dirname("/a/b///") == "/a")
+ assert_equal(File.basename("a"), "a")
+ assert_equal(File.basename("a/b"), "b")
+ assert_equal(File.basename("a/b/"), "b")
+ assert_equal(File.basename("/"), "/")
+ assert_equal(File.basename("//"), "/")
+ assert_equal(File.basename("///"), "/")
+ assert_equal(File.basename("a/b////"), "b")
+ assert_equal(File.basename("a.rb", ".rb"), "a")
+ assert_equal(File.basename("a.rb///", ".rb"), "a")
+ assert_equal(File.basename("a.rb///", ".*"), "a")
+ assert_equal(File.basename("a.rb///", ".c"), "a.rb")
+ assert_equal(File.dirname("a"), ".")
+ assert_equal(File.dirname("/"), "/")
+ assert_equal(File.dirname("/a"), "/")
+ assert_equal(File.dirname("a/b"), "a")
+ assert_equal(File.dirname("a/b/c"), "a/b")
+ assert_equal(File.dirname("/a/b/c"), "/a/b")
+ assert_equal(File.dirname("/a/b/"), "/a")
+ assert_equal(File.dirname("/a/b///"), "/a")
case Dir.pwd
when %r'\A\w:'
assert(/\A\w:\/\z/ =~ File.expand_path(".", "/"))
@@ -33,16 +33,16 @@ class TestPath < Test::Unit::TestCase
assert(%r'\A//[^/]+/[^/]+/a\z' =~ File.expand_path(".", "/"))
dosish = true
else
- assert(File.expand_path(".", "/") == "/")
- assert(File.expand_path("sub", "/") == "/sub")
+ assert_equal(File.expand_path(".", "/"), "/")
+ assert_equal(File.expand_path("sub", "/"), "/sub")
end
if dosish
- assert(File.expand_path("/", "//machine/share/sub") == "//machine/share")
- assert(File.expand_path("/dir", "//machine/share/sub") == "//machine/share/dir")
- assert(File.expand_path("/", "z:/sub") == "z:/")
- assert(File.expand_path("/dir", "z:/sub") == "z:/dir")
+ assert_equal(File.expand_path("/", "//machine/share/sub"), "//machine/share")
+ assert_equal(File.expand_path("/dir", "//machine/share/sub"), "//machine/share/dir")
+ assert_equal(File.expand_path("/", "z:/sub"), "z:/")
+ assert_equal(File.expand_path("/dir", "z:/sub"), "z:/dir")
end
- assert(File.expand_path(".", "//") == "//")
- assert(File.expand_path("sub", "//") == "//sub")
+ assert_equal(File.expand_path(".", "//"), "//")
+ assert_equal(File.expand_path("sub", "//"), "//sub")
end
end