test: cleanup, reduce verbosity

This commit is contained in:
Justin M. Keyes 2019-06-01 21:59:42 +02:00
parent ed24a297e5
commit 2e171a6fd1

View File

@ -860,86 +860,87 @@ describe('fs.c', function()
describe('FileInfo', function() describe('FileInfo', function()
local function file_info_new() local function file_info_new()
local file_info = ffi.new('FileInfo[1]') local info = ffi.new('FileInfo[1]')
file_info[0].stat.st_ino = 0 info[0].stat.st_ino = 0
file_info[0].stat.st_dev = 0 info[0].stat.st_dev = 0
return file_info return info
end end
local function is_file_info_filled(file_info) -- Returns true if the FileInfo object has non-empty fields.
return file_info[0].stat.st_ino > 0 and file_info[0].stat.st_dev > 0 local function has_fileinfo(info)
return info[0].stat.st_ino > 0 and info[0].stat.st_dev > 0
end end
local function file_id_new() local function file_id_new()
local file_info = ffi.new('FileID[1]') local info = ffi.new('FileID[1]')
file_info[0].inode = 0 info[0].inode = 0
file_info[0].device_id = 0 info[0].device_id = 0
return file_info return info
end end
describe('os_fileinfo', function() describe('os_fileinfo', function()
itp('returns false if path=NULL', function() itp('returns false if path=NULL', function()
local file_info = file_info_new() local info = file_info_new()
assert.is_false((fs.os_fileinfo(nil, file_info))) assert.is_false((fs.os_fileinfo(nil, info)))
end) end)
itp('returns false if given a non-existing file', function() itp('returns false if given a non-existing file', function()
local file_info = file_info_new() local info = file_info_new()
assert.is_false((fs.os_fileinfo('/non-existent', file_info))) assert.is_false((fs.os_fileinfo('/non-existent', info)))
end) end)
itp('returns true if given an existing file and fills file_info', function() itp('returns true if given an existing file and fills FileInfo', function()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
assert.is_true((fs.os_fileinfo(path, file_info))) assert.is_true((fs.os_fileinfo(path, info)))
assert.is_true((is_file_info_filled(file_info))) assert.is_true((has_fileinfo(info)))
end) end)
itp('returns the file info of the linked file, not the link', function() itp('returns the FileInfo of the linked file, not the link', function()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test_link.file' local path = 'unit-test-directory/test_link.file'
assert.is_true((fs.os_fileinfo(path, file_info))) assert.is_true((fs.os_fileinfo(path, info)))
assert.is_true((is_file_info_filled(file_info))) assert.is_true((has_fileinfo(info)))
local mode = tonumber(file_info[0].stat.st_mode) local mode = tonumber(info[0].stat.st_mode)
return eq(ffi.C.kS_IFREG, (bit.band(mode, ffi.C.kS_IFMT))) return eq(ffi.C.kS_IFREG, (bit.band(mode, ffi.C.kS_IFMT)))
end) end)
end) end)
describe('os_fileinfo_link', function() describe('os_fileinfo_link', function()
itp('returns false if given a non-existing file', function() itp('returns false for non-existing file', function()
local file_info = file_info_new() local info = file_info_new()
assert.is_false((fs.os_fileinfo_link('/non-existent', file_info))) assert.is_false((fs.os_fileinfo_link('/non-existent', info)))
end) end)
itp('returns true if given an existing file and fills file_info', function() itp('returns true and fills FileInfo for existing file', function()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
assert.is_true((fs.os_fileinfo_link(path, file_info))) assert.is_true((fs.os_fileinfo_link(path, info)))
assert.is_true((is_file_info_filled(file_info))) assert.is_true((has_fileinfo(info)))
end) end)
itp('returns the file info of the link, not the linked file', function() itp('returns FileInfo of the link, not its target', function()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test_link.file' local link = 'unit-test-directory/test_link.file'
assert.is_true((fs.os_fileinfo_link(path, file_info))) assert.is_true((fs.os_fileinfo_link(link, info)))
assert.is_true((is_file_info_filled(file_info))) assert.is_true((has_fileinfo(info)))
local mode = tonumber(file_info[0].stat.st_mode) local mode = tonumber(info[0].stat.st_mode)
eq(ffi.C.kS_IFLNK, (bit.band(mode, ffi.C.kS_IFMT))) eq(ffi.C.kS_IFLNK, (bit.band(mode, ffi.C.kS_IFMT)))
end) end)
end) end)
describe('os_fileinfo_fd', function() describe('os_fileinfo_fd', function()
itp('returns false if given an invalid file descriptor', function() itp('returns false if given an invalid file descriptor', function()
local file_info = file_info_new() local info = file_info_new()
assert.is_false((fs.os_fileinfo_fd(-1, file_info))) assert.is_false((fs.os_fileinfo_fd(-1, info)))
end) end)
itp('returns true if given a file descriptor and fills file_info', function() itp('returns true if given a file descriptor and fills FileInfo', function()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
local fd = ffi.C.open(path, 0) local fd = ffi.C.open(path, 0)
assert.is_true((fs.os_fileinfo_fd(fd, file_info))) assert.is_true((fs.os_fileinfo_fd(fd, info)))
assert.is_true((is_file_info_filled(file_info))) assert.is_true((has_fileinfo(info)))
ffi.C.close(fd) ffi.C.close(fd)
end) end)
end) end)
@ -976,24 +977,24 @@ describe('fs.c', function()
end) end)
describe('os_fileinfo_id', function() describe('os_fileinfo_id', function()
itp('extracts ino/dev from file_info into file_id', function() itp('extracts ino/dev from FileInfo into file_id', function()
local file_info = file_info_new() local info = file_info_new()
local file_id = file_id_new() local file_id = file_id_new()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
assert.is_true((fs.os_fileinfo(path, file_info))) assert.is_true((fs.os_fileinfo(path, info)))
fs.os_fileinfo_id(file_info, file_id) fs.os_fileinfo_id(info, file_id)
eq(file_info[0].stat.st_ino, file_id[0].inode) eq(info[0].stat.st_ino, file_id[0].inode)
eq(file_info[0].stat.st_dev, file_id[0].device_id) eq(info[0].stat.st_dev, file_id[0].device_id)
end) end)
end) end)
describe('os_fileinfo_inode', function() describe('os_fileinfo_inode', function()
itp('returns the inode from file_info', function() itp('returns the inode from FileInfo', function()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
assert.is_true((fs.os_fileinfo(path, file_info))) assert.is_true((fs.os_fileinfo(path, info)))
local inode = fs.os_fileinfo_inode(file_info) local inode = fs.os_fileinfo_inode(info)
eq(file_info[0].stat.st_ino, inode) eq(info[0].stat.st_ino, inode)
end) end)
end) end)
@ -1005,9 +1006,9 @@ describe('fs.c', function()
file:flush() file:flush()
file:close() file:close()
local size = lfs.attributes(path, 'size') local size = lfs.attributes(path, 'size')
local file_info = file_info_new() local info = file_info_new()
assert.is_true(fs.os_fileinfo(path, file_info)) assert.is_true(fs.os_fileinfo(path, info))
eq(size, fs.os_fileinfo_size(file_info)) eq(size, fs.os_fileinfo_size(info))
end) end)
end) end)
@ -1015,12 +1016,12 @@ describe('fs.c', function()
itp('returns the correct number of hardlinks', function() itp('returns the correct number of hardlinks', function()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
local path_link = 'unit-test-directory/test_hlink.file' local path_link = 'unit-test-directory/test_hlink.file'
local file_info = file_info_new() local info = file_info_new()
assert.is_true(fs.os_fileinfo(path, file_info)) assert.is_true(fs.os_fileinfo(path, info))
eq(1, fs.os_fileinfo_hardlinks(file_info)) eq(1, fs.os_fileinfo_hardlinks(info))
lfs.link(path, path_link) lfs.link(path, path_link)
assert.is_true(fs.os_fileinfo(path, file_info)) assert.is_true(fs.os_fileinfo(path, info))
eq(2, fs.os_fileinfo_hardlinks(file_info)) eq(2, fs.os_fileinfo_hardlinks(info))
end) end)
end) end)
@ -1032,15 +1033,15 @@ describe('fs.c', function()
-- https://github.com/keplerproject/luafilesystem/pull/44 -- https://github.com/keplerproject/luafilesystem/pull/44
-- using this workaround for now: -- using this workaround for now:
local blksize = lfs.attributes(path).blksize local blksize = lfs.attributes(path).blksize
local file_info = file_info_new() local info = file_info_new()
assert.is_true(fs.os_fileinfo(path, file_info)) assert.is_true(fs.os_fileinfo(path, info))
if blksize then if blksize then
eq(blksize, fs.os_fileinfo_blocksize(file_info)) eq(blksize, fs.os_fileinfo_blocksize(info))
else else
-- luafs dosn't support blksize on windows -- luafs dosn't support blksize on windows
-- libuv on windows returns a constant value as blocksize -- libuv on windows returns a constant value as blocksize
-- checking for this constant value should be enough -- checking for this constant value should be enough
eq(2048, fs.os_fileinfo_blocksize(file_info)) eq(2048, fs.os_fileinfo_blocksize(info))
end end
end) end)
end) end)
@ -1080,23 +1081,23 @@ describe('fs.c', function()
end) end)
describe('os_fileid_equal_fileinfo', function() describe('os_fileid_equal_fileinfo', function()
itp('returns true if file_id and file_info represent the same file', function() itp('returns true if file_id and FileInfo represent the same file', function()
local file_id = file_id_new() local file_id = file_id_new()
local file_info = file_info_new() local info = file_info_new()
local path = 'unit-test-directory/test.file' local path = 'unit-test-directory/test.file'
assert.is_true((fs.os_fileid(path, file_id))) assert.is_true((fs.os_fileid(path, file_id)))
assert.is_true((fs.os_fileinfo(path, file_info))) assert.is_true((fs.os_fileinfo(path, info)))
assert.is_true((fs.os_fileid_equal_fileinfo(file_id, file_info))) assert.is_true((fs.os_fileid_equal_fileinfo(file_id, info)))
end) end)
itp('returns false if file_id and file_info represent different files', function() itp('returns false if file_id and FileInfo represent different files', function()
local file_id = file_id_new() local file_id = file_id_new()
local file_info = file_info_new() local info = file_info_new()
local path_1 = 'unit-test-directory/test.file' local path_1 = 'unit-test-directory/test.file'
local path_2 = 'unit-test-directory/test_2.file' local path_2 = 'unit-test-directory/test_2.file'
assert.is_true((fs.os_fileid(path_1, file_id))) assert.is_true((fs.os_fileid(path_1, file_id)))
assert.is_true((fs.os_fileinfo(path_2, file_info))) assert.is_true((fs.os_fileinfo(path_2, info)))
assert.is_false((fs.os_fileid_equal_fileinfo(file_id, file_info))) assert.is_false((fs.os_fileid_equal_fileinfo(file_id, info)))
end) end)
end) end)
end) end)