diff options
| -rw-r--r-- | test/functional/api/vim_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/clipboard/clipboard_provider_spec.lua | 6 | ||||
| -rw-r--r-- | test/functional/helpers.lua | 3 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 8 |
4 files changed, 10 insertions, 9 deletions
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index 2c17a2acd0..bee9c18bd8 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -117,7 +117,7 @@ describe('vim_* functions', function() describe('replace_termcodes', function() it('escapes K_SPECIAL as K_SPECIAL KS_SPECIAL KE_FILLER', function() - eq(helpers.nvim('replace_termcodes', '\x80', true, true, true), '\x80\xfeX') + eq(helpers.nvim('replace_termcodes', '\128', true, true, true), '\128\254X') end) it('leaves non K_SPECIAL string unchanged', function() diff --git a/test/functional/clipboard/clipboard_provider_spec.lua b/test/functional/clipboard/clipboard_provider_spec.lua index ccbb74e487..c412c26c1a 100644 --- a/test/functional/clipboard/clipboard_provider_spec.lua +++ b/test/functional/clipboard/clipboard_provider_spec.lua @@ -72,10 +72,10 @@ describe('clipboard usage', function() reset() -- handle null bytes - insert("some\x16000text\n\x16000very binary\x16000") + insert("some\022000text\n\022000very binary\022000") feed('"*y-+"*p') eq({'some\ntext', '\nvery binary\n',''}, eval("g:test_clip['*']")) - expect("some\x00text\n\x00very binary\x00\nsome\x00text\n\x00very binary\x00") + expect("some\00text\n\00very binary\00\nsome\00text\n\00very binary\00") -- test getreg/getregtype eq('some\ntext\n\nvery binary\n\n', eval("getreg('*', 1)")) @@ -92,7 +92,7 @@ describe('clipboard usage', function() expect([[ very much blocktext]]) - eq("\x165", eval("getregtype('*')")) + eq("\0225", eval("getregtype('*')")) reset() -- test setreg diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index fc699d22a3..c76979e894 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -5,7 +5,8 @@ local AsyncSession = require('nvim.async_session') local Session = require('nvim.session') local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim' -local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', '--embed'} +local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', + '--cmd', 'set shortmess+=I background=light', '--embed'} local prepend_argv if os.getenv('VALGRIND') then diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 105e43843c..27e5900338 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -219,7 +219,7 @@ end function Screen:_handle_eol_clear() local row, col = self._cursor.row, self._cursor.col - self:_clear_block(row, 1, col, self._scroll_region.right - col) + self:_clear_block(row, row, col, self._scroll_region.right) end function Screen:_handle_cursor_goto(row, col) @@ -330,9 +330,9 @@ function Screen:_handle_set_icon(icon) self.icon = icon end -function Screen:_clear_block(top, lines, left, columns) - for i = top, top + lines - 1 do - self:_clear_row_section(i, left, left + columns - 1) +function Screen:_clear_block(top, bot, left, right) + for i = top, bot do + self:_clear_row_section(i, left, right) end end |