From a8abed1256fe6e800d240b5ca3ddce1b4fec67a5 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 18 Nov 2005 09:09:25 +0000 Subject: * file.c (rb_file_s_dirname): should use skipprefix for UNC path. pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_path.rb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'test/ruby/test_path.rb') diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb index 4b9365508a..09ab4ac677 100644 --- a/test/ruby/test_path.rb +++ b/test/ruby/test_path.rb @@ -95,23 +95,31 @@ class TestPath < Test::Unit::TestCase if /(bcc|ms|cyg)win|mingw|djgpp|human|emx/ =~ RUBY_PLATFORM # DOSISH_UNC assert_equal('//', File.dirname('//')) - assert_equal('//', File.dirname('//a')) - assert_equal('//', File.dirname('//a/')) - assert_equal('//a', File.dirname('//a/b')) + assert_equal('//a', File.dirname('//a')) + assert_equal('//a/', File.dirname('//a/')) + assert_equal('//a/b', File.dirname('//a/b')) + assert_equal('//a/b', File.dirname('//a/b/')) + assert_equal('//a/b', File.dirname('//a/b/c')) assert_equal('//', File.dirname('///')) - assert_equal('//', File.dirname('///a')) - assert_equal('//', File.dirname('///a/')) - assert_equal('//a', File.dirname('///a/b')) + assert_equal('//a', File.dirname('///a')) + assert_equal('//a/', File.dirname('///a/')) + assert_equal('//a/b', File.dirname('///a/b')) + assert_equal('//a/b', File.dirname('///a/b/')) + assert_equal('//a/b', File.dirname('///a/b/c')) else # others assert_equal('/', File.dirname('//')) assert_equal('/', File.dirname('//a')) assert_equal('/', File.dirname('//a/')) assert_equal('/a', File.dirname('//a/b')) + assert_equal('/a', File.dirname('//a/b/')) + assert_equal('/a/b', File.dirname('//a/b/c')) assert_equal('/', File.dirname('///')) assert_equal('/', File.dirname('///a')) assert_equal('/', File.dirname('///a/')) assert_equal('/a', File.dirname('///a/b')) + assert_equal('/a', File.dirname('///a/b/')) + assert_equal('/a/b', File.dirname('///a/b/c')) end end end -- cgit v1.2.3