refactor: format test/*

This commit is contained in:
Justin M. Keyes
2024-01-03 02:09:18 +01:00
parent 59d117ec99
commit 04f2f864e2
363 changed files with 30631 additions and 20833 deletions

View File

@@ -1,4 +1,4 @@
local uv = require'luv'
local uv = require 'luv'
local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
@@ -15,20 +15,20 @@ local retry = helpers.retry
local function test_embed(ext_linegrid)
local screen
local function startup(...)
clear{args_rm={'--headless'}, args={...}}
clear { args_rm = { '--headless' }, args = { ... } }
-- attach immediately after startup, for early UI
screen = Screen.new(60, 8)
screen:attach{ext_linegrid=ext_linegrid}
screen:attach { ext_linegrid = ext_linegrid }
screen:set_default_attr_ids({
[1] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
[2] = {bold = true, foreground = Screen.colors.SeaGreen4},
[3] = {bold = true, foreground = Screen.colors.Blue1},
[4] = {bold = true, foreground = Screen.colors.Green},
[5] = {bold = true, reverse = true},
[6] = {foreground = Screen.colors.NvimDarkGrey3, background = Screen.colors.NvimLightGrey1};
[7] = {foreground = Screen.colors.NvimDarkRed};
[8] = {foreground = Screen.colors.NvimDarkCyan};
[1] = { foreground = Screen.colors.Grey100, background = Screen.colors.Red },
[2] = { bold = true, foreground = Screen.colors.SeaGreen4 },
[3] = { bold = true, foreground = Screen.colors.Blue1 },
[4] = { bold = true, foreground = Screen.colors.Green },
[5] = { bold = true, reverse = true },
[6] = { foreground = Screen.colors.NvimDarkGrey3, background = Screen.colors.NvimLightGrey1 },
[7] = { foreground = Screen.colors.NvimDarkRed },
[8] = { foreground = Screen.colors.NvimDarkCyan },
})
end
@@ -67,21 +67,28 @@ local function test_embed(ext_linegrid)
it("doesn't erase output when setting Normal colors", function()
startup('--cmd', 'echoerr "foo"', '--cmd', 'hi Normal guibg=Green', '--cmd', 'echoerr "bar"')
screen:expect{grid=[[
screen:expect {
grid = [[
|*3
{6: }|
{7:Error detected while processing pre-vimrc command line:} |
{7:foo} |
{7:bar} |
{8:Press ENTER or type command to continue}^ |
]], condition=function()
eq(Screen.colors.Green, screen.default_colors.rgb_bg)
end}
]],
condition = function()
eq(Screen.colors.Green, screen.default_colors.rgb_bg)
end,
}
end)
end
describe('--embed UI on startup (ext_linegrid=true)', function() test_embed(true) end)
describe('--embed UI on startup (ext_linegrid=false)', function() test_embed(false) end)
describe('--embed UI on startup (ext_linegrid=true)', function()
test_embed(true)
end)
describe('--embed UI on startup (ext_linegrid=false)', function()
test_embed(false)
end)
describe('--embed UI', function()
it('can pass stdin', function()
@@ -90,39 +97,45 @@ describe('--embed UI', function()
local writer = assert(uv.new_pipe(false))
writer:open(pipe.write)
clear {args_rm={'--headless'}, io_extra=pipe.read}
clear { args_rm = { '--headless' }, io_extra = pipe.read }
-- attach immediately after startup, for early UI
local screen = Screen.new(40, 8)
screen.rpc_async = true -- Avoid hanging. #24888
screen:attach {stdin_fd=3}
screen.rpc_async = true -- Avoid hanging. #24888
screen:attach { stdin_fd = 3 }
screen:set_default_attr_ids {
[1] = {bold = true, foreground = Screen.colors.Blue1};
[2] = {bold = true};
[1] = { bold = true, foreground = Screen.colors.Blue1 },
[2] = { bold = true },
}
writer:write "hello nvim\nfrom external input\n"
writer:shutdown(function() writer:close() end)
writer:write 'hello nvim\nfrom external input\n'
writer:shutdown(function()
writer:close()
end)
screen:expect{grid=[[
screen:expect {
grid = [[
^hello nvim |
from external input |
{1:~ }|*5
|
]]}
]],
}
-- stdin (rpc input) still works
feed 'o'
screen:expect{grid=[[
screen:expect {
grid = [[
hello nvim |
^ |
from external input |
{1:~ }|*4
{2:-- INSERT --} |
]]}
]],
}
end)
it("only sets background colors once even if overridden", function()
it('only sets background colors once even if overridden', function()
local screen, current, seen
local function handle_default_colors_set(_, _, rgb_bg, _, _, _)
seen[rgb_bg] = true
@@ -131,7 +144,7 @@ describe('--embed UI', function()
local function startup(...)
seen = {}
current = nil
clear {args_rm={'--headless'}, args={...}}
clear { args_rm = { '--headless' }, args = { ... } }
-- attach immediately after startup, for early UI
screen = Screen.new(40, 8)
@@ -140,19 +153,23 @@ describe('--embed UI', function()
end
startup()
screen:expect{condition=function()
eq(16777215, current)
end}
eq({[16777215]=true}, seen)
screen:expect {
condition = function()
eq(16777215, current)
end,
}
eq({ [16777215] = true }, seen)
-- NB: by accident how functional/helpers.lua currently handles the default color scheme, the
-- above is sufficient to test the behavior. But in case that workaround is removed, we need
-- a test with an explicit override like below, so do it to remain safe.
startup('--cmd', 'hi NORMAL guibg=#FF00FF')
screen:expect{condition=function()
eq(16711935, current)
end}
eq({[16711935]=true}, seen) -- we only saw the last one, despite 16777215 was set internally earlier
screen:expect {
condition = function()
eq(16711935, current)
end,
}
eq({ [16711935] = true }, seen) -- we only saw the last one, despite 16777215 was set internally earlier
end)
end)
@@ -161,8 +178,18 @@ describe('--embed --listen UI', function()
helpers.skip(helpers.is_os('win'))
clear()
local child_server = assert(helpers.new_pipename())
funcs.jobstart({nvim_prog, '--embed', '--listen', child_server, '--clean', '--cmd', 'colorscheme vim'})
retry(nil, nil, function() neq(nil, uv.fs_stat(child_server)) end)
funcs.jobstart({
nvim_prog,
'--embed',
'--listen',
child_server,
'--clean',
'--cmd',
'colorscheme vim',
})
retry(nil, nil, function()
neq(nil, uv.fs_stat(child_server))
end)
local child_session = helpers.connect(child_server)
@@ -171,11 +198,15 @@ describe('--embed --listen UI', function()
eq(2, #api_info)
ok(api_info[1] > 2, 'channel_id > 2', api_info[1])
child_session:request('nvim_exec2', [[
child_session:request(
'nvim_exec2',
[[
let g:evs = []
autocmd UIEnter * call add(g:evs, $"UIEnter:{v:event.chan}")
autocmd VimEnter * call add(g:evs, "VimEnter")
]], {})
]],
{}
)
-- VimEnter and UIEnter shouldn't be triggered until after attach
local var_ok, var = child_session:request('nvim_get_var', 'evs')
@@ -184,19 +215,22 @@ describe('--embed --listen UI', function()
local child_screen = Screen.new(40, 6)
child_screen:attach(nil, child_session)
child_screen:expect{grid=[[
child_screen:expect {
grid = [[
^ |
{1:~ }|*3
{2:[No Name] 0,0-1 All}|
|
]], attr_ids={
[1] = {foreground = Screen.colors.Blue, bold = true};
[2] = {reverse = true, bold = true};
}}
]],
attr_ids = {
[1] = { foreground = Screen.colors.Blue, bold = true },
[2] = { reverse = true, bold = true },
},
}
-- VimEnter and UIEnter should now be triggered
var_ok, var = child_session:request('nvim_get_var', 'evs')
ok(var_ok)
eq({'VimEnter', ('UIEnter:%d'):format(api_info[1])}, var)
eq({ 'VimEnter', ('UIEnter:%d'):format(api_info[1]) }, var)
end)
end)