aboutsummaryrefslogtreecommitdiff
path: root/test/unit
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/fixtures/multiqueue.c8
-rw-r--r--test/unit/helpers.lua6
-rw-r--r--test/unit/os/env_spec.lua2
-rw-r--r--test/unit/os/fileio_spec.lua69
-rw-r--r--test/unit/os/fs_spec.lua73
-rw-r--r--test/unit/path_spec.lua71
-rw-r--r--test/unit/preload.lua1
-rw-r--r--test/unit/preprocess.lua6
-rw-r--r--test/unit/tempfile_spec.lua3
-rw-r--r--test/unit/undo_spec.lua25
10 files changed, 129 insertions, 135 deletions
diff --git a/test/unit/fixtures/multiqueue.c b/test/unit/fixtures/multiqueue.c
index a8dca0a844..4f4f5989d9 100644
--- a/test/unit/fixtures/multiqueue.c
+++ b/test/unit/fixtures/multiqueue.c
@@ -7,13 +7,13 @@
#include "multiqueue.h"
-void ut_multiqueue_put(MultiQueue *this, const char *str)
+void ut_multiqueue_put(MultiQueue *self, const char *str)
{
- multiqueue_put(this, NULL, 1, str);
+ multiqueue_put(self, NULL, 1, str);
}
-const char *ut_multiqueue_get(MultiQueue *this)
+const char *ut_multiqueue_get(MultiQueue *self)
{
- Event event = multiqueue_get(this);
+ Event event = multiqueue_get(self);
return event.argv[0];
}
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 686af3b461..708929ad9f 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -148,7 +148,11 @@ local cdef = ffi.cdef
local cimportstr
-local previous_defines_init = ''
+local previous_defines_init = [[
+typedef struct { char bytes[16]; } __attribute__((aligned(16))) __uint128_t;
+typedef struct { char bytes[16]; } __attribute__((aligned(16))) __float128;
+]]
+
local preprocess_cache_init = {}
local previous_defines_mod = ''
local preprocess_cache_mod = nil
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index 71177f4c65..24b92edee5 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -10,8 +10,6 @@ local to_cstr = helpers.to_cstr
local NULL = helpers.NULL
local OK = 0
-require('lfs')
-
local cimp = cimport('./src/nvim/os/os.h')
describe('env.c', function()
diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
index 4d58a8934e..fd30ca70da 100644
--- a/test/unit/os/fileio_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -1,4 +1,4 @@
-local lfs = require('lfs')
+local luv = require('luv')
local helpers = require('test.unit.helpers')(after_each)
local itp = helpers.gen_itp(it)
@@ -7,6 +7,7 @@ local eq = helpers.eq
local ffi = helpers.ffi
local cimport = helpers.cimport
local cppimport = helpers.cppimport
+local mkdir = helpers.mkdir
local m = cimport('./src/nvim/os/os.h', './src/nvim/os/fileio.h')
cppimport('fcntl.h')
@@ -25,7 +26,7 @@ local linkb = dir .. '/broken.lnk'
local filec = dir .. '/created-file.dat'
before_each(function()
- lfs.mkdir(dir);
+ mkdir(dir);
local f1 = io.open(file1, 'w')
f1:write(fcontents)
@@ -35,8 +36,8 @@ before_each(function()
f2:write(fcontents)
f2:close()
- lfs.link('file1.dat', linkf, true)
- lfs.link('broken.dat', linkb, true)
+ luv.fs_symlink('file1.dat', linkf)
+ luv.fs_symlink('broken.dat', linkb)
end)
after_each(function()
@@ -45,7 +46,7 @@ after_each(function()
os.remove(linkf)
os.remove(linkb)
os.remove(filec)
- lfs.rmdir(dir)
+ luv.fs_rmdir(dir)
end)
local function file_open(fname, flags, mode)
@@ -119,13 +120,13 @@ describe('file_open_fd', function()
eq(0, m.file_close(fp, false))
end)
itp('can use file descriptor returned by os_open for writing', function()
- eq(nil, lfs.attributes(filec))
+ eq(nil, luv.fs_stat(filec))
local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
local err, fp = file_open_fd(fd, m.kFileWriteOnly)
eq(0, err)
eq(4, file_write(fp, 'test'))
eq(0, m.file_close(fp, false))
- eq(4, lfs.attributes(filec).size)
+ eq(4, luv.fs_stat(filec).size)
eq('test', io.open(filec):read('*a'))
end)
end)
@@ -139,13 +140,13 @@ describe('file_open_fd_new', function()
eq(0, m.file_free(fp, false))
end)
itp('can use file descriptor returned by os_open for writing', function()
- eq(nil, lfs.attributes(filec))
+ eq(nil, luv.fs_stat(filec))
local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
local err, fp = file_open_fd_new(fd, m.kFileWriteOnly)
eq(0, err)
eq(4, file_write(fp, 'test'))
eq(0, m.file_free(fp, false))
- eq(4, lfs.attributes(filec).size)
+ eq(4, luv.fs_stat(filec).size)
eq('test', io.open(filec):read('*a'))
end)
end)
@@ -154,32 +155,32 @@ describe('file_open', function()
itp('can create a rwx------ file with kFileCreate', function()
local err, fp = file_open(filec, m.kFileCreate, 448)
eq(0, err)
- local attrs = lfs.attributes(filec)
- eq('rwx------', attrs.permissions)
+ local attrs = luv.fs_stat(filec)
+ eq(33216, attrs.mode)
eq(0, m.file_close(fp, false))
end)
itp('can create a rw------- file with kFileCreate', function()
local err, fp = file_open(filec, m.kFileCreate, 384)
eq(0, err)
- local attrs = lfs.attributes(filec)
- eq('rw-------', attrs.permissions)
+ local attrs = luv.fs_stat(filec)
+ eq(33152, attrs.mode)
eq(0, m.file_close(fp, false))
end)
itp('can create a rwx------ file with kFileCreateOnly', function()
local err, fp = file_open(filec, m.kFileCreateOnly, 448)
eq(0, err)
- local attrs = lfs.attributes(filec)
- eq('rwx------', attrs.permissions)
+ local attrs = luv.fs_stat(filec)
+ eq(33216, attrs.mode)
eq(0, m.file_close(fp, false))
end)
itp('can create a rw------- file with kFileCreateOnly', function()
local err, fp = file_open(filec, m.kFileCreateOnly, 384)
eq(0, err)
- local attrs = lfs.attributes(filec)
- eq('rw-------', attrs.permissions)
+ local attrs = luv.fs_stat(filec)
+ eq(33152, attrs.mode)
eq(0, m.file_close(fp, false))
end)
@@ -228,7 +229,7 @@ describe('file_open', function()
eq(0, err)
eq(true, fp.wr)
eq(0, m.file_close(fp, false))
- local attrs = lfs.attributes(file1)
+ local attrs = luv.fs_stat(file1)
eq(0, attrs.size)
end)
@@ -237,14 +238,14 @@ describe('file_open', function()
eq(0, err)
eq(true, fp.wr)
eq(0, m.file_close(fp, false))
- local attrs = lfs.attributes(file1)
+ local attrs = luv.fs_stat(file1)
eq(4096, attrs.size)
end)
itp('fails to create a file with just kFileWriteOnly', function()
local err, _ = file_open(filec, m.kFileWriteOnly, 384)
eq(m.UV_ENOENT, err)
- local attrs = lfs.attributes(filec)
+ local attrs = luv.fs_stat(filec)
eq(nil, attrs)
end)
@@ -254,7 +255,7 @@ describe('file_open', function()
eq(0, err)
eq(true, fp.wr)
eq(0, m.file_close(fp, false))
- local attrs = lfs.attributes(file1)
+ local attrs = luv.fs_stat(file1)
eq(0, attrs.size)
end)
@@ -295,9 +296,9 @@ describe('file_close', function()
eq(0, err)
local wsize = file_write(fp, 'test')
eq(4, wsize)
- eq(0, lfs.attributes(filec).size)
+ eq(0, luv.fs_stat(filec).size)
eq(0, m.file_close(fp, true))
- eq(wsize, lfs.attributes(filec).size)
+ eq(wsize, luv.fs_stat(filec).size)
end)
end)
@@ -307,9 +308,9 @@ describe('file_free', function()
eq(0, err)
local wsize = file_write(fp, 'test')
eq(4, wsize)
- eq(0, lfs.attributes(filec).size)
+ eq(0, luv.fs_stat(filec).size)
eq(0, m.file_free(fp, true))
- eq(wsize, lfs.attributes(filec).size)
+ eq(wsize, luv.fs_stat(filec).size)
end)
end)
@@ -318,12 +319,12 @@ describe('file_fsync', function()
local err, fp = file_open(filec, m.kFileCreateOnly, 384)
eq(0, file_fsync(fp))
eq(0, err)
- eq(0, lfs.attributes(filec).size)
+ eq(0, luv.fs_stat(filec).size)
local wsize = file_write(fp, 'test')
eq(4, wsize)
- eq(0, lfs.attributes(filec).size)
+ eq(0, luv.fs_stat(filec).size)
eq(0, file_fsync(fp))
- eq(wsize, lfs.attributes(filec).size)
+ eq(wsize, luv.fs_stat(filec).size)
eq(0, m.file_close(fp, false))
end)
end)
@@ -333,12 +334,12 @@ describe('file_flush', function()
local err, fp = file_open(filec, m.kFileCreateOnly, 384)
eq(0, file_flush(fp))
eq(0, err)
- eq(0, lfs.attributes(filec).size)
+ eq(0, luv.fs_stat(filec).size)
local wsize = file_write(fp, 'test')
eq(4, wsize)
- eq(0, lfs.attributes(filec).size)
+ eq(0, luv.fs_stat(filec).size)
eq(0, file_flush(fp))
- eq(wsize, lfs.attributes(filec).size)
+ eq(wsize, luv.fs_stat(filec).size)
eq(0, m.file_close(fp, false))
end)
end)
@@ -412,7 +413,7 @@ describe('file_write', function()
local wr = file_write(fp, fcontents)
eq(#fcontents, wr)
eq(0, m.file_close(fp, false))
- eq(wr, lfs.attributes(filec).size)
+ eq(wr, luv.fs_stat(filec).size)
eq(fcontents, io.open(filec):read('*a'))
end)
@@ -429,7 +430,7 @@ describe('file_write', function()
shift = shift + size
end
eq(0, m.file_close(fp, false))
- eq(#fcontents, lfs.attributes(filec).size)
+ eq(#fcontents, luv.fs_stat(filec).size)
eq(fcontents, io.open(filec):read('*a'))
end)
@@ -446,7 +447,7 @@ describe('file_write', function()
shift = shift + size
end
eq(0, m.file_close(fp, false))
- eq(#fcontents, lfs.attributes(filec).size)
+ eq(#fcontents, luv.fs_stat(filec).size)
eq(fcontents, io.open(filec):read('*a'))
end)
end)
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index c718244ea4..95a12f5b17 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -1,4 +1,4 @@
-local lfs = require('lfs')
+local luv = require('luv')
local bit = require('bit')
local helpers = require('test.unit.helpers')(after_each)
@@ -16,6 +16,7 @@ local to_cstr = helpers.to_cstr
local OK = helpers.OK
local FAIL = helpers.FAIL
local NULL = helpers.NULL
+local mkdir = helpers.mkdir
local NODE_NORMAL = 0
local NODE_WRITABLE = 1
@@ -48,11 +49,11 @@ local function unset_bit(number, to_unset)
end
local function assert_file_exists(filepath)
- neq(nil, lfs.attributes(filepath))
+ neq(nil, luv.fs_stat(filepath))
end
local function assert_file_does_not_exist(filepath)
- eq(nil, lfs.attributes(filepath))
+ eq(nil, luv.fs_stat(filepath))
end
local function os_setperm(filename, perm)
@@ -70,14 +71,14 @@ describe('fs.c', function()
end
before_each(function()
- lfs.mkdir('unit-test-directory');
+ mkdir('unit-test-directory');
io.open('unit-test-directory/test.file', 'w'):close()
io.open('unit-test-directory/test_2.file', 'w'):close()
- lfs.link('test.file', 'unit-test-directory/test_link.file', true)
+ luv.fs_symlink('test.file', 'unit-test-directory/test_link.file')
- lfs.link('non_existing_file.file', 'unit-test-directory/test_broken_link.file', true)
+ luv.fs_symlink('non_existing_file.file', 'unit-test-directory/test_broken_link.file')
-- The tests are invoked with an absolute path to `busted` executable.
absolute_executable = arg[0]
-- Split the absolute_executable path into a directory and filename.
@@ -90,19 +91,19 @@ describe('fs.c', function()
os.remove('unit-test-directory/test_link.file')
os.remove('unit-test-directory/test_hlink.file')
os.remove('unit-test-directory/test_broken_link.file')
- lfs.rmdir('unit-test-directory')
+ luv.fs_rmdir('unit-test-directory')
end)
describe('os_dirname', function()
itp('returns OK and writes current directory to the buffer', function()
- local length = string.len(lfs.currentdir()) + 1
+ local length = string.len(luv.cwd()) + 1
local buf = cstr(length, '')
eq(OK, fs.os_dirname(buf, length))
- eq(lfs.currentdir(), ffi.string(buf))
+ eq(luv.cwd(), ffi.string(buf))
end)
itp('returns FAIL if the buffer is too small', function()
- local length = string.len(lfs.currentdir()) + 1
+ local length = string.len(luv.cwd()) + 1
local buf = cstr(length - 1, '')
eq(FAIL, fs.os_dirname(buf, length - 1))
end)
@@ -203,20 +204,20 @@ describe('fs.c', function()
end)
itp('returns the absolute path when given an executable relative to the current dir', function()
- local old_dir = lfs.currentdir()
+ local old_dir = luv.cwd()
- lfs.chdir(directory)
+ luv.chdir(directory)
-- Rely on currentdir to resolve symlinks, if any. Testing against
-- the absolute path taken from arg[0] may result in failure where
-- the path has a symlink in it.
- local canonical = lfs.currentdir() .. '/' .. executable_name
+ local canonical = luv.cwd() .. '/' .. executable_name
local expected = exe(canonical)
local relative_executable = './' .. executable_name
local res = exe(relative_executable)
-- Don't test yet; we need to chdir back first.
- lfs.chdir(old_dir)
+ luv.chdir(old_dir)
eq(expected, res)
end)
end)
@@ -278,11 +279,11 @@ describe('fs.c', function()
describe('os_fchown', function()
local filename = 'unit-test-directory/test.file'
itp('does not change owner and group if respective IDs are equal to -1', function()
- local uid = lfs.attributes(filename, 'uid')
- local gid = lfs.attributes(filename, 'gid')
+ local uid = luv.fs_stat(filename).uid
+ local gid = luv.fs_stat(filename).gid
eq(0, os_fchown(filename, -1, -1))
- eq(uid, lfs.attributes(filename, 'uid'))
- return eq(gid, lfs.attributes(filename, 'gid'))
+ eq(uid, luv.fs_stat(filename).uid)
+ return eq(gid, luv.fs_stat(filename).gid)
end)
-- Some systems may not have `id` utility.
@@ -290,7 +291,7 @@ describe('fs.c', function()
pending('skipped (missing `id` utility)', function() end)
else
itp('owner of a file may change the group of the file to any group of which that owner is a member', function()
- local file_gid = lfs.attributes(filename, 'gid')
+ local file_gid = luv.fs_stat(filename).gid
-- Gets ID of any group of which current user is a member except the
-- group that owns the file.
@@ -305,7 +306,7 @@ describe('fs.c', function()
-- In that case we can not perform this test.
if new_gid then
eq(0, (os_fchown(filename, -1, new_gid)))
- eq(new_gid, (lfs.attributes(filename, 'gid')))
+ eq(new_gid, luv.fs_stat(filename).gid)
end
end)
end
@@ -548,7 +549,7 @@ describe('fs.c', function()
--create the file
local fd = os_open(new_file, ffi.C.kO_CREAT, tonumber("700", 8))
--verify permissions
- eq('rwx------', lfs.attributes(new_file)['permissions'])
+ eq(33216, luv.fs_stat(new_file).mode)
eq(0, os_close(fd))
end)
@@ -557,7 +558,7 @@ describe('fs.c', function()
--create the file
local fd = os_open(new_file, ffi.C.kO_CREAT, tonumber("600", 8))
--verify permissions
- eq('rw-------', lfs.attributes(new_file)['permissions'])
+ eq(33152, luv.fs_stat(new_file).mode)
eq(0, os_close(fd))
end)
@@ -766,7 +767,7 @@ describe('fs.c', function()
eq(false, (os_isdir('unit-test-directory/new-dir')))
eq(0, (os_mkdir('unit-test-directory/new-dir', mode)))
eq(true, (os_isdir('unit-test-directory/new-dir')))
- lfs.rmdir('unit-test-directory/new-dir')
+ luv.fs_rmdir('unit-test-directory/new-dir')
end)
end)
@@ -801,7 +802,7 @@ describe('fs.c', function()
eq(0, ret)
eq(nil, failed_str)
eq(true, os_isdir('unit-test-directory/new-dir-recurse'))
- lfs.rmdir('unit-test-directory/new-dir-recurse')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse')
eq(false, os_isdir('unit-test-directory/new-dir-recurse'))
end)
@@ -812,7 +813,7 @@ describe('fs.c', function()
eq(0, ret)
eq(nil, failed_str)
eq(true, os_isdir('unit-test-directory/new-dir-recurse'))
- lfs.rmdir('unit-test-directory/new-dir-recurse')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse')
eq(false, os_isdir('unit-test-directory/new-dir-recurse'))
end)
@@ -823,7 +824,7 @@ describe('fs.c', function()
eq(0, ret)
eq(nil, failed_str)
eq(true, os_isdir('unit-test-directory/new-dir-recurse'))
- lfs.rmdir('unit-test-directory/new-dir-recurse')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse')
eq(false, os_isdir('unit-test-directory/new-dir-recurse'))
end)
@@ -837,10 +838,10 @@ describe('fs.c', function()
eq(true, os_isdir('unit-test-directory/new-dir-recurse/1'))
eq(true, os_isdir('unit-test-directory/new-dir-recurse/1/2'))
eq(true, os_isdir('unit-test-directory/new-dir-recurse/1/2/3'))
- lfs.rmdir('unit-test-directory/new-dir-recurse/1/2/3')
- lfs.rmdir('unit-test-directory/new-dir-recurse/1/2')
- lfs.rmdir('unit-test-directory/new-dir-recurse/1')
- lfs.rmdir('unit-test-directory/new-dir-recurse')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse/1/2/3')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse/1/2')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse/1')
+ luv.fs_rmdir('unit-test-directory/new-dir-recurse')
eq(false, os_isdir('unit-test-directory/new-dir-recurse'))
end)
end)
@@ -851,7 +852,7 @@ describe('fs.c', function()
end)
itp('removes the given directory and returns 0', function()
- lfs.mkdir('unit-test-directory/new-dir')
+ mkdir('unit-test-directory/new-dir')
eq(0, os_rmdir('unit-test-directory/new-dir'))
eq(false, (os_isdir('unit-test-directory/new-dir')))
end)
@@ -1005,7 +1006,7 @@ describe('fs.c', function()
file:write('some bytes to get filesize != 0')
file:flush()
file:close()
- local size = lfs.attributes(path, 'size')
+ local size = luv.fs_stat(path).size
local info = file_info_new()
assert.is_true(fs.os_fileinfo(path, info))
eq(size, fs.os_fileinfo_size(info))
@@ -1019,7 +1020,7 @@ describe('fs.c', function()
local info = file_info_new()
assert.is_true(fs.os_fileinfo(path, info))
eq(1, fs.os_fileinfo_hardlinks(info))
- lfs.link(path, path_link)
+ luv.fs_link(path, path_link)
assert.is_true(fs.os_fileinfo(path, info))
eq(2, fs.os_fileinfo_hardlinks(info))
end)
@@ -1028,11 +1029,7 @@ describe('fs.c', function()
describe('os_fileinfo_blocksize', function()
itp('returns the correct blocksize of a file', function()
local path = 'unit-test-directory/test.file'
- -- there is a bug in luafilesystem where
- -- `lfs.attributes path, 'blksize'` returns the wrong value:
- -- https://github.com/keplerproject/luafilesystem/pull/44
- -- using this workaround for now:
- local blksize = lfs.attributes(path).blksize
+ local blksize = luv.fs_stat(path).blksize
local info = file_info_new()
assert.is_true(fs.os_fileinfo(path, info))
if blksize then
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index 1fc4e2496e..5808e2013a 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -1,4 +1,4 @@
-local lfs = require('lfs')
+local luv = require('luv')
local helpers = require('test.unit.helpers')(after_each)
local itp = helpers.gen_itp(it)
@@ -11,6 +11,7 @@ local to_cstr = helpers.to_cstr
local NULL = helpers.NULL
local OK = helpers.OK
local FAIL = helpers.FAIL
+local mkdir = helpers.mkdir
cimport('string.h')
local cimp = cimport('./src/nvim/os/os.h', './src/nvim/path.h')
@@ -21,11 +22,11 @@ local buffer = nil
describe('path.c', function()
describe('path_full_dir_name', function()
setup(function()
- lfs.mkdir('unit-test-directory')
+ mkdir('unit-test-directory')
end)
teardown(function()
- lfs.rmdir('unit-test-directory')
+ luv.fs_rmdir('unit-test-directory')
end)
local function path_full_dir_name(directory, buf, len)
@@ -35,34 +36,34 @@ describe('path.c', function()
before_each(function()
-- Create empty string buffer which will contain the resulting path.
- length = string.len(lfs.currentdir()) + 22
+ length = string.len(luv.cwd()) + 22
buffer = cstr(length, '')
end)
itp('returns the absolute directory name of a given relative one', function()
local result = path_full_dir_name('..', buffer, length)
eq(OK, result)
- local old_dir = lfs.currentdir()
- lfs.chdir('..')
- local expected = lfs.currentdir()
- lfs.chdir(old_dir)
+ local old_dir = luv.cwd()
+ luv.chdir('..')
+ local expected = luv.cwd()
+ luv.chdir(old_dir)
eq(expected, (ffi.string(buffer)))
end)
itp('returns the current directory name if the given string is empty', function()
eq(OK, (path_full_dir_name('', buffer, length)))
- eq(lfs.currentdir(), (ffi.string(buffer)))
+ eq(luv.cwd(), (ffi.string(buffer)))
end)
itp('works with a normal relative dir', function()
local result = path_full_dir_name('unit-test-directory', buffer, length)
- eq(lfs.currentdir() .. '/unit-test-directory', (ffi.string(buffer)))
+ eq(luv.cwd() .. '/unit-test-directory', (ffi.string(buffer)))
eq(OK, result)
end)
itp('works with a non-existing relative dir', function()
local result = path_full_dir_name('does-not-exist', buffer, length)
- eq(lfs.currentdir() .. '/does-not-exist', (ffi.string(buffer)))
+ eq(luv.cwd() .. '/does-not-exist', (ffi.string(buffer)))
eq(OK, result)
end)
@@ -268,27 +269,27 @@ describe('path.c', function()
end)
describe('path_try_shorten_fname', function()
- local cwd = lfs.currentdir()
+ local cwd = luv.cwd()
before_each(function()
- lfs.mkdir('ut_directory')
+ mkdir('ut_directory')
end)
after_each(function()
- lfs.chdir(cwd)
- lfs.rmdir('ut_directory')
+ luv.chdir(cwd)
+ luv.fs_rmdir('ut_directory')
end)
describe('path_try_shorten_fname', function()
itp('returns shortened path if possible', function()
- lfs.chdir('ut_directory')
- local full = to_cstr(lfs.currentdir() .. '/subdir/file.txt')
+ luv.chdir('ut_directory')
+ local full = to_cstr(luv.cwd() .. '/subdir/file.txt')
eq('subdir/file.txt', (ffi.string(cimp.path_try_shorten_fname(full))))
end)
itp('returns `full_path` if a shorter version is not possible', function()
- local old = lfs.currentdir()
- lfs.chdir('ut_directory')
+ local old = luv.cwd()
+ luv.chdir('ut_directory')
local full = old .. '/subdir/file.txt'
eq(full, (ffi.string(cimp.path_try_shorten_fname(to_cstr(full)))))
end)
@@ -300,7 +301,7 @@ describe('path_try_shorten_fname', function()
end)
describe('path.c path_guess_exepath', function()
- local cwd = lfs.currentdir()
+ local cwd = luv.cwd()
for _,name in ipairs({'./nvim', '.nvim', 'foo/nvim'}) do
itp('"'..name..'" returns name catenated with CWD', function()
@@ -354,7 +355,7 @@ end)
describe('path.c', function()
setup(function()
- lfs.mkdir('unit-test-directory');
+ mkdir('unit-test-directory');
io.open('unit-test-directory/test.file', 'w'):close()
-- Since the tests are executed, they are called by an executable. We use
@@ -368,7 +369,7 @@ describe('path.c', function()
teardown(function()
os.remove('unit-test-directory/test.file')
- lfs.rmdir('unit-test-directory')
+ luv.fs_rmdir('unit-test-directory')
end)
describe('vim_FullName', function()
@@ -420,7 +421,7 @@ describe('path.c', function()
end)
itp('concatenates filename if it does not contain a slash', function()
- local expected = lfs.currentdir() .. '/test.file'
+ local expected = luv.cwd() .. '/test.file'
local filename = 'test.file'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -430,7 +431,7 @@ describe('path.c', function()
end)
itp('concatenates directory name if it does not contain a slash', function()
- local expected = lfs.currentdir() .. '/..'
+ local expected = luv.cwd() .. '/..'
local filename = '..'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -440,10 +441,10 @@ describe('path.c', function()
end)
itp('enters given directory (instead of just concatenating the strings) if possible and if path contains a slash', function()
- local old_dir = lfs.currentdir()
- lfs.chdir('..')
- local expected = lfs.currentdir() .. '/test.file'
- lfs.chdir(old_dir)
+ local old_dir = luv.cwd()
+ luv.chdir('..')
+ local expected = luv.cwd() .. '/test.file'
+ luv.chdir(old_dir)
local filename = '../test.file'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -472,7 +473,7 @@ describe('path.c', function()
end)
itp('works with some "normal" relative path with directories', function()
- local expected = lfs.currentdir() .. '/unit-test-directory/test.file'
+ local expected = luv.cwd() .. '/unit-test-directory/test.file'
local filename = 'unit-test-directory/test.file'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -482,7 +483,7 @@ describe('path.c', function()
end)
itp('does not modify the given filename', function()
- local expected = lfs.currentdir() .. '/unit-test-directory/test.file'
+ local expected = luv.cwd() .. '/unit-test-directory/test.file'
local filename = to_cstr('unit-test-directory/test.file')
local buflen = string.len(expected) + 1
local buf = cstr(buflen, '')
@@ -505,7 +506,7 @@ describe('path.c', function()
end)
itp('does not remove trailing slash from non-existing relative directory #20847', function()
- local expected = lfs.currentdir() .. '/non_existing_dir/'
+ local expected = luv.cwd() .. '/non_existing_dir/'
local filename = 'non_existing_dir/'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -515,7 +516,7 @@ describe('path.c', function()
end)
itp('expands "./" to the current directory #7117', function()
- local expected = lfs.currentdir() .. '/unit-test-directory/test.file'
+ local expected = luv.cwd() .. '/unit-test-directory/test.file'
local filename = './unit-test-directory/test.file'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -525,7 +526,7 @@ describe('path.c', function()
end)
itp('collapses "foo/../foo" to "foo" #7117', function()
- local expected = lfs.currentdir() .. '/unit-test-directory/test.file'
+ local expected = luv.cwd() .. '/unit-test-directory/test.file'
local filename = 'unit-test-directory/../unit-test-directory/test.file'
local buflen = get_buf_len(expected, filename)
local do_expand = 1
@@ -542,8 +543,8 @@ describe('path.c', function()
return ffi.string(c_file)
end
- before_each(function() lfs.mkdir('CamelCase') end)
- after_each(function() lfs.rmdir('CamelCase') end)
+ before_each(function() mkdir('CamelCase') end)
+ after_each(function() luv.fs_rmdir('CamelCase') end)
if ffi.os == 'Windows' or ffi.os == 'OSX' then
itp('Corrects the case of file names in Mac and Windows', function()
diff --git a/test/unit/preload.lua b/test/unit/preload.lua
index 841e19b878..c2d051d98a 100644
--- a/test/unit/preload.lua
+++ b/test/unit/preload.lua
@@ -3,5 +3,4 @@
-- for more information about this.
local ffi = require('ffi')
local helpers = require('test.unit.helpers')(nil)
-local lfs = require('lfs')
local preprocess = require('test.unit.preprocess')
diff --git a/test/unit/preprocess.lua b/test/unit/preprocess.lua
index 1073855a7d..88f7a14d1f 100644
--- a/test/unit/preprocess.lua
+++ b/test/unit/preprocess.lua
@@ -199,12 +199,6 @@ function Gcc:preprocess(previous_defines, ...)
{pseudoheader_fname})
defines = self:filter_standard_defines(defines)
- -- lfs = require("lfs")
- -- print("CWD: #{lfs.currentdir!}")
- -- print("CMD: #{cmd}")
- -- io.stderr\write("CWD: #{lfs.currentdir!}\n")
- -- io.stderr\write("CMD: #{cmd}\n")
-
local declarations = repeated_read_cmd(self.path,
self.preprocessor_extra_flags,
self.get_declarations_extra_flags,
diff --git a/test/unit/tempfile_spec.lua b/test/unit/tempfile_spec.lua
index 44bd19c1d2..e35490a561 100644
--- a/test/unit/tempfile_spec.lua
+++ b/test/unit/tempfile_spec.lua
@@ -1,4 +1,3 @@
-local lfs = require('lfs')
local helpers = require('test.unit.helpers')(after_each)
local itp = helpers.gen_itp(it)
@@ -30,7 +29,7 @@ describe('tempfile related functions', function()
-- os_file_is_writable returns 2 for a directory which we have rights
-- to write into.
eq(lib.os_file_is_writable(helpers.to_cstr(dir)), 2)
- for entry in lfs.dir(dir) do
+ for entry in vim.fs.dir(dir) do
assert.True(entry == '.' or entry == '..')
end
end)
diff --git a/test/unit/undo_spec.lua b/test/unit/undo_spec.lua
index cdc5d3a99e..9261eca19d 100644
--- a/test/unit/undo_spec.lua
+++ b/test/unit/undo_spec.lua
@@ -1,6 +1,6 @@
local helpers = require('test.unit.helpers')(after_each)
local itp = helpers.gen_itp(it)
-local lfs = require('lfs')
+local luv = require('luv')
local child_call_once = helpers.child_call_once
local sleep = helpers.sleep
@@ -9,6 +9,7 @@ local cimport = helpers.cimport
local to_cstr = helpers.to_cstr
local neq = helpers.neq
local eq = helpers.eq
+local mkdir = helpers.mkdir
cimport('./src/nvim/ex_cmds_defs.h')
cimport('./src/nvim/buffer_defs.h')
@@ -44,14 +45,14 @@ end)
describe('u_write_undo', function()
setup(function()
- lfs.mkdir('unit-test-directory')
- lfs.chdir('unit-test-directory')
- options.p_udir = to_cstr(lfs.currentdir()) -- set p_udir to be the test dir
+ mkdir('unit-test-directory')
+ luv.chdir('unit-test-directory')
+ options.p_udir = to_cstr(luv.cwd()) -- set p_udir to be the test dir
end)
teardown(function()
- lfs.chdir('..')
- local success, err = lfs.rmdir('unit-test-directory')
+ luv.chdir('..')
+ local success, err = luv.fs_rmdir('unit-test-directory')
if not success then
print(err) -- inform tester if directory fails to delete
end
@@ -102,7 +103,7 @@ describe('u_write_undo', function()
local test_permission_file = io.open(test_file_name, "w")
test_permission_file:write("testing permissions")
test_permission_file:close()
- local test_permissions = lfs.attributes(test_file_name).permissions
+ local test_permissions = luv.fs_stat(test_file_name).mode
-- Create vim buffer
local c_file = to_cstr(test_file_name)
@@ -115,7 +116,7 @@ describe('u_write_undo', function()
local undo_file_name = ffi.string(undo.u_get_undo_file_name(file_buffer.b_ffname, false))
-- Find out the permissions of the new file
- local permissions = lfs.attributes(undo_file_name).permissions
+ local permissions = luv.fs_stat(undo_file_name).mode
eq(test_permissions, permissions)
-- delete the file now that we're done with it.
@@ -130,7 +131,7 @@ describe('u_write_undo', function()
end)
itp('writes an undofile only readable by the user if the buffer is unnamed', function()
- local correct_permissions = "rw-------"
+ local correct_permissions = 33152
local undo_file_name = "test.undo"
-- Create vim buffer
@@ -140,7 +141,7 @@ describe('u_write_undo', function()
u_write_undo(undo_file_name, false, file_buffer, buffer_hash)
-- Find out the permissions of the new file
- local permissions = lfs.attributes(undo_file_name).permissions
+ local permissions = luv.fs_stat(undo_file_name).mode
eq(correct_permissions, permissions)
-- delete the file now that we're done with it.
@@ -172,13 +173,13 @@ describe('u_write_undo', function()
u_write_undo(nil, false, file_buffer, buffer_hash)
local correct_name = ffi.string(undo.u_get_undo_file_name(file_buffer.b_ffname, false))
- local file_last_modified = lfs.attributes(correct_name).modification
+ local file_last_modified = luv.fs_stat(correct_name).mtime.sec
sleep(1000) -- Ensure difference in timestamps.
file_buffer.b_u_numhead = 1 -- Mark it as if there are changes
u_write_undo(nil, false, file_buffer, buffer_hash)
- local file_last_modified_2 = lfs.attributes(correct_name).modification
+ local file_last_modified_2 = luv.fs_stat(correct_name).mtime.sec
-- print(file_last_modified, file_last_modified_2)
neq(file_last_modified, file_last_modified_2)
generated by cgit (git 2.34.1) at 2025-08-07 15:07:26 +0000