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

adjust tests for nvim

Browse Source
This commit is contained in:
Daniel Hahler
2019-06-08 16:08:35 +02:00
parent 76506ca0a3
commit 304861e0ee
1 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/nvim/testdir/test_startup.vim
View File

@@ -348,17 +348,15 @@ func Test_invalid_args()
for opt in ['-Y', '--does-not-exist'] for opt in ['-Y', '--does-not-exist']
let out = split(system(GetVimCommand() .. ' ' .. opt), "\n") let out = split(system(GetVimCommand() .. ' ' .. opt), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal('nvim: Unknown option argument: "' .. opt .. '"', out[0])
call assert_equal('Unknown option argument: "' .. opt .. '"', out[1]) call assert_equal('More info with "nvim -h"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endfor endfor
for opt in ['-c', '-i', '-s', '-t', '-T', '-u', '-U', '-w', '-W', '--cmd', '--startuptime'] for opt in ['-c', '-i', '-s', '-t', '-u', '-U', '-w', '-W', '--cmd', '--startuptime']
let out = split(system(GetVimCommand() .. ' ' .. opt), "\n") let out = split(system(GetVimCommand() .. ' ' .. opt), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal('nvim: Argument missing after: "' .. opt .. '"', out[0])
call assert_equal('Argument missing after: "' .. opt .. '"', out[1]) call assert_equal('More info with "nvim -h"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endfor endfor
if has('clientserver') if has('clientserver')
@@ -388,23 +386,19 @@ func Test_invalid_args()
let out = split(system(GetVimCommand() .. ' -ix'), "\n") let out = split(system(GetVimCommand() .. ' -ix'), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal('nvim: Garbage after option argument: "-ix"', out[0])
call assert_equal('Garbage after option argument: "-ix"', out[1]) call assert_equal('More info with "nvim -h"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
let out = split(system(GetVimCommand() .. ' - xxx'), "\n") " Not an error in Nvim. The "-" file is allowed with -t, -q, or [file].
call assert_equal(1, v:shell_error) let out = split(system(GetVimCommand() .. ' - xxx -cq'), "\n")
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal(0, v:shell_error)
call assert_equal('Too many edit arguments: "xxx"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
" Detect invalid repeated arguments '-t foo -t foo", '-q foo -q foo'. " Detect invalid repeated arguments '-t foo -t foo", '-q foo -q foo'.
for opt in ['-t', '-q'] for opt in ['-t', '-q']
let out = split(system(GetVimCommand() .. repeat(' ' .. opt .. ' foo', 2)), "\n") let out = split(system(GetVimCommand() .. repeat(' ' .. opt .. ' foo', 2)), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal('nvim: Too many edit arguments: "' .. opt .. '"', out[0])
call assert_equal('Too many edit arguments: "' .. opt .. '"', out[1]) call assert_equal('More info with "nvim -h"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endfor endfor
for opt in [' -cq', ' --cmd q', ' +', ' -S foo'] for opt in [' -cq', ' --cmd q', ' +', ' -S foo']
@@ -412,21 +406,19 @@ func Test_invalid_args()
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
" FIXME: The error message given by Vim is not ideal in case of repeated " FIXME: The error message given by Vim is not ideal in case of repeated
" -S foo since it does not mention -S. " -S foo since it does not mention -S.
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal('nvim: Too many "+command", "-c command" or "--cmd command" arguments', out[0])
call assert_equal('Too many "+command", "-c command" or "--cmd command" arguments', out[1]) call assert_equal('More info with "nvim -h"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endfor endfor
" FIXME: commented out as this causes vim-8.1.1282 to crash! if has('gui_gtk')
"if has('gui_gtk') for opt in ['--socketid x', '--socketid 0xg']
" for opt in ['--socketid x', '--socketid 0xg'] let out = split(system(GetVimCommand() .. ' ' .. opt), "\n")
" let out = split(system(GetVimCommand() .. ' ' .. opt), "\n") call assert_equal(1, v:shell_error)
" call assert_equal(1, v:shell_error) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
" call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_equal('Invalid argument for: "--socketid"', out[1])
" call assert_equal('Invalid argument for: "--socketid"', out[1]) call assert_equal('More info with: "vim -h"', out[2])
" call assert_equal('More info with: "vim -h"', out[2]) endfor
" endfor endif
"endif
endfunc endfunc
func Test_file_args() func Test_file_args()