mirrors/z.lua
1
0
Fork 0
mirror of https://github.com/skywind3000/z.lua synced 2026-03-12 18:59:50 +00:00
Code Issues Releases Wiki Activity

passes all the tests for os.path.split

Browse Source
This commit is contained in:
skywind3000
2019-02-03 20:19:14 +08:00
parent 588b2fc468
commit 8274913b02
2 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
test_path.lua
View File

@@ -1,10 +1,21 @@
local zmod = require('z')
local windows = os.path.sep == '\\'
-----------------------------------------------------------------------
-- logo
-----------------------------------------------------------------------
function print_title(text)
print(string.rep('-', 72))
print('-- '.. text)
print(string.rep('-', 72))
end
-----------------------------------------------------------------------
-- test normpath
-- os.path.normpath
-----------------------------------------------------------------------
print_title('os.path.normpath')
function assert_posix(path, result)
local x = os.path.normpath(path)
print('[test] normpath: ('..path..') -> (' .. result .. ')')
@@ -17,15 +28,6 @@ function assert_posix(path, result)
end
end
function test_normpath_posix()
assert_posix("", ".")
assert_posix("/", "/")
assert_posix("///", "/")
assert_posix("///foo/.//bar//", "/foo/bar")
assert_posix("///foo/.//bar//.//..//.//baz", "/foo/baz")
assert_posix("///..//./foo/.//bar", "/foo/bar")
end
function assert_windows(path, result)
local x = os.path.normpath(path)
print('[test] normpath: ('..path..') -> (' .. result .. ')')
@@ -38,7 +40,14 @@ function assert_windows(path, result)
end
end
function test_normpath_windows()
assert_posix("", ".")
assert_posix("/", "/")
assert_posix("///", "/")
assert_posix("///foo/.//bar//", "/foo/bar")
assert_posix("///foo/.//bar//.//..//.//baz", "/foo/baz")
assert_posix("///..//./foo/.//bar", "/foo/bar")
if windows then
assert_windows('A//////././//.//B', 'A\\B')
assert_windows('A/./B', 'A\\B')
assert_windows('A/foo/../B', 'A\\B')
@@ -60,16 +69,14 @@ function test_normpath_windows()
assert_windows('C:////a/b', 'C:\\a\\b')
end
test_normpath_posix()
if windows then
test_normpath_windows()
end
print()
-----------------------------------------------------------------------
-- test path join
-- os.path.join
-----------------------------------------------------------------------
print_title('os.path.join')
function assert_join_posix(segments, result, isnt)
print('[test] join: '..zmod.dump(segments)..' -> (' .. result .. ')')
local path = ''
@@ -91,13 +98,11 @@ function assert_join_windows(segments, result)
assert_join_posix(segments, result, 1)
end
function test_join_posix()
assert_join_posix({"/foo", "bar", "/bar", "baz"}, "/bar/baz")
assert_join_posix({"/foo", "bar", "baz"}, "/foo/bar/baz")
assert_join_posix({"/foo/", "bar/", "baz/"}, "/foo/bar/baz/")
end
assert_join_posix({"/foo", "bar", "/bar", "baz"}, "/bar/baz")
assert_join_posix({"/foo", "bar", "baz"}, "/foo/bar/baz")
assert_join_posix({"/foo/", "bar/", "baz/"}, "/foo/bar/baz/")
function test_join_windows()
if windows then
assert_join_windows({""}, '')
assert_join_windows({"", "", ""}, '')
assert_join_windows({"a"}, 'a')
@@ -150,9 +155,39 @@ function test_join_windows()
end
end
test_join_posix()
print()
if windows then
test_join_windows()
-----------------------------------------------------------------------
-- os.path.split
-----------------------------------------------------------------------
print_title('os.path.split')
function assert_split(path, sep1, sep2)
print('[test] split: "' .. path ..'" -> ("' .. sep1 .. '", "' .. sep2 .. '")')
local x, y = os.path.split(path)
if x ~= sep1 or y ~= sep2 then
print('failed: ("'..x..'", "'..y..'")')
os.exit()
else
print('passed')
end
end
assert_split("", "", "")
assert_split(".", "", ".")
assert_split("/foo/bar", "/foo", "bar")
assert_split("/", "/", "")
assert_split("foo", "", "foo")
assert_split("////foo", "////", "foo")
assert_split("//foo//bar", "//foo", "bar")
if windows then
assert_split("c:\\foo\\bar", 'c:\\foo', 'bar')
assert_split("\\\\conky\\mountpoint\\foo\\bar", '\\\\conky\\mountpoint\\foo', 'bar')
assert_split("c:\\", "c:\\", '')
assert_split("c:/", "c:/", '')
assert_split("c:test", "c:", 'test')
assert_split("c:", "c:", '')
-- assert_split("\\\\conky\\mountpoint\\", "\\\\conky\\mountpoint\\", '')
end

15
z.lua
View File

@@ -613,13 +613,16 @@ function os.path.split(path)
end
local head = path:sub(1, pos)
local tail = path:sub(pos + 1)
local test = string.rep('/', head:len())
if head ~= test then
head = head:gsub('/+$', '')
elseif windows then
test = string.rep('\\', head:len())
if not windows then
local test = string.rep('/', head:len())
if head ~= test then
head = head:gsub('\\+$', '')
head = head:gsub('/+$', '')
end
else
local t1 = string.rep('/', head:len())
local t2 = string.rep('\\', head:len())
if head ~= t1 and head ~= t2 then
head = head:gsub('[/\\]+$', '')
end
end
return head, tail