mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-08 19:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

functests: Improve screen:expect error reporting

Browse Source
This commit is contained in:
ZyX
2016-02-28 08:15:52 +03:00
parent a16d4a2b62
commit 0409cfded5
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/functional/ui/screen.lua
View File

@@ -219,12 +219,22 @@ function Screen:expect(expected, attr_ids, attr_ignore)
local ids = attr_ids or self._default_attr_ids local ids = attr_ids or self._default_attr_ids
local ignore = attr_ignore or self._default_attr_ignore local ignore = attr_ignore or self._default_attr_ignore
self:wait(function() self:wait(function()
local actual_rows = {}
for i = 1, self._height do for i = 1, self._height do
local expected_row = expected_rows[i] actual_rows[i] = self:_row_repr(self._rows[i], ids, ignore)
local actual_row = self:_row_repr(self._rows[i], ids, ignore) end
if expected_row ~= actual_row then for i = 1, self._height do
return 'Row '..tostring(i)..' didn\'t match.\nExpected: "'.. if expected_rows[i] ~= actual_rows[i] then
expected_row..'"\nActual: "'..actual_row..'"' local msg_expected_rows = {}
for i = 1, #expected_rows do msg_expected_rows[i] = expected_rows[i] end
msg_expected_rows[i] = '*' .. msg_expected_rows[i]
actual_rows[i] = '*' .. actual_rows[i]
msg = (
'Row ' .. tostring(i) .. ' didn\'t match.\n'
.. 'Expected:\n|' .. table.concat(msg_expected_rows, '|\n|') .. '|\n'
.. 'Actual:\n|' .. table.concat(actual_rows, '|\n|') .. '|'
)
return msg
end end
end end
end) end)