From 6c77ea1cb6bc3a6e90de5581fcd75dc129b3d08c Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Wed, 27 Jan 2016 12:59:06 +0100 Subject: [PATCH] tests: Remove legacy test files for eval test. --- src/nvim/testdir/Makefile | 2 +- src/nvim/testdir/test_eval.in | 234 ---------------------------- src/nvim/testdir/test_eval.ok | Bin 10814 -> 0 bytes src/nvim/testdir/test_eval_func.vim | 12 -- 4 files changed, 1 insertion(+), 247 deletions(-) delete mode 100644 src/nvim/testdir/test_eval.in delete mode 100644 src/nvim/testdir/test_eval.ok delete mode 100644 src/nvim/testdir/test_eval_func.vim diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index e27ac227c8..41ce2daa91 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -7,7 +7,7 @@ export SHELL := sh VIMPROG := ../../../build/bin/nvim SCRIPTSOURCE := ../../../runtime -SCRIPTS := test_eval.out \ +SCRIPTS := \ test8.out test10.out \ test11.out test12.out test13.out test14.out \ test17.out \ diff --git a/src/nvim/testdir/test_eval.in b/src/nvim/testdir/test_eval.in deleted file mode 100644 index 54cdb03ba2..0000000000 --- a/src/nvim/testdir/test_eval.in +++ /dev/null @@ -1,234 +0,0 @@ -Test for various eval features. vim: set ft=vim : - -Note: system clipboard is saved, changed and restored. - -clipboard contents -something else - -STARTTEST -:so small.vim -:set noswapfile -:lang C -:fun AppendRegContents(reg) - call AppendRegParts(a:reg, getregtype(a:reg), getreg(a:reg), string(getreg(a:reg, 0, 1)), getreg(a:reg, 1), string(getreg(a:reg, 1, 1))) -:endfun -:fun AppendRegParts(reg, type, cont, strcont, cont1, strcont1) - call append('$', printf('%s: type %s; value: %s (%s), expr: %s (%s)', a:reg, a:type, a:cont, a:strcont, a:cont1, a:strcont1)) -endfun -:command -nargs=? AR :call AppendRegContents() -:fun SetReg(...) - call call('setreg', a:000) - call append('$', printf('{{{2 setreg(%s)', string(a:000)[1:-2])) - call AppendRegContents(a:1) - if a:1 isnot# '=' - execute "silent normal! Go==\n==\e\"".a:1."P" - endif -endfun -:fun ErrExe(str) - call append('$', 'Executing '.a:str) - try - execute a:str - catch - $put =v:exception - endtry -endfun -:fun Test() -$put ='{{{1 let tests' -let @" = 'abc' -AR " -let @" = "abc\n" -AR " -let @" = "abc\" -AR " -let @= = '"abc"' -AR = - -$put ='{{{1 Basic setreg tests' -call SetReg('a', 'abcA', 'c') -call SetReg('b', 'abcB', 'v') -call SetReg('c', 'abcC', 'l') -call SetReg('d', 'abcD', 'V') -call SetReg('e', 'abcE', 'b') -call SetReg('f', 'abcF', "\") -call SetReg('g', 'abcG', 'b10') -call SetReg('h', 'abcH', "\10") -call SetReg('I', 'abcI') - -$put ='{{{1 Appending single lines with setreg()' -call SetReg('A', 'abcAc', 'c') -call SetReg('A', 'abcAl', 'l') -call SetReg('A', 'abcAc2','c') -call SetReg('b', 'abcBc', 'ca') -call SetReg('b', 'abcBb', 'ba') -call SetReg('b', 'abcBc2','ca') -call SetReg('b', 'abcBb2','b50a') - -call SetReg('C', 'abcCl', 'l') -call SetReg('C', 'abcCc', 'c') -call SetReg('D', 'abcDb', 'b') - -call SetReg('E', 'abcEb', 'b') -call SetReg('E', 'abcEl', 'l') -call SetReg('F', 'abcFc', 'c') - -$put ='{{{1 Appending NL with setreg()' -call setreg('a', 'abcA2', 'c') -call setreg('b', 'abcB2', 'v') -call setreg('c', 'abcC2', 'l') -call setreg('d', 'abcD2', 'V') -call setreg('e', 'abcE2', 'b') -call setreg('f', 'abcF2', "\") -call setreg('g', 'abcG2', 'b10') -call setreg('h', 'abcH2', "\10") -call setreg('I', 'abcI2') - -call SetReg('A', "\n") -call SetReg('B', "\n", 'c') -call SetReg('C', "\n") -call SetReg('D', "\n", 'l') -call SetReg('E', "\n") -call SetReg('F', "\n", 'b') - -$put ='{{{1 Setting lists with setreg()' -call SetReg('a', ['abcA3'], 'c') -call SetReg('b', ['abcB3'], 'l') -call SetReg('c', ['abcC3'], 'b') -call SetReg('d', ['abcD3']) -call SetReg('e', [1, 2, 'abc', 3]) -call SetReg('f', [1, 2, 3]) - -$put ='{{{1 Appending lists with setreg()' -call SetReg('A', ['abcA3c'], 'c') -call SetReg('b', ['abcB3l'], 'la') -call SetReg('C', ['abcC3b'], 'lb') -call SetReg('D', ['abcD32']) - -call SetReg('A', ['abcA32']) -call SetReg('B', ['abcB3c'], 'c') -call SetReg('C', ['abcC3l'], 'l') -call SetReg('D', ['abcD3b'], 'b') - -$put ='{{{1 Appending lists with NL with setreg()' -call SetReg('A', ["\n", 'abcA3l2'], 'l') -call SetReg('B', ["\n", 'abcB3c2'], 'c') -call SetReg('C', ["\n", 'abcC3b2'], 'b') -call SetReg('D', ["\n", 'abcD3b50'],'b50') - -$put ='{{{1 Setting lists with NLs with setreg()' -call SetReg('a', ['abcA4-0', "\n", "abcA4-2\n", "\nabcA4-3", "abcA4-4\nabcA4-4-2"]) -call SetReg('b', ['abcB4c-0', "\n", "abcB4c-2\n", "\nabcB4c-3", "abcB4c-4\nabcB4c-4-2"], 'c') -call SetReg('c', ['abcC4l-0', "\n", "abcC4l-2\n", "\nabcC4l-3", "abcC4l-4\nabcC4l-4-2"], 'l') -call SetReg('d', ['abcD4b-0', "\n", "abcD4b-2\n", "\nabcD4b-3", "abcD4b-4\nabcD4b-4-2"], 'b') -call SetReg('e', ['abcE4b10-0', "\n", "abcE4b10-2\n", "\nabcE4b10-3", "abcE4b10-4\nabcE4b10-4-2"], 'b10') - -$put ='{{{1 Search and expressions' -call SetReg('/', ['abc/']) -call SetReg('/', ["abc/\n"]) -call SetReg('=', ['"abc/"']) -call SetReg('=', ["\"abc/\n\""]) -$put ='{{{1 System clipboard' -if has('clipboard') -" Save and restore system clipboard. -" If no connection to X-Server is possible, test should succeed. -let _clipreg = ['*', getreg('*'), getregtype('*')] -let _clipopt = &cb -let &cb='unnamed' -5y -AR * -tabdo :windo :echo "hi" -6y -AR * -let &cb=_clipopt -call call('setreg', _clipreg) -else - call AppendRegParts('*', 'V', "clipboard contents\n", "['clipboard contents']", "clipboard contents\n", "['clipboard contents']") - call AppendRegParts('*', 'V', "something else\n", "['something else']", "something else\n", "['something else']") -endif -$put ='{{{1 Errors' -call ErrExe('call setreg()') -call ErrExe('call setreg(1)') -call ErrExe('call setreg(1, 2, 3, 4)') -call ErrExe('call setreg([], 2)') -call ErrExe('call setreg(1, {})') -call ErrExe('call setreg(1, 2, [])') -call ErrExe('call setreg("/", ["1", "2"])') -call ErrExe('call setreg("=", ["1", "2"])') -call ErrExe('call setreg(1, ["", "", [], ""])') -endfun -:" -:call Test() -:" -:delfunction SetReg -:delfunction AppendRegContents -:delfunction ErrExe -:delfunction Test -:delcommand AR -:call garbagecollect(1) -:" -:/^start:/+1,$wq! test.out -:" vim: et ts=4 isk-=\: fmr=???,??? -:call getchar() -:e test.out -:%d - -:" function name not starting with a capital -:try -: func! g:test() -: echo "test" -: endfunc -:catch -: $put =v:exception -:endtry - -:" function name folowed by # -:try -: func! test2() "# -: echo "test2" -: endfunc -:catch -: $put =v:exception -:endtry - -:" function name includes a colon -:try -: func! b:test() -: echo "test" -: endfunc -:catch -: $put =v:exception -:endtry - -:" function name starting with/without "g:", buffer-local funcref. -:function! g:Foo(n) -: $put ='called Foo(' . a:n . ')' -:endfunction -:let b:my_func = function('Foo') -:call b:my_func(1) -:echo g:Foo(2) -:echo Foo(3) - -:" script-local function used in Funcref must exist. -:so test_eval_func.vim - -:" using $ instead of '$' must give an error -:try -: call append($, 'foobar') -:catch -: $put =v:exception -:endtry - -:$put ='{{{1 getcurpos/setpos' -/^012345678 -6l:let sp = getcurpos() -0:call setpos('.', sp) -jyl:$put - -:/^start:/+1,$wq! test.out -:" vim: et ts=4 isk-=\: fmr=???,??? -:call getchar() -ENDTEST - -012345678 -012345678 - -start: diff --git a/src/nvim/testdir/test_eval.ok b/src/nvim/testdir/test_eval.ok deleted file mode 100644 index cf7a5cd4188fdab76b3c4d75218083a7c8b700c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10814 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 diff --git a/src/nvim/testdir/test_eval_func.vim b/src/nvim/testdir/test_eval_func.vim deleted file mode 100644 index 48d01df27d..0000000000 --- a/src/nvim/testdir/test_eval_func.vim +++ /dev/null @@ -1,12 +0,0 @@ -" Vim script used in test_eval.in. Needed for script-local function. - -func! s:Testje() - return "foo" -endfunc - -let Bar = function('s:Testje') - -$put ='s:Testje exists: ' . exists('s:Testje') -$put ='func s:Testje exists: ' . exists('*s:Testje') -$put ='Bar exists: ' . exists('Bar') -$put ='func Bar exists: ' . exists('*Bar')