test(terminal/cursor_spec): unskip tests that pass on Windows (#27924)

Also:
- Make indent of test cases consistent.
- Unskip TUI rapid resize test with ASAN as reflow is now disabled.
This commit is contained in:
zeertzjq 2024-03-19 15:42:55 +08:00 committed by GitHub
parent 400ef8aaa0
commit d744876723
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 68 additions and 87 deletions

View File

@ -189,7 +189,7 @@ describe('buffer cursor position is correct in terminal without number column',
before_each(clear)
describe('in a line with no multibyte characters or trailing spaces,', function()
describe('in a line with no multibyte chars or trailing spaces,', function()
before_each(function()
setup_ex_register('aaaaaaaa')
end)
@ -252,7 +252,7 @@ describe('buffer cursor position is correct in terminal without number column',
end)
end)
describe('in a line with single-cell multibyte characters and no trailing spaces,', function()
describe('in a line with single-cell multibyte chars and no trailing spaces,', function()
before_each(function()
setup_ex_register('µµµµµµµµ')
end)
@ -315,13 +315,7 @@ describe('buffer cursor position is correct in terminal without number column',
end)
end)
describe(
'in a line with single-cell composed multibyte characters and no trailing spaces,',
function()
if skip(is_os('win'), 'Encoding problem?') then
return
end
describe('in a line with single-cell composed multibyte chars and no trailing spaces,', function()
before_each(function()
setup_ex_register('µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳')
end)
@ -346,6 +340,7 @@ describe('buffer cursor position is correct in terminal without number column',
end)
it('near the end', function()
skip(is_os('win'))
feed('<C-R>r<C-X><C-X>')
screen:expect([[
|*4
@ -365,6 +360,7 @@ describe('buffer cursor position is correct in terminal without number column',
end)
it('near the start', function()
skip(is_os('win'))
feed('<C-R>r<C-B><C-O>')
screen:expect([[
|*4
@ -382,14 +378,9 @@ describe('buffer cursor position is correct in terminal without number column',
]])
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
end)
end
)
describe('in a line with double-cell multibyte characters and no trailing spaces,', function()
if skip(is_os('win'), 'Encoding problem?') then
return
end
end)
describe('in a line with double-cell multibyte chars and no trailing spaces,', function()
before_each(function()
setup_ex_register('哦哦哦哦哦哦哦哦')
end)
@ -522,7 +513,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
command('set number')
end)
describe('in a line with no multibyte characters or trailing spaces,', function()
describe('in a line with no multibyte chars or trailing spaces,', function()
before_each(function()
setup_ex_register('aaaaaaaa')
end)
@ -603,7 +594,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
end)
end)
describe('in a line with single-cell multibyte characters and no trailing spaces,', function()
describe('in a line with single-cell multibyte chars and no trailing spaces,', function()
before_each(function()
setup_ex_register('µµµµµµµµ')
end)
@ -684,13 +675,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
end)
end)
describe(
'in a line with single-cell composed multibyte characters and no trailing spaces,',
function()
if skip(is_os('win'), 'Encoding problem?') then
return
end
describe('in a line with single-cell composed multibyte chars and no trailing spaces,', function()
before_each(function()
setup_ex_register('µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳')
end)
@ -721,6 +706,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
end)
it('near the end', function()
skip(is_os('win'))
feed('<C-R>r<C-X><C-X>')
screen:expect([[
{7: 1 } |
@ -746,6 +732,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
end)
it('near the start', function()
skip(is_os('win'))
feed('<C-R>r<C-B><C-O>')
screen:expect([[
{7: 1 } |
@ -769,14 +756,9 @@ describe('buffer cursor position is correct in terminal with number column', fun
]])
eq({ 6, 1 }, eval('nvim_win_get_cursor(0)'))
end)
end
)
describe('in a line with double-cell multibyte characters and no trailing spaces,', function()
if skip(is_os('win'), 'Encoding problem?') then
return
end
end)
describe('in a line with double-cell multibyte chars and no trailing spaces,', function()
before_each(function()
setup_ex_register('哦哦哦哦哦哦哦哦')
end)

View File

@ -83,7 +83,6 @@ describe('TUI', function()
end
it('rapid resize #7572 #7628', function()
helpers.skip(helpers.is_asan(), 'Test extra unstable with ASAN. See #23762')
-- Need buffer rows to provoke the behavior.
feed_data(':edit test/functional/fixtures/bigfile.txt\n')
screen:expect([[